Updated the Windows build to:

Visual Studio 2008 jpeg-8c libpng-1.5.7 libwebp-0.1.3 tiff-4.0.0 zlib-1.2.5 All Windows binaries have been rebuilt with mingw-w32-1.0
libsdl-org · Jan 2, 2012 · 148cb6c · 148cb6c
1 parent 4df12aa
commit 148cb6c
Show file tree

Hide file tree

Showing 42 changed files with 6,332 additions and 6,331 deletions.
diff --git a/IMG_gif.c b/IMG_gif.c
@@ -177,7 +177,7 @@ IMG_LoadGIF_RW(SDL_RWops *src)
 	RWSetMsg("not a GIF file");
         goto done;
     }
-    strncpy(version, (char *) buf + 3, 3);
+    memcpy(version, (char *) buf + 3, 3);
     version[3] = '\0';
 
     if ((strcmp(version, "87a") != 0) && (strcmp(version, "89a") != 0)) {

diff --git a/IMG_jpg.c b/IMG_jpg.c
@@ -260,7 +260,7 @@ static void init_source (j_decompress_ptr cinfo)
 /*
  * Fill the input buffer --- called whenever buffer is emptied.
  */
-static int fill_input_buffer (j_decompress_ptr cinfo)
+static boolean fill_input_buffer (j_decompress_ptr cinfo)
 {
 	my_source_mgr * src = (my_source_mgr *) cinfo->src;
 	int nbytes;

diff --git a/IMG_webp.c b/IMG_webp.c
@@ -124,6 +124,7 @@ void IMG_QuitWEBP()
 static int webp_getinfo( SDL_RWops *src, int *datasize ) {
 	int start;
 	int is_WEBP;
+	int data;
 	Uint8 magic[20];
 
 	if ( !src )
@@ -144,7 +145,7 @@ static int webp_getinfo( SDL_RWops *src, int *datasize ) {
 										 magic[14] == '8' &&
 										 magic[15] == ' '  ) {
 			is_WEBP = 1;
-			int data = magic[16] | magic[17]<<8 | magic[18]<<16 | magic[19]<<24;
+			data = magic[16] | magic[17]<<8 | magic[18]<<16 | magic[19]<<24;
 			if ( datasize )
 				*datasize = data;
 		}
@@ -168,6 +169,11 @@ SDL_Surface *IMG_LoadWEBP_RW(SDL_RWops *src)
 	Uint32 Gmask;
 	Uint32 Bmask;
 	Uint32 Amask;
+	WebPBitstreamFeatures features;
+	int raw_data_size;
+	uint8_t *raw_data;
+	int r;
+	uint8_t *ret;
 
 	if ( !src ) {
 		/* The error message has been set in SDL_RWFromFile */
@@ -181,7 +187,7 @@ SDL_Surface *IMG_LoadWEBP_RW(SDL_RWops *src)
 	}
 
 
-	int raw_data_size = -1;
+	raw_data_size = -1;
 	if ( !webp_getinfo( src, &raw_data_size ) ) {
 		error = "Invalid WEBP";
 		goto error;
@@ -190,13 +196,13 @@ SDL_Surface *IMG_LoadWEBP_RW(SDL_RWops *src)
 	// skip header
 	SDL_RWseek(src, start+20, RW_SEEK_SET );
 
-	uint8_t *raw_data = (uint8_t*) malloc( raw_data_size );
+	raw_data = (uint8_t*) malloc( raw_data_size );
 	if ( raw_data == NULL ) {
 		error = "Failed to allocate enought buffer for WEBP";
 		goto error;
 	}
 
-	int r = SDL_RWread(src, raw_data, 1, raw_data_size );
+	r = SDL_RWread(src, raw_data, 1, raw_data_size );
 	if ( r != raw_data_size ) {
 		error = "Failed to read WEBP";
 		goto error;
@@ -211,8 +217,7 @@ SDL_Surface *IMG_LoadWEBP_RW(SDL_RWops *src)
 	}
 #endif
 
-	WebPBitstreamFeatures features;
-  if ( lib.webp_get_features_internal( raw_data, raw_data_size, &features, WEBP_DECODER_ABI_VERSION ) != VP8_STATUS_OK ) {
+	if ( lib.webp_get_features_internal( raw_data, raw_data_size, &features, WEBP_DECODER_ABI_VERSION ) != VP8_STATUS_OK ) {
 		error = "WebPGetFeatures has failed";
 		return NULL;
 	}
@@ -231,8 +236,6 @@ SDL_Surface *IMG_LoadWEBP_RW(SDL_RWops *src)
 		goto error;
 	}
 
-
-	uint8_t *ret = NULL;
 	if ( features.has_alpha ) {
 		ret = lib.webp_decode_rgba_into( raw_data, raw_data_size, surface->pixels, surface->pitch * surface->h,  surface->pitch );
 	} else {

diff --git a/IMG_xpm.c b/IMG_xpm.c
@@ -245,6 +245,8 @@ static char *error;
  */
 static char *get_next_line(char ***lines, SDL_RWops *src, int len)
 {
+	char *linebufnew;
+
 	if(lines) {
 		return *(*lines)++;
 	} else {
@@ -260,7 +262,7 @@ static char *get_next_line(char ***lines, SDL_RWops *src, int len)
 			len += 4;	/* "\",\n\0" */
 			if(len > buflen){
 				buflen = len;
-				char *linebufnew = realloc(linebuf, buflen);
+				linebufnew = realloc(linebuf, buflen);
 				if(!linebufnew) {
 					free(linebuf);
 					error = "Out of memory";
@@ -280,7 +282,7 @@ static char *get_next_line(char ***lines, SDL_RWops *src, int len)
 					if(buflen == 0)
 						buflen = 16;
 					buflen *= 2;
-					char *linebufnew = realloc(linebuf, buflen);
+					linebufnew = realloc(linebuf, buflen);
 					if(!linebufnew) {
 						free(linebuf);
 						error = "Out of memory";

diff --git a/VisualC/SDL_image.dsp b/VisualC/SDL_image.dsp
diff --git a/VisualC/SDL_image.dsw b/VisualC/SDL_image.dsw
diff --git a/VisualC/SDL_image.sln b/VisualC/SDL_image.sln
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL_image", "SDL_image.vcproj", "{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}"
 EndProject
 Global