Changeset 309 for pkpgcounter/trunk/pkpgpdls/pclxl.py

Timestamp:

02/07/06 16:34:35 (18 years ago)

Author:

jerome

Message:

Improved PCLXL parser with regard to undocumented PCLXL 3.0 tags

Files:

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

pkpgcounter/trunk/pkpgpdls/pclxl.py

@@ -219 +219 @@
             return unpack(self.endianness + "I", self.minfile[pos:posl])[0]
         else :    
-            raise pdlparser.PDLParserError, "Error on array size at %s" % self.pos
+            raise pdlparser.PDLParserError, "Error on array size at %x" % self.pos
         
     def array_16(self) :    
@@ -240 +240 @@
             return 2 * unpack(self.endianness + "I", self.minfile[pos:posl])[0]
         else :    
-            raise pdlparser.PDLParserError, "Error on array size at %s" % self.pos
+            raise pdlparser.PDLParserError, "Error on array size at %x" % self.pos
         
     def array_32(self) :    
@@ -261 +261 @@
             return 4 * unpack(self.endianness + "I", self.minfile[pos:posl])[0]
         else :    
-            raise pdlparser.PDLParserError, "Error on array size at %s" % self.pos
+            raise pdlparser.PDLParserError, "Error on array size at %x" % self.pos
         
     def embeddedDataSmall(self) :
@@ -297 +297 @@
         self.logdebug("PassThrough marker detected at %x" % self.pos)
         return 0
+        
+    def x46_class3(self) :    
+        """Undocumented class 3.0"""
+        self.logdebug("Undocumented tag 0x46 at %x" % self.pos)
+        pos = self.pos
+        minfile = self.minfile
+        while pos > 0 : # safety check : don't go back to far !
+            val = ord(minfile[pos])
+            if (val == 0xf8) and (ord(minfile[pos+1]) in (0x95, 0x96)) :
+                self.logdebug("Found !!!!!!!!!!")
+                pos += 2
+                datatype = self.minfile[pos]
+                if ord(datatype) == 0x46 :
+                    break
+                self.logdebug("0x%02x" % ord(datatype))
+                pos += 1
+                length = self.tags[ord(datatype)]
+                self.logdebug("0x%02x" % length)
+                posl = pos + length
+                if length == 1 :    
+                    toskip = unpack("B", self.minfile[pos:posl])[0]
+                elif length == 2 :    
+                    toskip = unpack(self.endianness + "H", self.minfile[pos:posl])[0]
+                elif length == 4 :    
+                    toskip = unpack(self.endianness + "I", self.minfile[pos:posl])[0]
+                else :    
+                    raise pdlparser.PDLParserError, "Error on size at %x" % self.pos
+                self.logdebug("ToSkip : %s" % toskip)    
+                return toskip 
+            else :    
+                pos = pos - 1
+        return 0    
         
     def escape(self) :    
@@ -375 +407 @@
         self.tags[0x44] = self.endPage      # EndPage
         self.tags[0x45] = self.reservedForFutureUse # reserved
-        self.tags[0x46] = self.reservedForFutureUse # reserved
+        self.tags[0x46] = self.x46_class3 
         
         self.tags[0x4a] = self.reservedForFutureUse # reserved