Changeset 11923

Show
Ignore:
Timestamp:
08/22/07 10:16:25 (1 year ago)
Author:
warmerdam
Message:

do not try to add a lut entry for images without luts (#1751)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gdal/frmts/nitf/nitfimage.c

    r11910 r11923  
    776776    } 
    777777 
    778     /* Bug #1751 : Add a transparent color if they are none. Absent subblocks will be then transparent */ 
    779     if (psImage->bNoDataSet == FALSE && psImage->nBands == 1 && psImage->nBitsPerSample == 8) 
    780     { 
    781       NITFBandInfo *psBandInfo = psImage->pasBandInfo; 
    782       if (psBandInfo->nSignificantLUTEntries < 256-1) 
    783       { 
    784         psBandInfo->pabyLUT[0+psBandInfo->nSignificantLUTEntries] = 0; 
    785         psBandInfo->pabyLUT[256+psBandInfo->nSignificantLUTEntries] = 0; 
    786         psBandInfo->pabyLUT[512+psBandInfo->nSignificantLUTEntries] = 0; 
    787         psImage->bNoDataSet = TRUE; 
    788         psImage->nNoDataValue = psBandInfo->nSignificantLUTEntries; 
    789         psBandInfo->nSignificantLUTEntries ++; 
    790       } 
     778/* -------------------------------------------------------------------- */ 
     779/*      Bug #1751: Add a transparent color if there are none. Absent    */ 
     780/*      subblocks will be then transparent.                             */ 
     781/* -------------------------------------------------------------------- */ 
     782    if( !psImage->bNoDataSet 
     783        && psImage->nBands == 1  
     784        && psImage->nBitsPerSample == 8 ) 
     785    { 
     786        NITFBandInfo *psBandInfo = psImage->pasBandInfo; 
     787        if (psBandInfo->nSignificantLUTEntries < 256-1 
     788            && psBandInfo->pabyLUT != NULL ) 
     789        { 
     790            psBandInfo->pabyLUT[0+psBandInfo->nSignificantLUTEntries] = 0; 
     791            psBandInfo->pabyLUT[256+psBandInfo->nSignificantLUTEntries] = 0; 
     792            psBandInfo->pabyLUT[512+psBandInfo->nSignificantLUTEntries] = 0; 
     793            psImage->bNoDataSet = TRUE; 
     794            psImage->nNoDataValue = psBandInfo->nSignificantLUTEntries; 
     795            psBandInfo->nSignificantLUTEntries ++; 
     796        } 
    791797    } 
    792798