MrSID driver fails when decoding strip data

Martin,

Could you apply this in subversion?  I'll review it, and then backport
into the 1.4 branch if it looks good to me. 

Thanks!

Frank,

Here is the code for review.  I will also apply to subversion.  This fix has been validated as "passed" by our testing team.  That doesn't guarantee that is is flawless but it should be pretty good.

/************************************************************************/

/*                             decodeStrip()                            */

/************************************************************************/

 

LT_STATUS MrSIDDummyImageReader::decodeStrip(LTISceneBuffer& stripData,

                                             const LTIScene& stripScene)

{

    const lt_int32  nXOff = stripScene.getUpperLeftCol();

    const lt_int32  nYOff = stripScene.getUpperLeftRow();

    const lt_int32  nBufXSize = stripScene.getNumCols();

    const lt_int32  nBufYSize = stripScene.getNumRows();

    const lt_int32  nDataBufXSize = stripData.getTotalNumCols();

    const lt_int32  nDataBufYSize = stripData.getTotalNumRows();

             const lt_uint16 nBands = poPixel->getNumBands();

 

    void    *pData = CPLMalloc(nDataBufXSize * nDataBufYSize * poPixel->getNumBytes());

    if ( !pData )

    {

        CPLError( CE_Failure, CPLE_AppDefined,

                  "MrSIDDummyImageReader::decodeStrip(): "

                  "Cannot allocate enough space for scene buffer" );

        return LT_STS_Failure;

    }

 

    poDS->RasterIO( GF_Read, nXOff, nYOff, nBufXSize, nBufYSize, 

                    pData, nBufXSize, nBufYSize, eDataType, nBands, NULL, 

                    0, 0, 0 );

    stripData.importDataBSQ( pData );

 

    CPLFree( pData );

 

    return LT_STS_Success;

}

This has been fixed, tested and comitted to SVN.

Patch back ported into 1.4 branch.