generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6889 from ilya-lavrenov:exif

Browse Source
This commit is contained in:
Alexander Alekhin 2016-07-12 15:12:19 +00:00
commit f75f894d73
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/imgcodecs/src/jpeg_exif.cpp
View File

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