sorry, did the last change to the wrong jpeg writing function. Fixed.

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

diff --git a/jpeg.c b/jpeg.c
index 7c02659b957dfb0ca26eaeab4cb35744f69ea52e..9c48a2e6ecf6a5318483d1b4c173372d368217a3 100644 (file)
--- a/jpeg.c
+++ b/jpeg.c
@@ -760,7 +760,7 @@ qboolean JPEG_SaveImage_preflipped (const char *filename, int width, int height,
        struct jpeg_compress_struct cinfo;
        struct jpeg_error_mgr jerr;
        unsigned char *scanline;
-       unsigned int linesize;
+       unsigned int offset, linesize;
        qfile_t* file;
 
        // No DLL = no JPEGs
@@ -803,9 +803,10 @@ qboolean JPEG_SaveImage_preflipped (const char *filename, int width, int height,
 
        // Compress each scanline
        linesize = cinfo.image_width * 3;
+       offset = linesize * (cinfo.image_height - 1);
        while (cinfo.next_scanline < cinfo.image_height)
        {
-               scanline = &data[cinfo.next_scanline * linesize];
+               scanline = &data[offset - cinfo.next_scanline * linesize];
 
                qjpeg_write_scanlines (&cinfo, &scanline, 1);
                if (error_in_jpeg)
@@ -823,7 +824,6 @@ static size_t JPEG_try_SaveImage_to_Buffer (struct jpeg_compress_struct *cinfo,
 {
        unsigned char *scanline;
        unsigned int linesize;
-       int offset;
 
        error_in_jpeg = false;
 
@@ -849,10 +849,9 @@ static size_t JPEG_try_SaveImage_to_Buffer (struct jpeg_compress_struct *cinfo,
 
        // Compress each scanline
        linesize = width * 3;
-       offset = linesize * (cinfo->image_height - 1);
        while (cinfo->next_scanline < cinfo->image_height)
        {
-               scanline = &data[offset - cinfo->next_scanline * linesize];
+               scanline = &data[cinfo->next_scanline * linesize];
 
                qjpeg_write_scanlines (cinfo, &scanline, 1);
                if (error_in_jpeg)