Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
4a294775
Commit
4a294775
authored
9 years ago
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Coverity: fixed uninitialized field in ExifReader
parent
a9607c85
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
grfmt_jpeg.cpp
modules/imgcodecs/src/grfmt_jpeg.cpp
+5
-1
jpeg_exif.cpp
modules/imgcodecs/src/jpeg_exif.cpp
+2
-2
No files found.
modules/imgcodecs/src/grfmt_jpeg.cpp
View file @
4a294775
...
@@ -270,7 +270,11 @@ int JpegDecoder::getOrientation()
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
modules/imgcodecs/src/jpeg_exif.cpp
View file @
4a294775
...
@@ -54,14 +54,14 @@ namespace cv
...
@@ -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
)
{
{
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment