Changeset 13899

Timestamp:

02/29/08 14:40:30 (4 months ago)

Author:

rouault

Message:

Fix #2249 : shift when writing NITF color table with nColors < 256

Files:

• branches/1.5/gdal/frmts/nitf/nitfdataset.cpp (modified) (1 diff)
• branches/1.5/gdal/frmts/nitf/nitfimage.c (modified) (1 diff)

branches/1.5/gdal/frmts/nitf/nitfdataset.cpp

@@ -244 +244 @@
-            sEntry.c2 = psBandInfo->pabyLUT[256 + iColor];
-            sEntry.c3 = psBandInfo->pabyLUT[512 + iColor];
-(psImage->bNoDataSet && psImage->nNoDataValue == iColor) ? 0 : 
+
-
-            poColorTable->SetColorEntry( iColor, &sEntry );
+        }
+
+        if (psImage->bNoDataSet)
+        {
+            GDALColorEntry sEntry;
+            sEntry.c1 = sEntry.c2 = sEntry.c3 = sEntry.c4 = 0;
+            poColorTable->SetColorEntry( psImage->nNoDataValue, &sEntry );
-        }
-    }

branches/1.5/gdal/frmts/nitf/nitfimage.c

@@ -820 +820 @@
-            psImage->bNoDataSet = TRUE;
-            psImage->nNoDataValue = psBandInfo->nSignificantLUTEntries;
-            psBandInfo->nSignificantLUTEntries ++;
-        }
-    }