Changeset 3513

Timestamp:

11/22/09 12:01:28 (14 years ago)

Author:

jerome

Message:

Fixes #50. Such files use undocumented values in PCLXL class 3.0
streams. The 0x46 tag was already recognized, now the (0x31, 0x90) tag
is handled, although we don't have any way to know for sure if it's
fixed for good or not...

Files:

• pkpgcounter/trunk/pkpgpdls/pclxl.py (modified) (4 diffs)

pkpgcounter/trunk/pkpgpdls/pclxl.py

@@ -295 +295 @@
         return 0
 
+    def x31_class3(self, nextpos) :
+        """Undocumented tag 0x13 in class 3.0 streams."""
+        #self.logdebug("x31 at 0x%08x" % (nextpos-1))
+        minfile = self.minfile
+        val = ord(minfile[nextpos])
+        if val == 0x90 : # Should we take care of this or not ? It's undocumented after all !
+            # BTW we don't know if it's the 0x31 or the 0x90 which counts, since 0x90 is reserved for future use
+            try :
+                return unpack(self.unpackType[4], self.minfile[nextpos+1:nextpos+5])[0] + 5
+            except KeyError :
+                raise pdlparser.PDLParserError, "Error on size '%s' at %x" % (length, nextpos+1)
+        return 0
+
     def x46_class3(self, nextpos) :
         """Undocumented tag 0x46 in class 3.0 streams."""
+        #self.logdebug("x46 at 0x%08x" % (nextpos-1))
         pos = nextpos - 3
         minfile = self.minfile
         val = ord(minfile[pos])
         while val == 0xf8 :
+            #self.logdebug("x46 continues at 0x%08x with 0x%02x" % (pos, val))
             funcid = ord(minfile[pos+1])
             try :
@@ -308 +323 @@
                 break
             else :
+                #self.logdebug("x46 funcid 0x%02x" % funcid)
                 pos -= offset
+                #self.logdebug("x46 new position 0x%08x" % pos)
                 length = self.tags[ord(self.minfile[pos])]
                 if callable(length) :
                     length = length(pos+1)
+                #self.logdebug("x46 length %i" % length)
                 if funcid == 0x92 : # we want to skip these blocks
                     try :
@@ -420 +438 @@
         self.tags[0x29] = self.littleEndian # LittleEndian
 
+        self.tags[0x31] = self.x31_class3   # What's this ? Does it always follow 0x46 ?
         self.tags[0x43] = self.beginPage    # BeginPage
         self.tags[0x44] = self.endPage      # EndPage
@@ -597 +616 @@
                     except OverflowError :
                         pos = oldpos + 1
+                    #self.logdebug("0x%08x : 0x%02x" % (pos, tag))
                     pos += 1
                     length = tags[tag]