Changeset 29368 for lang/c/SDL_image_save/trunk/IMGS_jpg.c

Timestamp:

02/01/09 03:41:52 (4 years ago)

Author:

cielacanth

Message:

警告を潰した。

Files:

• lang/c/SDL_image_save/trunk/IMGS_jpg.c (modified) (7 diffs)

lang/c/SDL_image_save/trunk/IMGS_jpg.c

@@ -26 +26 @@
 
 #include <setjmp.h>
-#include "libjpeg/jpeglib.h"
+#include "jpeglib.h"
 
 /* This code assumes that sizeof(JSAMPLE) is 8 bit */
@@ -80 +80 @@
 {
         struct imgs_destination_mgr *dest = (struct imgs_destination_mgr *) cinfo->dest;
-        int size = OUTPUT_BUFFER_SIZE - dest->pub.free_in_buffer;
+        size_t size = OUTPUT_BUFFER_SIZE - dest->pub.free_in_buffer;
 
         /* Output data to data stream */
-        SDL_RWwrite(dest->ops, dest->buffer, 1, size);
+        SDL_RWwrite(dest->ops, dest->buffer, 1, (int)size);
 }
 
@@ -102 +102 @@
 static void jpg_output_no_message(j_common_ptr cinfo)
 {
+        (void)cinfo;
         /* do nothing */
 }
@@ -133 +134 @@
                 /* Add 0.5 to round off */
                 int c = (int) (val + 0.5f);
-                if ( c > 255 ) c = 255;
-                colormap[i] = c;
+                if ( c > MAXJSAMPLE ) c = MAXJSAMPLE;
+                colormap[i] = (JSAMPLE)c;
         }
 }
@@ -151 +152 @@
         const Uint32 Gmask      = fmt->Gmask;
         const Uint32 Bmask      = fmt->Bmask;
-        const Uint32 Amask      = fmt->Amask;
         const Uint32 Rshift     = fmt->Rshift;
         const Uint32 Gshift     = fmt->Gshift;
         const Uint32 Bshift     = fmt->Bshift;
-        const Uint32 Ashift     = fmt->Ashift;
 
         JSAMPROW        row_pointer = NULL;
@@ -296 +295 @@
                                 for ( x = 0; x < row_bytes; x += 3 ) {
                                         Uint32 c = (pixels[x + 2] << 16) | (pixels[x + 1] << 8) | (pixels[x + 0] << 0);
-                                        row_pointer[x + 0] = (c & Rmask) >> Rshift;
-                                        row_pointer[x + 1] = (c & Gmask) >> Gshift;
-                                        row_pointer[x + 2] = (c & Bmask) >> Bshift;
+                                        row_pointer[x + 0] = (JSAMPLE)((c & Rmask) >> Rshift);
+                                        row_pointer[x + 1] = (JSAMPLE)((c & Gmask) >> Gshift);
+                                        row_pointer[x + 2] = (JSAMPLE)((c & Bmask) >> Bshift);
                                 }
                                 pixels += surface_pitch;
@@ -316 +315 @@
                         for ( x = 0; x < width; ++x ) {
                                 Uint32 c = *(Uint32 *) &pixels[x * 4];
-                                row_pointer[x * 3 + 0] = (c & Rmask) >> Rshift;
-                                row_pointer[x * 3 + 1] = (c & Gmask) >> Gshift;
-                                row_pointer[x * 3 + 2] = (c & Bmask) >> Bshift;
+                                row_pointer[x * 3 + 0] = (JSAMPLE)((c & Rmask) >> Rshift);
+                                row_pointer[x * 3 + 1] = (JSAMPLE)((c & Gmask) >> Gshift);
+                                row_pointer[x * 3 + 2] = (JSAMPLE)((c & Bmask) >> Bshift);
                         }
                         pixels += surface_pitch;