Updated the use of IDataBlob

An Offset parameter was added to GetDataPtr() and GetConstDataPtr() methods

Author: TheMostDiligent

TextureLoader/src/Image.cpp

@@ -77,22 +77,22 @@ class TIFFClientOpenWrapper
 
     static tmsize_t TIFFReadProc(thandle_t pClientData, void* pBuffer, tmsize_t Size)
     {
-        auto* pThis   = static_cast<TIFFClientOpenWrapper*>(pClientData);
-        auto* pSrcPtr = static_cast<const Uint8*>(pThis->m_pData->GetConstDataPtr()) + pThis->m_Offset;
+        TIFFClientOpenWrapper* pThis   = static_cast<TIFFClientOpenWrapper*>(pClientData);
+        const void*            pSrcPtr = pThis->m_pData->GetConstDataPtr(pThis->m_Offset);
         memcpy(pBuffer, pSrcPtr, Size);
         pThis->m_Offset += Size;
         return Size;
     }
 
     static tmsize_t TIFFWriteProc(thandle_t pClientData, void* pBuffer, tmsize_t Size)
     {
-        auto* pThis = static_cast<TIFFClientOpenWrapper*>(pClientData);
+        TIFFClientOpenWrapper* pThis = static_cast<TIFFClientOpenWrapper*>(pClientData);
         if (pThis->m_Offset + Size > pThis->m_Size)
         {
             pThis->m_Size = pThis->m_Offset + Size;
             pThis->m_pData->Resize(pThis->m_Size);
         }
-        auto* pDstPtr = static_cast<Uint8*>(pThis->m_pData->GetDataPtr()) + pThis->m_Offset;
+        auto* pDstPtr = pThis->m_pData->GetDataPtr(pThis->m_Offset);
         memcpy(pDstPtr, pBuffer, Size);
         pThis->m_Offset += Size;
         return Size;

TextureLoader/src/JPEGCodec.c

@@ -94,7 +94,7 @@ DECODE_JPEG_RESULT Diligent_DecodeJpeg(IDataBlob* pSrcJpegBits,
     jpeg_create_decompress(&cinfo);
 
     // Step 2: specify data source
-    const unsigned char* pSrcPtr = IDataBlob_GetConstDataPtr(pSrcJpegBits);
+    const unsigned char* pSrcPtr = IDataBlob_GetConstDataPtr(pSrcJpegBits, 0);
     unsigned long        SrcSize = (unsigned long)IDataBlob_GetSize(pSrcJpegBits);
     jpeg_mem_src(&cinfo, pSrcPtr, SrcSize);
 
@@ -142,7 +142,7 @@ DECODE_JPEG_RESULT Diligent_DecodeJpeg(IDataBlob* pSrcJpegBits,
         // Here the array is only one element long, but you could ask for
         // more than one scanline at a time if that's more convenient.
 
-        Uint8*   pScanline0   = IDataBlob_GetDataPtr(pDstPixels);
+        Uint8*   pScanline0   = IDataBlob_GetDataPtr(pDstPixels, 0);
         Uint8*   pDstScanline = pScanline0 + cinfo.output_scanline * (size_t)pDstImgDesc->RowStride;
         JSAMPROW RowPtrs[1];
         RowPtrs[0] = (JSAMPROW)pDstScanline;
@@ -263,7 +263,7 @@ ENCODE_JPEG_RESULT Diligent_EncodeJpeg(Uint8*     pSrcRGBPixels,
     jpeg_finish_compress(&cinfo);
 
     IDataBlob_Resize(pDstJpegBits, mem_size);
-    void* pDstPtr = IDataBlob_GetDataPtr(pDstJpegBits);
+    void* pDstPtr = IDataBlob_GetDataPtr(pDstJpegBits, 0);
     memcpy(pDstPtr, mem, mem_size);
 
     /* After finish_compress, we can free memory buffer. */

TextureLoader/src/PNGCodec.c

@@ -43,7 +43,7 @@ typedef struct PNGReadFnState PNGReadFnState;
 static void PngReadCallback(png_structp pngPtr, png_bytep data, png_size_t length)
 {
     PNGReadFnState* pState  = (PNGReadFnState*)(png_get_io_ptr(pngPtr));
-    Uint8*          pDstPtr = (Uint8*)IDataBlob_GetDataPtr(pState->pPngBits) + pState->Offset;
+    void*           pDstPtr = IDataBlob_GetDataPtr(pState->pPngBits, pState->Offset);
     memcpy(data, pDstPtr, length);
     pState->Offset += length;
 }
@@ -60,7 +60,7 @@ DECODE_PNG_RESULT Diligent_DecodePng(IDataBlob* pSrcPngBits,
     // https://gist.github.com/niw/5963798
 
     const size_t    PngSigSize = 8;
-    png_const_bytep pngsig     = (png_const_bytep)IDataBlob_GetConstDataPtr(pSrcPngBits);
+    png_const_bytep pngsig     = (png_const_bytep)IDataBlob_GetConstDataPtr(pSrcPngBits, 0);
     //Let LibPNG check the signature. If this function returns 0, everything is OK.
     if (png_sig_cmp(pngsig, 0, PngSigSize) != 0)
     {
@@ -168,7 +168,7 @@ DECODE_PNG_RESULT Diligent_DecodePng(IDataBlob* pSrcPngBits,
     pDstImgDesc->RowStride = (pDstImgDesc->RowStride + 3u) & ~3u;
 
     IDataBlob_Resize(pDstPixels, pDstImgDesc->Height * (size_t)pDstImgDesc->RowStride);
-    png_bytep pRow0 = IDataBlob_GetDataPtr(pDstPixels);
+    png_bytep pRow0 = IDataBlob_GetDataPtr(pDstPixels, 0);
     for (size_t i = 0; i < pDstImgDesc->Height; i++)
         rowPtrs[i] = pRow0 + i * pDstImgDesc->RowStride;
 
@@ -187,7 +187,7 @@ static void PngWriteCallback(png_structp png_ptr, png_bytep data, png_size_t len
     IDataBlob* pEncodedData = (IDataBlob*)png_get_io_ptr(png_ptr);
     size_t     PrevSize     = IDataBlob_GetSize(pEncodedData);
     IDataBlob_Resize(pEncodedData, PrevSize + length);
-    Uint8* pBytes = (Uint8*)IDataBlob_GetDataPtr(pEncodedData);
+    Uint8* pBytes = (Uint8*)IDataBlob_GetDataPtr(pEncodedData, 0);
     memcpy(pBytes + PrevSize, data, length);
 }
 

TextureLoader/src/TextureLoaderImpl.cpp

@@ -259,7 +259,7 @@ void TextureLoaderImpl::LoadFromImage(Image* pImage, const TextureLoadInfo& TexL
         CopyAttribs.Width            = ImgDesc.Width;
         CopyAttribs.Height           = ImgDesc.Height;
         CopyAttribs.SrcComponentSize = CompSize;
-        CopyAttribs.pSrcPixels       = pImage->GetData()->GetDataPtr();
+        CopyAttribs.pSrcPixels       = pImage->GetData()->GetConstDataPtr();
         CopyAttribs.SrcStride        = ImgDesc.RowStride;
         CopyAttribs.SrcCompCount     = ImgDesc.NumComponents;
         CopyAttribs.pDstPixels       = m_Mips[0].data();
@@ -305,7 +305,7 @@ void TextureLoaderImpl::LoadFromImage(Image* pImage, const TextureLoadInfo& TexL
         // Keep strong reference to the image to prevent it from being destroyed
         // since we are going to use its data directly.
         m_pImage                 = pImage;
-        m_SubResources[0].pData  = m_pImage->GetData()->GetDataPtr();
+        m_SubResources[0].pData  = m_pImage->GetData()->GetConstDataPtr();
         m_SubResources[0].Stride = ImgDesc.RowStride;
     }