Changeset 217

Timestamp:

07/02/05 11:23:23 (19 years ago)

Author:

jerome

Message:

Added basic support for the TIFF format (which can handle
multiple pages in the same file)

Location:

pkpgcounter/trunk

Files:

• NEWS (modified) (1 diff)
• pdlanalyzer/analyzer.py (modified) (4 diffs)
• pdlanalyzer/tiff.py (added)
• pdlanalyzer/version.py (modified) (1 diff)

pkpgcounter/trunk/NEWS

@@ -22 +22 @@
 pkpgcounter News :
    
+  * 1.52 : 
+  
+    - Basic support for the TIFF format.
+    
   * 1.51 : 
   

pkpgcounter/trunk/pdlanalyzer/analyzer.py

@@ -23 +23 @@
 import tempfile
 
-from pdlanalyzer import version, pdlparser, postscript, pdf, pcl345, pclxl, escp2, dvi
+from pdlanalyzer import version, pdlparser, postscript, pdf, pcl345, pclxl, escp2, dvi, tiff
 
 KILOBYTE = 1024    
@@ -58 +58 @@
             psyco.bind(pclxl.PCLXLParser.getJobSize)
             psyco.bind(dvi.DVIParser.getJobSize)
+            psyco.bind(tiff.TIFFParser.getJobSize)
         
     def getJobSize(self) :    
@@ -181 +182 @@
         if (ord(sdata[0]) == 0xf7) and (ord(edata[-1]) == 0xdf) :
             if self.debug :  
-                sys.stderr.write("%s is an DVI file\n" % str(self.filename))
+                sys.stderr.write("%s is a DVI file\n" % str(self.filename))
+            return 1
+        else :    
+            return 0
+            
+    def isTIFF(self, sdata, edata) :        
+        """Returns 1 if data is TIFF, else 0."""
+        littleendian = (chr(0x49)*2) + chr(0x2a) + chr(0)
+        bigendian = (chr(0x4d)*2) + chr(0) + chr(0x2a)
+        if sdata[:4] in (littleendian, bigendian) :
+            if self.debug :  
+                sys.stderr.write("%s is a TIFF file\n" % str(self.filename))
             return 1
         else :    
@@ -200 +212 @@
             lastblock = ""
         self.infile.seek(0)
-        if self.isPostScript(firstblock, lastblock) :
-            return postscript.PostScriptParser
-        elif self.isPCLXL(firstblock, lastblock) :    
-            return pclxl.PCLXLParser
-        elif self.isPDF(firstblock, lastblock) :    
-            return pdf.PDFParser
-        elif self.isPCL(firstblock, lastblock) :    
-            return pcl345.PCL345Parser
-        elif self.isESCP2(firstblock, lastblock) :    
-            return escp2.ESCP2Parser
-        elif self.isDVI(firstblock, lastblock) :    
-            return dvi.DVIParser
-        else :    
-            raise pdlparser.PDLParserError, "Analysis of first data block failed."
+        if not firstblock :
+            sys.stderr.write("ERROR: input file %s is empty !\n" % str(self.filename))
+        else :    
+            if self.isPostScript(firstblock, lastblock) :
+                return postscript.PostScriptParser
+            elif self.isPCLXL(firstblock, lastblock) :    
+                return pclxl.PCLXLParser
+            elif self.isPDF(firstblock, lastblock) :    
+                return pdf.PDFParser
+            elif self.isPCL(firstblock, lastblock) :    
+                return pcl345.PCL345Parser
+            elif self.isESCP2(firstblock, lastblock) :    
+                return escp2.ESCP2Parser
+            elif self.isDVI(firstblock, lastblock) :    
+                return dvi.DVIParser
+            elif self.isTIFF(firstblock, lastblock) :
+                return tiff.TIFFParser
+        raise pdlparser.PDLParserError, "Analysis of first data block failed."
             
 def main() :    

pkpgcounter/trunk/pdlanalyzer/version.py

@@ -20 +20 @@
 #
 
-__version__ = "1.51"
+__version__ = "1.52"
 
 __doc__ = """pkpgcounter : a generic Page Description Languages parser."""