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
cadb4dee
Commit
cadb4dee
authored
Aug 05, 2019
by
yaohai [姚海]
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix exif bug
parent
d2c64b56
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
exif.cpp
modules/imgcodecs/src/exif.cpp
+2
-2
exif.hpp
modules/imgcodecs/src/exif.hpp
+1
-4
No files found.
modules/imgcodecs/src/exif.cpp
View file @
cadb4dee
...
...
@@ -229,7 +229,7 @@ void ExifReader::parseExif()
uint32_t
offset
=
getStartOffset
();
size_t
numEntry
=
getNumDirEntry
();
size_t
numEntry
=
getNumDirEntry
(
offset
);
offset
+=
2
;
//go to start of tag fields
...
...
@@ -303,7 +303,7 @@ uint32_t ExifReader::getStartOffset() const
*
* @return The number of directory entries
*/
size_t
ExifReader
::
getNumDirEntry
()
const
size_t
ExifReader
::
getNumDirEntry
(
const
size_t
offsetNumDir
)
const
{
return
getU16
(
offsetNumDir
);
}
...
...
modules/imgcodecs/src/exif.hpp
View file @
cadb4dee
...
...
@@ -199,7 +199,7 @@ private:
bool
checkTagMark
()
const
;
size_t
getFieldSize
();
size_t
getNumDirEntry
()
const
;
size_t
getNumDirEntry
(
const
size_t
offsetNumDir
)
const
;
uint32_t
getStartOffset
()
const
;
uint16_t
getExifTag
(
const
size_t
offset
)
const
;
uint16_t
getU16
(
const
size_t
offset
)
const
;
...
...
@@ -225,9 +225,6 @@ private:
private
:
static
const
uint16_t
tagMarkRequired
=
0x2A
;
//offset to the _number-of-directory-entry_ field
static
const
size_t
offsetNumDir
=
8
;
//max size of data in tag.
//'DDDDDDDD' contains the value of that Tag. If its size is over 4bytes,
//'DDDDDDDD' contains the offset to data stored address.
...
...
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