X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=jpeg.c;h=44e53e4216074c20d62bd08952205923fc0a8343;hb=2fc27557a6c719496832e949e1f129f6b6b83d97;hp=8df1b484083a2c9bf0951ee91ec12492ea5aa240;hpb=1c1d251ba80d985f8b7f641f3e9baa0584eb2a86;p=xonotic%2Fdarkplaces.git

diff --git a/jpeg.c b/jpeg.c
index 8df1b484..44e53e42 100644
--- 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
@@ -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/Xonotic'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];