Added Blob::GetConstBufferPointer

Author: walbourn

Auxiliary/DirectXTexXboxDDS.cpp

@@ -694,7 +694,7 @@ HRESULT Xbox::SaveToDDSMemory(const XboxImage& xbox, Blob& blob)
         return hr;
 
     // Copy header
-    auto pDestination = reinterpret_cast<uint8_t*>(blob.GetBufferPointer());
+    auto pDestination = blob.GetBufferPointer();
     assert(pDestination);
 
     hr = EncodeDDSHeader(xbox, pDestination, DDS_XBOX_HEADER_SIZE);

DirectXTex/DirectXTex.h

@@ -462,6 +462,9 @@ namespace DirectX
         void __cdecl Release() noexcept;
 
         uint8_t* __cdecl GetBufferPointer() const noexcept { return m_buffer; }
+
+        const uint8_t* __cdecl GetConstBufferPointer() const noexcept { return m_buffer; }
+
         size_t __cdecl GetBufferSize() const noexcept { return m_size; }
 
         HRESULT __cdecl Resize(size_t size) noexcept;

DirectXTex/DirectXTexDDS.cpp

@@ -2355,7 +2355,7 @@ HRESULT DirectX::SaveToDDSMemory(
     if (FAILED(hr))
         return hr;
 
-    auto pDestination = static_cast<uint8_t*>(blob.GetBufferPointer());
+    auto pDestination = blob.GetBufferPointer();
     assert(pDestination);
 
     hr = EncodeDDSHeader(metadata, flags, pDestination, blob.GetBufferSize(), required);

DirectXTex/DirectXTexHDR.cpp

@@ -1045,7 +1045,7 @@ HRESULT DirectX::SaveToHDRMemory(const Image& image, Blob& blob) noexcept
         return hr;
 
     // Copy header
-    auto dPtr = static_cast<uint8_t*>(blob.GetBufferPointer());
+    auto dPtr = blob.GetBufferPointer();
     assert(dPtr != nullptr);
     memcpy(dPtr, header, headerLen);
     dPtr += headerLen;
@@ -1097,7 +1097,7 @@ HRESULT DirectX::SaveToHDRMemory(const Image& image, Blob& blob) noexcept
     }
 #endif
 
-    hr = blob.Trim(size_t(dPtr - static_cast<uint8_t*>(blob.GetBufferPointer())));
+    hr = blob.Trim(size_t(dPtr - blob.GetConstBufferPointer()));
     if (FAILED(hr))
     {
         blob.Release();
@@ -1184,7 +1184,7 @@ HRESULT DirectX::SaveToHDRFile(const Image& image, const wchar_t* szFile) noexce
     #ifdef _WIN32
         auto const bytesToWrite = static_cast<const DWORD>(blob.GetBufferSize());
         DWORD bytesWritten;
-        if (!WriteFile(hFile.get(), blob.GetBufferPointer(), bytesToWrite, &bytesWritten, nullptr))
+        if (!WriteFile(hFile.get(), blob.GetConstBufferPointer(), bytesToWrite, &bytesWritten, nullptr))
         {
             return HRESULT_FROM_WIN32(GetLastError());
         }
@@ -1194,7 +1194,7 @@ HRESULT DirectX::SaveToHDRFile(const Image& image, const wchar_t* szFile) noexce
             return E_FAIL;
         }
     #else
-        outFile.write(reinterpret_cast<char*>(blob.GetBufferPointer()),
+        outFile.write(reinterpret_cast<const char*>(blob.GetConstBufferPointer()),
             static_cast<std::streamsize>(blob.GetBufferSize()));
 
         if (!outFile)

DirectXTex/DirectXTexTGA.cpp

@@ -2279,7 +2279,7 @@ HRESULT DirectX::SaveToTGAMemory(
         return hr;
 
     // Copy header
-    auto destPtr = static_cast<uint8_t*>(blob.GetBufferPointer());
+    auto destPtr = blob.GetBufferPointer();
     assert(destPtr  != nullptr);
 
     uint8_t* dPtr = destPtr;
@@ -2396,7 +2396,7 @@ HRESULT DirectX::SaveToTGAFile(
     #ifdef _WIN32
         const DWORD bytesToWrite = static_cast<DWORD>(blob.GetBufferSize());
         DWORD bytesWritten;
-        if (!WriteFile(hFile.get(), blob.GetBufferPointer(), bytesToWrite, &bytesWritten, nullptr))
+        if (!WriteFile(hFile.get(), blob.GetConstBufferPointer(), bytesToWrite, &bytesWritten, nullptr))
         {
             return HRESULT_FROM_WIN32(GetLastError());
         }
@@ -2406,7 +2406,7 @@ HRESULT DirectX::SaveToTGAFile(
             return E_FAIL;
         }
     #else
-        outFile.write(reinterpret_cast<char*>(blob.GetBufferPointer()),
+        outFile.write(reinterpret_cast<const char*>(blob.GetConstBufferPointer()),
             static_cast<std::streamsize>(blob.GetBufferSize()));
 
         if (!outFile)

DirectXTex/DirectXTexWIC.cpp

@@ -208,7 +208,7 @@ namespace
             m_streamEOF(0),
             mRefCount(1)
         {
-            assert(mBlob.GetBufferPointer() && mBlob.GetBufferSize() > 0);
+            assert(mBlob.GetConstBufferPointer() && mBlob.GetBufferSize() > 0);
         }
 
     public:
@@ -254,7 +254,7 @@ namespace
         HRESULT STDMETHODCALLTYPE Read(void* pv, ULONG cb, ULONG* pcbRead) override
         {
             size_t maxRead = m_streamEOF - m_streamPosition;
-            auto ptr = static_cast<const uint8_t*>(mBlob.GetBufferPointer());
+            auto ptr = mBlob.GetBufferPointer();
             if (cb > maxRead)
             {
                 const uint64_t pos = uint64_t(m_streamPosition) + uint64_t(maxRead);
@@ -324,7 +324,7 @@ namespace
             if (pos > UINT32_MAX)
                 return HRESULT_E_ARITHMETIC_OVERFLOW;
 
-            auto ptr = static_cast<uint8_t*>(mBlob.GetBufferPointer());
+            auto ptr = mBlob.GetBufferPointer();
             memcpy(&ptr[m_streamPosition], pv, cb);
 
             m_streamPosition = static_cast<size_t>(pos);
@@ -347,7 +347,7 @@ namespace
 
             if (blobSize >= size.LowPart)
             {
-                auto ptr = static_cast<uint8_t*>(mBlob.GetBufferPointer());
+                auto ptr = mBlob.GetBufferPointer();
                 if (m_streamEOF < size.LowPart)
                 {
                     memset(&ptr[m_streamEOF], 0, size.LowPart - m_streamEOF);
@@ -367,7 +367,7 @@ namespace
                 if (FAILED(hr))
                     return hr;
 
-                auto ptr = static_cast<uint8_t*>(mBlob.GetBufferPointer());
+                auto ptr = mBlob.GetBufferPointer();
                 if (m_streamEOF < size.LowPart)
                 {
                     memset(&ptr[m_streamEOF], 0, size.LowPart - m_streamEOF);