Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
python-exif
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Debian Python Team
packages
python-exif
Commits
d541fd76
Commit
d541fd76
authored
9 years ago
by
Ianaré Sévi
Browse files
Options
Downloads
Patches
Plain Diff
version 2.1.1
parent
07cede56
No related branches found
Branches containing commit
Tags
2.1.1
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ChangeLog.rst
+2
-1
2 additions, 1 deletion
ChangeLog.rst
exifread/__init__.py
+1
-1
1 addition, 1 deletion
exifread/__init__.py
exifread/classes.py
+1
-20
1 addition, 20 deletions
exifread/classes.py
with
4 additions
and
22 deletions
ChangeLog.rst
+
2
−
1
View file @
d541fd76
...
...
@@ -2,9 +2,10 @@
Change Log
**********
develop
2.1.1 — 2015-05-16
* Add a CONTRIBUTING file for Github.
* Add some FujiFilm tags.
* Revert Canon Makernote processing modifications
2.1.0 — 2015-05-15
* Bypass empty/unreadable Olympus MakerNote info (issue #42)
...
...
This diff is collapsed.
Click to expand it.
exifread/__init__.py
+
1
−
1
View file @
d541fd76
...
...
@@ -7,7 +7,7 @@ from .classes import *
from
.tags
import
*
from
.utils
import
ord_
__version__
=
'
2.1.
0
'
__version__
=
'
2.1.
1
'
logger
=
get_logger
()
...
...
This diff is collapsed.
Click to expand it.
exifread/classes.py
+
1
−
20
View file @
d541fd76
...
...
@@ -445,27 +445,8 @@ class ExifHeader:
# Canon
if
make
==
'
Canon
'
:
# This is needed for some Canon models.
# For instance Canon Powershot SX60
offset
=
note
.
values
[
-
4
:]
if
(
self
.
endian
==
'
I
'
)
and
\
(
note
.
values
[
-
8
:
-
4
]
==
[
73
,
73
,
42
,
0
])
:
offset
=
note
.
field_offset
-
\
(
offset
[
0
]
+
offset
[
1
]
*
256
+
\
offset
[
2
]
*
65536
+
offset
[
3
]
*
16777216
)
elif
(
self
.
endian
==
'
M
'
)
and
\
(
note
.
values
[
-
8
:
-
4
]
==
[
77
,
77
,
0
,
42
])
:
offset
=
note
.
field_offset
-
\
(
offset
[
0
]
*
16777216
+
offset
[
1
]
*
65536
+
\
offset
[
2
]
*
256
+
offset
[
3
])
else
:
offset
=
0
t
=
self
.
offset
self
.
offset
+=
offset
self
.
dump_ifd
(
note
.
field_offset
-
self
.
offset
,
'
MakerNote
'
,
self
.
dump_ifd
(
note
.
field_offset
,
'
MakerNote
'
,
tag_dict
=
makernote
.
canon
.
TAGS
)
self
.
offset
=
t
for
i
in
((
'
MakerNote Tag 0x0001
'
,
makernote
.
canon
.
CAMERA_SETTINGS
),
(
'
MakerNote Tag 0x0002
'
,
makernote
.
canon
.
FOCAL_LENGTH
),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment