[Python-modules-commits] [python-exif] 03/12: apply patches

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to annotated tag 1.0.10
in repository python-exif.

commit 05a6420d4ace43b2a852f6fe5fe197760fc8b816
Author: ianare <ianare at gmail.com>
Date:   Fri Jun 1 03:00:49 2012 +0200

    apply patches
---
 EXIF.py | 70 +++++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 26 deletions(-)

diff --git a/EXIF.py b/EXIF.py
index ed4192a..0779ca1 100755
--- a/EXIF.py
+++ b/EXIF.py
@@ -251,40 +251,54 @@ EXIF_TAGS = {
               2: 'CenterWeightedAverage',
               3: 'Spot',
               4: 'MultiSpot',
-              5: 'Pattern'}),
+              5: 'Pattern',
+              6: 'Partial',
+              255: 'other'}),
     0x9208: ('LightSource',
              {0: 'Unknown',
               1: 'Daylight',
               2: 'Fluorescent',
-              3: 'Tungsten',
-              9: 'Fine Weather',
-              10: 'Flash',
+              3: 'Tungsten (incandescent light)',
+              4: 'Flash',
+              9: 'Fine weather',
+              10: 'Cloudy weather',
               11: 'Shade',
-              12: 'Daylight Fluorescent',
-              13: 'Day White Fluorescent',
-              14: 'Cool White Fluorescent',
-              15: 'White Fluorescent',
-              17: 'Standard Light A',
-              18: 'Standard Light B',
-              19: 'Standard Light C',
+              12: 'Daylight fluorescent (D 5700 - 7100K)',
+              13: 'Day white fluorescent (N 4600 - 5400K)',
+              14: 'Cool white fluorescent (W 3900 - 4500K)',
+              15: 'White fluorescent (WW 3200 - 3700K)',
+              17: 'Standard light A',
+              18: 'Standard light B',
+              19: 'Standard light C',
               20: 'D55',
               21: 'D65',
               22: 'D75',
-              255: 'Other'}),
+              23: 'D50',
+              24: 'ISO studio tungsten',
+              255: 'other light source',}),
     0x9209: ('Flash',
-             {0: 'No',
-              1: 'Fired',
-              5: 'Fired (?)', # no return sensed
-              7: 'Fired (!)', # return sensed
-              9: 'Fill Fired',
-              13: 'Fill Fired (?)',
-              15: 'Fill Fired (!)',
-              16: 'Off',
-              24: 'Auto Off',
-              25: 'Auto Fired',
-              29: 'Auto Fired (?)',
-              31: 'Auto Fired (!)',
-              32: 'Not Available'}),
+             {0: 'Flash did not fire',
+              1: 'Flash fired',
+              5: 'Strobe return light not detected',
+              7: 'Strobe return light detected',
+              9: 'Flash fired, compulsory flash mode',
+              13: 'Flash fired, compulsory flash mode, return light not detected',
+              15: 'Flash fired, compulsory flash mode, return light detected',
+              16: 'Flash did not fire, compulsory flash mode',
+              24: 'Flash did not fire, auto mode',
+              25: 'Flash fired, auto mode',
+              29: 'Flash fired, auto mode, return light not detected',
+              31: 'Flash fired, auto mode, return light detected',
+              32: 'No flash function',
+              65: 'Flash fired, red-eye reduction mode',
+              69: 'Flash fired, red-eye reduction mode, return light not detected',
+              71: 'Flash fired, red-eye reduction mode, return light detected',
+              73: 'Flash fired, compulsory flash mode, red-eye reduction mode',
+              77: 'Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected',
+              79: 'Flash fired, compulsory flash mode, red-eye reduction mode, return light detected',
+              89: 'Flash fired, auto mode, red-eye reduction mode',
+              93: 'Flash fired, auto mode, return light not detected, red-eye reduction mode',
+              95: 'Flash fired, auto mode, return light detected, red-eye reduction mode'}),
     0x920A: ('FocalLength', ),
     0x9214: ('SubjectArea', ),
     0x927C: ('MakerNote', ),
@@ -1283,7 +1297,11 @@ class EXIF_header:
     # return pointer to next IFD
     def next_IFD(self, ifd):
         entries=self.s2n(ifd, 2)
-        return self.s2n(ifd+2+12*entries, 4)
+        next_ifd = self.s2n(ifd+2+12*entries, 4)
+        if next_ifd == ifd:
+            return 0
+        else:
+            return next_ifd
 
     # return list of IFDs in header
     def list_IFDs(self):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-exif.git