Added R_SkinFrame_PurgeSkinFrame to de-duplicate some repeated code.

[xonotic/darkplaces.git] / jpeg.c

diff --git a/jpeg.c b/jpeg.c
index e69fe76867d6eb84a51442802d1a0aeb07bcd8b2..44e53e4216074c20d62bd08952205923fc0a8343 100644 (file)
--- a/jpeg.c
+++ b/jpeg.c
@@ -515,6 +515,12 @@ qboolean JPEG_OpenLibrary (void)
 
        jpeg_tried_loading = true;
 
+#ifdef __ANDROID__
+       // loading the native Android libjpeg.so causes crashes
+       Con_Printf("Not opening libjpeg.so dynamically on Android - use LINK_TO_LIBJPEG instead if it is needed.\n");
+       return false;
+#endif
+
        // Load the DLL
        return Sys_LoadLibrary (dllnames, &jpeg_dll, jpegfuncs);
 #endif
@@ -626,7 +632,7 @@ unsigned char* JPEG_LoadImage_BGRA (const unsigned char *f, int filesize, int *m
        image_width = cinfo.output_width;
        image_height = cinfo.output_height;
 
-       if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
+       if (image_width > 32768 || image_height > 32768 || image_width <= 0 || image_height <= 0)
        {
                Con_Printf("JPEG_LoadImage: invalid image size %ix%i\n", image_width, image_height);
                return NULL;
@@ -964,8 +970,8 @@ size_t JPEG_SaveImage_to_Buffer (char *jpegbuf, size_t jpegsize, int width, int
        }
 #endif
 
-       //quality_guess = (100 * jpegsize - 41000) / (width*height) + 2; // fits random data
-       quality_guess   = (256 * jpegsize - 81920) / (width*height) - 8; // fits Nexuiz's map pictures
+       //quality_guess = (int)((100 * jpegsize - 41000) / (width*height) + 2); // fits random data
+       quality_guess   = (int)((256 * jpegsize - 81920) / (width*height) - 8); // fits Nexuiz's/Xonotic's map pictures
 
        quality_guess = bound(0, quality_guess, 100);
        quality = bound(0, quality_guess + sv_writepicture_quality.integer, 100); // assume it can do 10 failed attempts
@@ -1003,7 +1009,8 @@ static CompressedImageCacheItem *CompressedImageCache[COMPRESSEDIMAGECACHE_SIZE]
 
 static void CompressedImageCache_Add(const char *imagename, size_t maxsize, void *compressed, size_t compressed_size)
 {
-       const char *hashkey = va("%s:%d", imagename, (int) maxsize);
+       char vabuf[1024];
+       const char *hashkey = va(vabuf, sizeof(vabuf), "%s:%d", imagename, (int) maxsize);
        int hashindex = CRC_Block((unsigned char *) hashkey, strlen(hashkey)) % COMPRESSEDIMAGECACHE_SIZE;
        CompressedImageCacheItem *i;
 
@@ -1021,7 +1028,8 @@ static void CompressedImageCache_Add(const char *imagename, size_t maxsize, void
 
 static CompressedImageCacheItem *CompressedImageCache_Find(const char *imagename, size_t maxsize)
 {
-       const char *hashkey = va("%s:%d", imagename, (int) maxsize);
+       char vabuf[1024];
+       const char *hashkey = va(vabuf, sizeof(vabuf), "%s:%d", imagename, (int) maxsize);
        int hashindex = CRC_Block((unsigned char *) hashkey, strlen(hashkey)) % COMPRESSEDIMAGECACHE_SIZE;
        CompressedImageCacheItem *i = CompressedImageCache[hashindex];