1. libgd
  2. Untitled project
  3. gd-libgd

Commits

Pierre Joye  committed 53f1c4a Merge

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

  • Participants
  • Parent commits f0de1e0, 8843ac5
  • Branches master

Comments (0)

Files changed (12)

File CMakeLists.txt

View file
  • Ignore whitespace
 	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)

File configure.ac

View file
  • Ignore whitespace
 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

File src/config.h.cmake

View file
  • Ignore whitespace
 /* 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
 

File src/gd_gd2.c

View file
  • Ignore whitespace
 #include <string.h>
 #include <stdlib.h>
 #include "gd.h"
+#include "gd_errors.h"
 #include "gdhelpers.h"
 
 /* 2.03: gd2 is no longer mandatory */

File src/gd_png.c

View file
  • Ignore whitespace
 #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

File src/gd_security.c

View file
  • Ignore whitespace
 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) {

File src/gd_ss.c

View file
  • Ignore whitespace
-
 #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

File src/gd_tga.c

View file
  • Ignore whitespace
 
 #include "gd_tga.h"
 #include "gd.h"
+#include "gd_errors.h"
 #include "gdhelpers.h"
 
 /*!	\brief Creates a gdImage from a TGA file

File src/gd_tiff.c

View file
  • Ignore whitespace
 #endif
 
 #include "gd.h"
+#include "gd_errors.h"
 #include "gdfonts.h"
 #include <stdio.h>
 #include <stdlib.h>

File src/gd_wbmp.c

View file
  • Ignore whitespace
 #endif
 
 #include "gd.h"
+#include "gd_errors.h"
 #include "gdfonts.h"
 #include <stdio.h>
 #include <stdlib.h>

File src/gd_webp.c

View file
  • Ignore whitespace
 #include <string.h>
 #include <stdlib.h>
 #include "gd.h"
+#include "gd_errors.h"
 
 #ifdef HAVE_LIBVPX
 #include "webpimg.h"

File src/gdfx.c

View file
  • Ignore whitespace
 #endif /* HAVE_CONFIG_H */
 
 #include "gd.h"
+#include "gd_errors.h"
 #include <math.h>
 
 /* In tests this is sufficient to prevent obvious artifacts */