Changeset 489 for pkpgcounter/trunk/pkpgpdls/tiff.py

Timestamp:

11/17/07 16:21:11 (17 years ago)

Author:

jerome

Message:

Improved code robustness.

Files:

• pkpgcounter/trunk/pkpgpdls/tiff.py (modified) (1 diff)

pkpgcounter/trunk/pkpgpdls/tiff.py

@@ -66 +66 @@
             raise pdlparser.PDLParserError, "Unknown file endianness."
         pos = 4    
-        try :    
-            nextifdoffset = unpack(integerbyteorder, minfile[pos : pos + 4])[0]
-            while nextifdoffset :
-                direntrycount = unpack(shortbyteorder, minfile[nextifdoffset : nextifdoffset + 2])[0]
-                pos = nextifdoffset + 2 + (direntrycount * 12)
+        try :
+            try :    
                 nextifdoffset = unpack(integerbyteorder, minfile[pos : pos + 4])[0]
-                pagecount += 1
-        except IndexError :            
-            pass
-        minfile.close()
+                while nextifdoffset :
+                    direntrycount = unpack(shortbyteorder, minfile[nextifdoffset : nextifdoffset + 2])[0]
+                    pos = nextifdoffset + 2 + (direntrycount * 12)
+                    nextifdoffset = unpack(integerbyteorder, minfile[pos : pos + 4])[0]
+                    pagecount += 1
+            except IndexError :            
+                pass
+        finally :        
+            minfile.close()
         return pagecount