X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=jpeg.c;h=44e53e4216074c20d62bd08952205923fc0a8343;hb=ef9b48fe33bd373656f2c426ab3f8440d6490077;hp=4b276d2e1549c5fd5c2ca175a16c5e8e25c5a703;hpb=cfee52a1ec9db338098789cae89ae5cf1f7a6fbf;p=xonotic%2Fdarkplaces.git

diff --git a/jpeg.c b/jpeg.c
index 4b276d2e..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