Skip to content

Commit cd88f0b

Browse files
authored
Update DirectXTex.h
'void*' to 'uint8_t*'
1 parent 8a4ff71 commit cd88f0b

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

DirectXTex/DirectXTex.h

+14-14
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ namespace DirectX
325325
};
326326

327327
HRESULT __cdecl GetMetadataFromDDSMemory(
328-
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
328+
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
329329
_In_ DDS_FLAGS flags,
330330
_Out_ TexMetadata& metadata) noexcept;
331331
HRESULT __cdecl GetMetadataFromDDSFile(
@@ -334,7 +334,7 @@ namespace DirectX
334334
_Out_ TexMetadata& metadata) noexcept;
335335

336336
HRESULT __cdecl GetMetadataFromDDSMemoryEx(
337-
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
337+
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
338338
_In_ DDS_FLAGS flags,
339339
_Out_ TexMetadata& metadata,
340340
_Out_opt_ DDSMetaData* ddPixelFormat) noexcept;
@@ -345,14 +345,14 @@ namespace DirectX
345345
_Out_opt_ DDSMetaData* ddPixelFormat) noexcept;
346346

347347
HRESULT __cdecl GetMetadataFromHDRMemory(
348-
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
348+
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
349349
_Out_ TexMetadata& metadata) noexcept;
350350
HRESULT __cdecl GetMetadataFromHDRFile(
351351
_In_z_ const wchar_t* szFile,
352352
_Out_ TexMetadata& metadata) noexcept;
353353

354354
HRESULT __cdecl GetMetadataFromTGAMemory(
355-
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
355+
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
356356
_In_ TGA_FLAGS flags,
357357
_Out_ TexMetadata& metadata) noexcept;
358358
HRESULT __cdecl GetMetadataFromTGAFile(
@@ -362,7 +362,7 @@ namespace DirectX
362362

363363
#ifdef _WIN32
364364
HRESULT __cdecl GetMetadataFromWICMemory(
365-
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
365+
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
366366
_In_ WIC_FLAGS flags,
367367
_Out_ TexMetadata& metadata,
368368
_In_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
@@ -376,7 +376,7 @@ namespace DirectX
376376

377377
// Compatability helpers
378378
HRESULT __cdecl GetMetadataFromTGAMemory(
379-
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
379+
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
380380
_Out_ TexMetadata& metadata) noexcept;
381381
HRESULT __cdecl GetMetadataFromTGAFile(
382382
_In_z_ const wchar_t* szFile,
@@ -461,7 +461,7 @@ namespace DirectX
461461

462462
void __cdecl Release() noexcept;
463463

464-
void *__cdecl GetBufferPointer() const noexcept { return m_buffer; }
464+
uint8_t*__cdecl GetBufferPointer() const noexcept { return m_buffer; }
465465
size_t __cdecl GetBufferSize() const noexcept { return m_size; }
466466

467467
HRESULT __cdecl Resize(size_t size) noexcept;
@@ -471,7 +471,7 @@ namespace DirectX
471471
// Shorten size without reallocation
472472

473473
private:
474-
void* m_buffer;
474+
uint8_t* m_buffer;
475475
size_t m_size;
476476
};
477477

@@ -480,7 +480,7 @@ namespace DirectX
480480

481481
// DDS operations
482482
HRESULT __cdecl LoadFromDDSMemory(
483-
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
483+
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
484484
_In_ DDS_FLAGS flags,
485485
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
486486
HRESULT __cdecl LoadFromDDSFile(
@@ -489,7 +489,7 @@ namespace DirectX
489489
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
490490

491491
HRESULT __cdecl LoadFromDDSMemoryEx(
492-
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
492+
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
493493
_In_ DDS_FLAGS flags,
494494
_Out_opt_ TexMetadata* metadata,
495495
_Out_opt_ DDSMetaData* ddPixelFormat,
@@ -517,7 +517,7 @@ namespace DirectX
517517

518518
// HDR operations
519519
HRESULT __cdecl LoadFromHDRMemory(
520-
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
520+
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
521521
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
522522
HRESULT __cdecl LoadFromHDRFile(
523523
_In_z_ const wchar_t* szFile,
@@ -528,7 +528,7 @@ namespace DirectX
528528

529529
// TGA operations
530530
HRESULT __cdecl LoadFromTGAMemory(
531-
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
531+
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
532532
_In_ TGA_FLAGS flags,
533533
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
534534
HRESULT __cdecl LoadFromTGAFile(
@@ -546,7 +546,7 @@ namespace DirectX
546546
// WIC operations
547547
#ifdef _WIN32
548548
HRESULT __cdecl LoadFromWICMemory(
549-
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
549+
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
550550
_In_ WIC_FLAGS flags,
551551
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image,
552552
_In_ std::function<void __cdecl(IWICMetadataQueryReader*)> getMQR = nullptr);
@@ -578,7 +578,7 @@ namespace DirectX
578578

579579
// Compatability helpers
580580
HRESULT __cdecl LoadFromTGAMemory(
581-
_In_reads_bytes_(size) const void* pSource, _In_ size_t size,
581+
_In_reads_bytes_(size) const uint8_t* pSource, _In_ size_t size,
582582
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image) noexcept;
583583
HRESULT __cdecl LoadFromTGAFile(
584584
_In_z_ const wchar_t* szFile,

0 commit comments

Comments
 (0)