potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Drop outdated definitions from internal.hpp

Browse Source 
This also fixes few clang build errors
This commit is contained in:
Andrey Kamaev
2013-03-31 13:26:21 +04:00
parent 605382562d
commit 3890a74565
34 changed files with 248 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/drawing.cpp
+2 -2
View File
@@ -2343,7 +2343,7 @@ cvColorToScalar( double packed_color, int type )
}
else
{
scalar.val[0] = CV_CAST_8U( icolor );
scalar.val[0] = cv::saturate_cast<uchar>( icolor );
scalar.val[1] = scalar.val[2] = scalar.val[3] = 0;
}
}
@@ -2359,7 +2359,7 @@ cvColorToScalar( double packed_color, int type )
}
else
{
scalar.val[0] = CV_CAST_8S( icolor );
scalar.val[0] = cv::saturate_cast<schar>( icolor );
scalar.val[1] = scalar.val[2] = scalar.val[3] = 0;
}
}