LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 19:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some pointer type conversion errors in MSVC.

Browse Source 
--HG--
branch : minor
This commit is contained in:
rude
2014-04-23 22:31:56 +02:00
parent 4d579074a1
commit 6da3105fe2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/image/magpie/JPEGHandler.cpp
+5 -1
View File
@@ -136,11 +136,13 @@ FormatHandler::EncodedImage JPEGHandler::encode(const DecodedImage &img, ImageDa
throw love::Exception("Out of memory."); throw love::Exception("Out of memory.");
} }
unsigned long jpegSize = tjsize;
int status = tjCompress2(compressor, int status = tjCompress2(compressor,
img.data, img.data,
img.width, 0, img.height, img.width, 0, img.height,
TJPF_RGBA, TJPF_RGBA,
&encodedimage.data, &encodedimage.size, &encodedimage.data, &jpegSize,
TJSAMP_444, COMPRESS_QUALITY, TJFLAG_NOREALLOC); TJSAMP_444, COMPRESS_QUALITY, TJFLAG_NOREALLOC);
if (status < 0) if (status < 0)
@@ -149,6 +151,8 @@ FormatHandler::EncodedImage JPEGHandler::encode(const DecodedImage &img, ImageDa
throw love::Exception("Could not encode jpeg image: %s", tjGetErrorStr()); throw love::Exception("Could not encode jpeg image: %s", tjGetErrorStr());
} }
encodedimage.size = jpegSize;
return encodedimage; return encodedimage;
} }
src/modules/image/magpie/PNGHandler.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ static unsigned zlibDecompress(unsigned char **out, size_t *outsize, const unsig
{ {
int status = Z_OK; int status = Z_OK;
size_t outdataSize = insize; uLongf outdataSize = insize;
size_t sizeMultiplier = 0; size_t sizeMultiplier = 0;
unsigned char *outdata = nullptr; unsigned char *outdata = nullptr;