Ondřej Surý avatar Ondřej Surý committed 8ecfbd0 Merge

Merged in vapier/gd (pull request #6)

misc minor fixes

Comments (0)

Files changed (4)

 /src/webpng
 
 # Tests artifacts
+/config/test-driver
+/tests/*.log
+/tests/*/*.log
+/tests/*/*.trs
 /tests/a.png
 /tests/bmp_im2im_dst.bmp
 /tests/bmp_im2im_src.bmp

src/gd_color_match.c

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <string.h>
 #include "gd.h"
 #include "gdhelpers.h"
 
 }
 jmpbuf_wrapper;
 
-static long jpeg_emit_message(j_common_ptr jpeg_info, int level)
+static void jpeg_emit_message(j_common_ptr jpeg_info, int level)
 {
 	char message[JMSG_LENGTH_MAX];
 	jmpbuf_wrapper *jmpbufw;
 			}
 		}
 	}
-	return 1;
 }
 
 /* Called by the IJG JPEG library upon encountering a fatal error */
 	va_list args;
 
 	va_start(args, format);
-	len = vsnprintf(&buf, sizeof(buf)-1, format, args);
+	len = vsnprintf(buf, sizeof(buf)-1, format, args);
 	va_end(args);
 	out->putBuf(out, buf, len);
 }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.