1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00

Merge branch '2.4'

This commit is contained in:
Andrey Kamaev
2013-04-12 15:35:38 +04:00
75 changed files with 1259 additions and 3979 deletions
+1 -1
View File
@@ -73,7 +73,7 @@ int main( int argc, char** argv ) {
}
Mat imgB = imread(argv[2], IMREAD_GRAYSCALE );
if( !imgA.data ) {
if( !imgB.data ) {
std::cout << " --(!) Error reading image " << argv[2] << std::endl;
return -1;
}