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

Merge pull request #6121 from mshabunin:fix-check-imencode-exif

Browse Source
This commit is contained in:
Alexander Alekhin
2016-02-17 00:45:49 +00:00
parent 03d6d2041a a54870aace
commit 2549bafe4f
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/imgcodecs/src/grfmt_jpeg.cpp
View File

@@ -267,6 +267,8 @@ int JpegDecoder::getOrientation()
{ {
int orientation = JPEG_ORIENTATION_TL; int orientation = JPEG_ORIENTATION_TL;
if (m_filename.size() > 0)
{
ExifReader reader( m_filename ); ExifReader reader( m_filename );
if( reader.parse() ) if( reader.parse() )
{ {
@@ -276,6 +278,7 @@ int JpegDecoder::getOrientation()
orientation = entry.field_u16; //orientation is unsigned short, so check field_u16 orientation = entry.field_u16; //orientation is unsigned short, so check field_u16
} }
} }
}
return orientation; return orientation;
} }

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

@@ -128,6 +128,11 @@ std::map<int, ExifEntry_t > ExifReader::getExif()
size_t count; size_t count;
if (m_filename.size() == 0)
{
return m_exif;
}
FILE* f = fopen( m_filename.c_str(), "rb" ); FILE* f = fopen( m_filename.c_str(), "rb" );
if( !f ) if( !f )