Mercurial > love-experiments
diff src/libraries/ddsparse/ddsparse.cpp @ 1421:aa603d1b03bc image-CompressedData
Code cleanup
| author | Alex Szpakowski <slime73@gmail.com> |
|---|---|
| date | Fri, 05 Apr 2013 18:55:44 -0300 |
| parents | 2a5ef265e040 |
| children | 377f9dad7a2d |
line wrap: on
line diff
--- a/src/libraries/ddsparse/ddsparse.cpp Thu Apr 04 19:09:18 2013 -0300 +++ b/src/libraries/ddsparse/ddsparse.cpp Fri Apr 05 18:55:44 2013 -0300 @@ -81,7 +81,6 @@ // Data must be big enough for both headers plus the magic value. if (dataSize < (sizeof(uint32_t) + sizeof(DDSHeader) + sizeof(DDSHeader10))) return false; - } return true; @@ -106,7 +105,6 @@ if ((options & OPTIONS_COPY_DATA) && img.dataSize > 0) { uint8_t *data = 0; - try { data = new uint8_t[img.dataSize]; @@ -116,7 +114,7 @@ clearData(); throw; } - + memcpy(data, it->data, img.dataSize); img.data = data; } @@ -164,7 +162,9 @@ else if (fmt.fourCC == FourCC('D','X','T','5')) return FORMAT_DXT5; else if (fmt.fourCC == FourCC('A','T','I','2')) - return FORMAT_BC5u; + return FORMAT_BC5; + else if (fmt.fourCC == FourCC('B','C','5','S')) + return FORMAT_BC5s; } return FORMAT_UNKNOWN; @@ -196,7 +196,7 @@ break; case DXGI_FORMAT_BC5_TYPELESS: case DXGI_FORMAT_BC5_UNORM: - f = FORMAT_BC5u; + f = FORMAT_BC5; break; case DXGI_FORMAT_BC7_TYPELESS: case DXGI_FORMAT_BC7_UNORM: @@ -221,7 +221,7 @@ case FORMAT_DXT3: case FORMAT_DXT5: case FORMAT_BC5s: - case FORMAT_BC5u: + case FORMAT_BC5: case FORMAT_BC7: case FORMAT_BC7srgb: { @@ -269,7 +269,6 @@ if (options & OPTIONS_COPY_DATA) { uint8_t *newData = 0; - try { newData = new uint8_t[img.dataSize]; @@ -280,7 +279,6 @@ clearData(); throw; } - memcpy(newData, &data[offset], img.dataSize); img.data = newData; }
