diff options
| author | Denton Woods <denton.woods@gmail.com> | 2017-01-01 02:12:23 -0600 |
|---|---|---|
| committer | Denton Woods <denton.woods@gmail.com> | 2017-01-01 02:12:23 -0600 |
| commit | 1e02ea233463d447f56a31982e132a76c1141651 (patch) | |
| tree | 26251eae3a89a895a1350751db649eb6af57a1b8 /DevIL/src-IL/src/il_dds.cpp | |
| parent | f9d385e4cabe77764149f229c7fa68f6831121ad (diff) | |
| download | devil-1e02ea233463d447f56a31982e132a76c1141651.tar.gz | |
- Added ilTexImageSurface from https://github.com/gscept/DevIL/commit/122565d1434a95c92c3a5c60679e231e0a0c9a91
Diffstat (limited to 'DevIL/src-IL/src/il_dds.cpp')
| -rw-r--r-- | DevIL/src-IL/src/il_dds.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/DevIL/src-IL/src/il_dds.cpp b/DevIL/src-IL/src/il_dds.cpp index 4ffe8517..580faed1 100644 --- a/DevIL/src-IL/src/il_dds.cpp +++ b/DevIL/src-IL/src/il_dds.cpp @@ -2028,7 +2028,7 @@ ILAPI ILboolean ILAPIENTRY ilDxtcDataToImage() ILAPI ILboolean ILAPIENTRY ilSurfaceToDxtcData(ILenum Format) { ILuint Size; - void* Data; + ILubyte* Data; ilFreeSurfaceDxtcData(); Size = ilGetDXTCData(NULL, 0, Format); @@ -2036,15 +2036,15 @@ ILAPI ILboolean ILAPIENTRY ilSurfaceToDxtcData(ILenum Format) return IL_FALSE; } - Data = ialloc(Size); + Data = (ILubyte*)ialloc(Size); if (Data == NULL) return IL_FALSE; - ilGetDXTCData(Data, Size, Format); + ilGetDXTCData((void*)Data, Size, Format); //These have to be after the call to ilGetDXTCData() - iCurImage->DxtcData = (ILubyte*)Data; + iCurImage->DxtcData = Data; iCurImage->DxtcFormat = Format; iCurImage->DxtcSize = Size; @@ -2139,7 +2139,7 @@ ILAPI ILboolean ILAPIENTRY ilTexImageDxtc(ILint w, ILint h, ILint d, ILenum DxtF DataSize = yBlocks * LineSize * d; Image->DxtcFormat = DxtFormat; - Image->DxtcSize = DataSize; + Image->DxtcSize = DataSize; Image->DxtcData = (ILubyte*)ialloc(DataSize); if (Image->DxtcData == NULL) { |