load the JPEG dll when needed

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8399 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/jpeg.c b/jpeg.c
index 70171f8904eb1f1374023b2666529321f642ef05..51fd81cbc6e30709b4c7355c63260bdb62ff18df 100644 (file)
--- a/jpeg.c
+++ b/jpeg.c
@@ -428,6 +428,7 @@ static dllfunction_t jpegfuncs[] =
 
 // Handle for JPEG DLL
 dllhandle_t jpeg_dll = NULL;
+qboolean jpeg_tried_loading = 0;
 
 static unsigned char jpeg_eoi_marker [2] = {0xFF, JPEG_EOI};
 static qboolean error_in_jpeg;
@@ -480,6 +481,11 @@ qboolean JPEG_OpenLibrary (void)
        if (jpeg_dll)
                return true;
 
+       if (jpeg_tried_loading) // only try once
+               return false;
+
+       jpeg_tried_loading = true;
+
        // Load the DLL
        return Sys_LoadLibrary (dllnames, &jpeg_dll, jpegfuncs);
 }
@@ -969,6 +975,9 @@ qboolean Image_Compress(const char *imagename, size_t maxsize, void **buf, size_
        unsigned char *imagedata, *newimagedata;
        int maxPixelCount;
        int components[3] = {2, 1, 0};
+       CompressedImageCacheItem *i;
+
+       JPEG_OpenLibrary (); // for now; LH had the idea of replacing this by a better format
 
        // No DLL = no JPEGs
        if (!jpeg_dll)
@@ -977,7 +986,7 @@ qboolean Image_Compress(const char *imagename, size_t maxsize, void **buf, size_
                return false;
        }
 
-       CompressedImageCacheItem *i = CompressedImageCache_Find(imagename, maxsize);
+       i = CompressedImageCache_Find(imagename, maxsize);
        if(i)
        {
                *size = i->compressed_size;