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

Merge pull request #6889 from ilya-lavrenov:exif

This commit is contained in:
Alexander Alekhin
2016-07-12 15:12:19 +00:00
+3 -2
View File
@@ -140,8 +140,8 @@ std::map<int, ExifEntry_t > ExifReader::getExif()
return m_exif; //Until this moment the map is empty
}
bool exifFound = false;
while( ( !feof( f ) ) && !exifFound )
bool exifFound = false, stopSearch = false;
while( ( !feof( f ) ) && !exifFound && !stopSearch )
{
count = fread( appMarker, sizeof(unsigned char), markerSize, f );
if( count < markerSize )
@@ -180,6 +180,7 @@ std::map<int, ExifEntry_t > ExifReader::getExif()
break;
default: //No other markers are expected according to standard. May be a signal of error
stopSearch = true;
break;
}
}