Changeset 13715

Timestamp:

02/06/08 15:05:24 (5 months ago)

Author:

rouault

Message:

Apply gdal_svn_trunk_bug_1939_1692.patch (#1939)

Files:

• trunk/gdal/frmts/ecw/ecwcreatecopy.cpp (modified) (2 diffs)
• trunk/gdal/frmts/jpeg/jpgdataset.cpp (modified) (1 diff)
• trunk/gdal/frmts/jpeg2000/jpeg2000dataset.cpp (modified) (1 diff)
• trunk/gdal/frmts/mrsid/mrsiddataset.cpp (modified) (2 diffs)

trunk/gdal/frmts/ecw/ecwcreatecopy.cpp

@@ -1013 +1013 @@
-        return NULL;
-    }
+    
+    if (poSrcDS->GetRasterBand(1)->GetColorTable() != NULL)
+    {
+        CPLError( (bStrict) ? CE_Failure : CE_Warning, CPLE_NotSupported, 
+                  "ECW driver ignores color table. "
+                  "The source raster band will be considered as grey level.\n" );
+        if (bStrict)
+            return NULL;
+    }
-
-    return ECWCreateCopy( pszFilename, poSrcDS, bStrict, papszOptions, 
@@ -1052 +1061 @@
-
-        return NULL;
+    }
+
+    if (poSrcDS->GetRasterBand(1)->GetColorTable() != NULL)
+    {
+        CPLError( (bStrict) ? CE_Failure : CE_Warning, CPLE_NotSupported, 
+                  "ECW driver ignores color table. "
+                  "The source raster band will be considered as grey level.\n" );
+        if (bStrict)
+            return NULL;
-    }
-

trunk/gdal/frmts/jpeg/jpgdataset.cpp

@@ -1736 +1736 @@
-        poSrcDS->GetRasterBand(1)->GetColorTable() != NULL)
-    {
-
+(bStrict) ? CE_Failure : 
-                  "JPEG driver ignores color table. "
-                  "The source raster band will be considered as grey level.\n" );
+        if (bStrict)
+            return NULL;
-    }
-

trunk/gdal/frmts/jpeg2000/jpeg2000dataset.cpp

@@ -733 +733 @@
-    int  nYSize = poSrcDS->GetRasterYSize();
-
+    if (poSrcDS->GetRasterBand(1)->GetColorTable() != NULL)
+    {
+        CPLError( (bStrict) ? CE_Failure : CE_Warning, CPLE_NotSupported, 
+                  "JPEG2000 driver ignores color table. "
+                  "The source raster band will be considered as grey level.\n" );
+        if (bStrict)
+            return NULL;
+    }
+    
-    if( !pfnProgress( 0.0, NULL, pProgressData ) )
-        return NULL;

trunk/gdal/frmts/mrsid/mrsiddataset.cpp

@@ -2831 +2831 @@
-    bool bMeter = true;
-#endif    
-
+
+
+
+
+
+
+
+
+
+
-    // Output Mrsid Version 2 file.
-    if( pszVersion && atoi(pszVersion) == 2 )
@@ -2991 +3000 @@
-    int nYSize = poSrcDS->GetRasterYSize();
-    LT_STATUS  eStat;
+    
+    if (poSrcDS->GetRasterBand(1)->GetColorTable() != NULL)
+    {
+        CPLError( (bStrict) ? CE_Failure : CE_Warning, CPLE_NotSupported, 
+                  "MrSID driver ignores color table. "
+                  "The source raster band will be considered as grey level.\n" );
+        if (bStrict)
+            return NULL;
+    }
-      
-    if( !pfnProgress( 0.0, NULL, pProgressData ) )