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

Coverity: fixed uninitialized field in ExifReader

Browse Source
This commit is contained in:
Maksim Shabunin 2015-12-08 16:38:59 +03:00
parent a9607c8531
commit 4a294775da
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,7 +270,11 @@ int JpegDecoder::getOrientation()
ExifReader reader( m_filename ); ExifReader reader( m_filename );
if( reader.parse() ) if( reader.parse() )
{ {
orientation = reader.getTag( ORIENTATION ).field_u16;//orientation is unsigned short, so check field_u16 ExifEntry_t entry = reader.getTag( ORIENTATION );
if (entry.tag != INVALID_TAG)
{
orientation = entry.field_u16; //orientation is unsigned short, so check field_u16
}
} }
return orientation; return orientation;

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

@ -54,14 +54,14 @@ namespace cv
ExifEntry_t::ExifEntry_t() : ExifEntry_t::ExifEntry_t() :
field_float(0), field_double(0), field_u32(0), field_s32(0), field_float(0), field_double(0), field_u32(0), field_s32(0),
tag(0), field_u16(0), field_s16(0), field_u8(0), field_s8(0) tag(INVALID_TAG), field_u16(0), field_s16(0), field_u8(0), field_s8(0)
{ {
} }
/** /**
* @brief ExifReader constructor * @brief ExifReader constructor
*/ */
ExifReader::ExifReader(std::string filename) : m_filename(filename) ExifReader::ExifReader(std::string filename) : m_filename(filename), m_format(NONE)
{ {
} }