Changeset 13657

Timestamp:

02/01/08 16:43:10 (3 months ago)

Author:

warmerdam

Message:

added JPEG Compressed YCbCr TIFF testing (#2189)

Files:

• trunk/autotest/gcore/data/sasha.tif (added)
• trunk/autotest/gcore/tiff_write.py (modified) (2 diffs)
• trunk/autotest/pymod/gdaltest.py (modified) (3 diffs)

trunk/autotest/gcore/tiff_write.py

@@ -364 +364 @@
-    return ut.testCreateCopy()
-
+###############################################################################
+# Read JPEG Compressed YCbCr subsampled image. 
+
+def tiff_write_12():
+
+    drv = gdal.GetDriverByName( 'GTiff' )
+    md = drv.GetMetadata()
+    if string.find(md['DMD_CREATIONOPTIONLIST'],'JPEG') == -1:
+        return 'skip'
+    
+    ut = gdaltest.GDALTest( 'GTiff', 'sasha.tif', 3, 31952 )
+                           
+    return ut.testOpen()
+
+###############################################################################
+# Write JPEG Compressed YCbCr subsampled image. 
+
+def tiff_write_13():
+
+    drv = gdal.GetDriverByName( 'GTiff' )
+    md = drv.GetMetadata()
+    if string.find(md['DMD_CREATIONOPTIONLIST'],'JPEG') == -1:
+        return 'skip'
+
+    ut = gdaltest.GDALTest( 'GTiff', 'sasha.tif', 3, 17255,
+                            options = [ 'TILED=YES',
+                                        'COMPRESS=JPEG',
+                                        'PHOTOMETRIC=YCBCR',
+                                        'JPEG_QUALITY=31' ] )
+                           
+    return ut.testCreateCopy( skip_preclose_test=1 )
+
-def tiff_write_cleanup():
-    gdaltest.tiff_drv = None
@@ -381 +413 @@
-    tiff_write_10,
-    tiff_write_11,
+    tiff_write_12,
+    tiff_write_13,
-    tiff_write_cleanup ]
-

trunk/autotest/pymod/gdaltest.py

@@ -340 +340 @@
-
-    def testCreateCopy(self, check_minmax = 1, check_gt = 0, check_srs = None,
-
+
+
+
-        if self.testDriver() == 'fail':
-            return 'skip'
@@ -367 +369 @@
-            return 'fail'
-
-
+ and skip_preclose_test == 0
-            bnd = new_ds.GetRasterBand(self.band)
-            if self.chksum is not None and bnd.Checksum() != self.chksum:
@@ -395 +397 @@
-            bnd = new_ds.GetRasterBand(self.band)
-            if self.chksum is not None and bnd.Checksum() != self.chksum:
-
-
+
+
+
+
+
-            got_minmax = bnd.ComputeRasterMinMax()
-            if got_minmax != minmax and check_minmax: