Pierre Joye avatar Pierre Joye committed 53f1c4a Merge

Merge branch 'master' of https://bitbucket.org/libgd/gd-libgd

Comments (0)

Files changed (12)

 	endif (ENABLE_FONTCONFIG)
 
 	if (FREETYPE_FOUND)
-		INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})
+		INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
 		SET(HAVE_FT2BUILD_H 1)
 		SET(HAVE_LIBFREETYPE 1)
 	ENDIF(FREETYPE_FOUND)
 GDLIB_MAJOR=2
 GDLIB_MINOR=1
 GDLIB_REVISION=0
-GDLIBNAME=gd
 AC_SUBST(GDLIB_MAJOR)
 AC_SUBST(GDLIB_MINOR)
 AC_SUBST(GDLIB_REVISION)
-AC_SUBST(GDLIBNAME)
 
 # Dynamic library version information
 # See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info

src/config.h.cmake

 /* Define if you have the png library. */
 #cmakedefine HAVE_LIBPNG
 
-/* Define to 1 if you have the <libpng/png.h> header file. */
-#cmakedefine HAVE_LIBPNG_PNG_H
-
 /* Define to 1 if you have the <libimagequant.h> header file. */
 #cmakedefine HAVE_LIBIMAGEQUANT_H
 
 #include <string.h>
 #include <stdlib.h>
 #include "gd.h"
+#include "gd_errors.h"
 #include "gdhelpers.h"
 
 /* 2.03: gd2 is no longer mandatory */
 #include <string.h>
 #include <stdlib.h>
 #include "gd.h"
+#include "gd_errors.h"
 
 /* JCE: Arrange HAVE_LIBPNG so that it can be set in gd.h */
 #ifdef HAVE_LIBPNG

src/gd_security.c

 int overflow2(int a, int b)
 {
 	if(a <= 0 || b <= 0) {
-		gd_error(GD_WARNING, "one parameter to a memory allocation multiplication is negative or zero, failing operation gracefully\n");
+		gd_error_ex(GD_WARNING, "one parameter to a memory allocation multiplication is negative or zero, failing operation gracefully\n");
 		return 1;
 	}
 	if(a > INT_MAX / b) {
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <string.h>
 #include <stdlib.h>
 #include "gd.h"
+#include "gd_errors.h"
 
 #define TRUE 1
 #define FALSE 0
 
 #include "gd_tga.h"
 #include "gd.h"
+#include "gd_errors.h"
 #include "gdhelpers.h"
 
 /*!	\brief Creates a gdImage from a TGA file
 #endif
 
 #include "gd.h"
+#include "gd_errors.h"
 #include "gdfonts.h"
 #include <stdio.h>
 #include <stdlib.h>
 #endif
 
 #include "gd.h"
+#include "gd_errors.h"
 #include "gdfonts.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>
 #include "gd.h"
+#include "gd_errors.h"
 
 #ifdef HAVE_LIBVPX
 #include "webpimg.h"
 #endif /* HAVE_CONFIG_H */
 
 #include "gd.h"
+#include "gd_errors.h"
 #include <math.h>
 
 /* In tests this is sufficient to prevent obvious artifacts */
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.