properly strip the / from worldbasename

[xonotic/darkplaces.git] / jpeg.c

diff --git a/jpeg.c b/jpeg.c
index 5d09b498e21d65fd20cb570283dacfd9d66885f9..2220ccb32191742082c5f404bb349698226fd471 100644 (file)
--- a/jpeg.c
+++ b/jpeg.c
@@ -25,6 +25,7 @@
 #include "quakedef.h"
 #include "image.h"
 #include "jpeg.h"
+#include "image_png.h"
 
 cvar_t sv_writepicture_quality = {CVAR_SAVE, "sv_writepicture_quality", "10", "WritePicture quality offset (higher means better quality, but slower)"};
 
@@ -52,6 +53,7 @@ typedef int jboolean;
 #define qjpeg_start_decompress jpeg_start_decompress
 #define qjpeg_std_error jpeg_std_error
 #define qjpeg_write_scanlines jpeg_write_scanlines
+#define qjpeg_simple_progression jpeg_simple_progression
 #define jpeg_dll true
 #else
 /*
@@ -102,16 +104,16 @@ typedef unsigned int JDIMENSION;
 struct jpeg_memory_mgr
 {
   void* (*alloc_small) (j_common_ptr cinfo, int pool_id, size_t sizeofobject);
-  void (*alloc_large) ();
-  void (*alloc_sarray) ();
-  void (*alloc_barray) ();
-  void (*request_virt_sarray) ();
-  void (*request_virt_barray) ();
-  void (*realize_virt_arrays) ();
-  void (*access_virt_sarray) ();
-  void (*access_virt_barray) ();
-  void (*free_pool) ();
-  void (*self_destruct) ();
+  void (*_reserve_space_for_alloc_large) (void *dummy, ...);
+  void (*_reserve_space_for_alloc_sarray) (void *dummy, ...);
+  void (*_reserve_space_for_alloc_barray) (void *dummy, ...);
+  void (*_reserve_space_for_request_virt_sarray) (void *dummy, ...);
+  void (*_reserve_space_for_request_virt_barray) (void *dummy, ...);
+  void (*_reserve_space_for_realize_virt_arrays) (void *dummy, ...);
+  void (*_reserve_space_for_access_virt_sarray) (void *dummy, ...);
+  void (*_reserve_space_for_access_virt_barray) (void *dummy, ...);
+  void (*_reserve_space_for_free_pool) (void *dummy, ...);
+  void (*_reserve_space_for_self_destruct) (void *dummy, ...);
 
   long max_memory_to_use;
   long max_alloc_chunk;
@@ -426,6 +428,7 @@ static jboolean (*qjpeg_start_compress) (j_compress_ptr cinfo, jboolean write_al
 static jboolean (*qjpeg_start_decompress) (j_decompress_ptr cinfo);
 static struct jpeg_error_mgr* (*qjpeg_std_error) (struct jpeg_error_mgr *err);
 static JDIMENSION (*qjpeg_write_scanlines) (j_compress_ptr cinfo, unsigned char** scanlines, JDIMENSION num_lines);
+static void (*qjpeg_simple_progression) (j_compress_ptr cinfo);
 
 static dllfunction_t jpegfuncs[] =
 {
@@ -444,6 +447,7 @@ static dllfunction_t jpegfuncs[] =
        {"jpeg_start_decompress",       (void **) &qjpeg_start_decompress},
        {"jpeg_std_error",                      (void **) &qjpeg_std_error},
        {"jpeg_write_scanlines",        (void **) &qjpeg_write_scanlines},
+       {"jpeg_simple_progression",     (void **) &qjpeg_simple_progression},
        {NULL, NULL}
 };
 
@@ -490,9 +494,7 @@ qboolean JPEG_OpenLibrary (void)
 #else
        const char* dllnames [] =
        {
-#if defined(WIN64)
-               "libjpeg64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libjpeg.dll",
 #elif defined(MACOSX)
                "libjpeg.62.dylib",
@@ -831,6 +833,7 @@ qboolean JPEG_SaveImage_preflipped (const char *filename, int width, int height,
        cinfo.input_components = 3;
        qjpeg_set_defaults (&cinfo);
        qjpeg_set_quality (&cinfo, (int)(scr_screenshot_jpeg_quality.value * 100), TRUE);
+       qjpeg_simple_progression (&cinfo);
 
        // turn off subsampling (to make text look better)
        cinfo.optimize_coding = 1;
@@ -1030,6 +1033,7 @@ qboolean Image_Compress(const char *imagename, size_t maxsize, void **buf, size_
        CompressedImageCacheItem *i;
 
        JPEG_OpenLibrary (); // for now; LH had the idea of replacing this by a better format
+       PNG_OpenLibrary (); // for loading
 
        // No DLL = no JPEGs
        if (!jpeg_dll)
@@ -1046,7 +1050,7 @@ qboolean Image_Compress(const char *imagename, size_t maxsize, void **buf, size_
        }
 
        // load the image
-       imagedata = loadimagepixelsbgra(imagename, true, false);
+       imagedata = loadimagepixelsbgra(imagename, true, false, false);
        if(!imagedata)
                return false;