Commits

pierre  committed 46ba162

- sync to 2.0.30

  • Participants
  • Parent commits f52a8e7
  • Tags GD_2_0_30

Comments (0)

Files changed (5)

File src/configure

 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for GD 2.0.29.
+# Generated by GNU Autoconf 2.57 for GD 2.0.30.
 #
 # Report bugs to <gd@boutell.com>.
 #
 # Identity of this package.
 PACKAGE_NAME='GD'
 PACKAGE_TARNAME='gd'
-PACKAGE_VERSION='2.0.29'
-PACKAGE_STRING='GD 2.0.29'
+PACKAGE_VERSION='2.0.30'
+PACKAGE_STRING='GD 2.0.30'
 PACKAGE_BUGREPORT='gd@boutell.com'
 
 ac_unique_file="gd.c"
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GD 2.0.29 to adapt to many kinds of systems.
+\`configure' configures GD 2.0.30 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GD 2.0.29:";;
+     short | recursive ) echo "Configuration of GD 2.0.30:";;
    esac
   cat <<\_ACEOF
 
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-GD configure 2.0.29
+GD configure 2.0.30
 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GD $as_me 2.0.29, which was
+It was created by GD $as_me 2.0.30, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
 
 GDLIB_MAJOR=2
 GDLIB_MINOR=0
-GDLIB_REVISION=29
+GDLIB_REVISION=30
 GDLIBNAME=gd
 #Expanded by tests later in this file. TBB 2.0.26
 #2.0.28: GIF is standard now. Doesn't depend on anything else,
 
 # Define the identity of the package.
  PACKAGE=gd
- VERSION=2.0.29
+ VERSION=2.0.30
 
 
 cat >>confdefs.h <<_ACEOF
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by GD $as_me 2.0.29, which was
+This file was extended by GD $as_me 2.0.30, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GD config.status 2.0.29
+GD config.status 2.0.30
 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

File src/configure.ac

 AC_PREREQ(2.54)
 
 #HEY! Change BOTH the vesion number and the GDLIB_REVISION setting!
-AC_INIT([GD], [2.0.29], [gd@boutell.com])
+AC_INIT([GD], [2.0.30], [gd@boutell.com])
 AC_CONFIG_SRCDIR([gd.c])
 AC_CONFIG_AUX_DIR(config)
 
 GDLIB_MAJOR=2
 GDLIB_MINOR=0
-GDLIB_REVISION=29
+GDLIB_REVISION=30
 GDLIBNAME=gd
 #Expanded by tests later in this file. TBB 2.0.26
 #2.0.28: GIF is standard now. Doesn't depend on anything else,
 BGD_DECLARE(int) gdImageGetPixel (gdImagePtr im, int x, int y);
 BGD_DECLARE(int) gdImageGetTrueColorPixel (gdImagePtr im, int x, int y);
 
-/* translate a fontconfig fontpattern into a fontpath. return NULL if OK, else return error string */
-BGD_DECLARE(char *) font_pattern(char **fontpath, char *fontpattern);
-
-/* translate a font file basename, or relative file name, or a list of such, into a fontpath, retun NULL if OK, else return error string */
-BGD_DECLARE(char *) font_path(char **fontpath, char *name_list);
-
-/* Now a No-Op, but kept for binary compatibility. */
 BGD_DECLARE(void) gdImageAABlend (gdImagePtr im);
 
 BGD_DECLARE(void) gdImageLine (gdImagePtr im, int x1, int y1, int x2, int y2, int color);
 
 static int fontConfigFlag = 0;
 
+static char *font_path(char **fontpath, char *name_list);
+/* translate a fontconfig fontpattern into a fontpath. 
+	return NULL if OK, else return error string */
+static char *font_pattern(char **fontpath, char *fontpattern);
+
+/* 2.0.30: move these up here so we can build correctly without freetype
+	but with fontconfig */
+
+/*
+ * The character (space) used to separate alternate fonts in the
+ * fontlist parameter to gdImageStringFT. 2.0.18: space was a
+ * poor choice for this.
+ */
+#define LISTSEPARATOR ";"
+
+/*
+ * DEFAULT_FONTPATH and PATHSEPARATOR are host type dependent and
+ * are normally set by configure in config.h.  These are just
+ * some last resort values that might match some Un*x system
+ * if building this version of gd separate from graphviz.
+ */
+#ifndef DEFAULT_FONTPATH
+#if defined(__APPLE__) || (defined(__MWERKS__) && defined(macintosh))
+#define DEFAULT_FONTPATH "/usr/share/fonts/truetype:/System/Library/Fonts:/Library/Fonts"
+#else
+#define DEFAULT_FONTPATH "/usr/share/fonts/truetype"
+#endif
+#endif
+#ifndef PATHSEPARATOR
+#define PATHSEPARATOR ":"
+#endif
+
+#ifndef TRUE
+#define FALSE 0
+#define TRUE !FALSE
+#endif
+
+#define MAX(a,b) ((a)>(b)?(a):(b))
+#define MIN(a,b) ((a)<(b)?(a):(b))
+
+
 BGD_DECLARE(char *) gdImageStringTTF (gdImage * im, int *brect, int fg, char *fontlist,
 		  double ptsize, double angle, int x, int y, char *string)
 {
  */
 #define LINESPACE 1.05
 
-/*
- * The character (space) used to separate alternate fonts in the
- * fontlist parameter to gdImageStringFT. 2.0.18: space was a
- * poor choice for this.
- */
-#define LISTSEPARATOR ";"
-
-/*
- * DEFAULT_FONTPATH and PATHSEPARATOR are host type dependent and
- * are normally set by configure in config.h.  These are just
- * some last resort values that might match some Un*x system
- * if building this version of gd separate from graphviz.
- */
-#ifndef DEFAULT_FONTPATH
-#if defined(__APPLE__) || (defined(__MWERKS__) && defined(macintosh))
-#define DEFAULT_FONTPATH "/usr/share/fonts/truetype:/System/Library/Fonts:/Library/Fonts"
-#else
-#define DEFAULT_FONTPATH "/usr/share/fonts/truetype"
-#endif
-#endif
-#ifndef PATHSEPARATOR
-#define PATHSEPARATOR ":"
-#endif
-
-#ifndef TRUE
-#define FALSE 0
-#define TRUE !FALSE
-#endif
-
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#define MIN(a,b) ((a)<(b)?(a):(b))
-
 typedef struct
 {
   char *fontlist;		/* key */
 }
 #endif
 
-BGD_DECLARE(char *) font_pattern(char **fontpath, char *fontpattern)
+static char * font_pattern(char **fontpath, char *fontpattern)
 {
   FcPattern* font = NULL;
   FcChar8* file;
 #endif /* HAVE_LIBFONTCONFIG */
 
 /* Look up font using font names as file names. */
-BGD_DECLARE(char *) font_path(char **fontpath, char *name_list)
+static char * font_path(char **fontpath, char *name_list)
 {
   int font_found = 0;
   char *fontsearchpath, *fontlist;

File src/index.html

 <!-- REMEMBER TO EDIT index.html.source -->
 <head>
-<TITLE>gd 2.0.29</TITLE>
+<TITLE>gd 2.0.30</TITLE>
 </head>
 <body bgcolor="#FFFFFF">
 <!-- BANNER HERE -->
-<H2>gd 2.0.29</H2>
+<H2>gd 2.0.30</H2>
 <H3>A graphics library for fast image creation</H3>
 <H3>Follow this link to the
 <A HREF="http://www.boutell.com/gd/">latest version
 legal advice regarding this issue. PNG remains a superior format especially
 if lossless truecolor images are needed.
 <p>
-When building from soruce, gd 2.0.29 <strong>requires</strong> that the 
+When building from soruce, gd 2.0.30 <strong>requires</strong> that the 
 following libraries also be installed, in order to produce the related 
 image formats. The win32 binary release (bgd) already contains the
 appropriate libraries.
 <H3>Table of Contents</H3>
 <UL>
 <LI><A HREF="#notice">Credits and license terms</A>
-<LI><A HREF="#whatsnew2.0.29">What's new in version "XYZ" of GD?</A>
+<LI><A HREF="#whatsnew2.0.30">What's new in version "XYZ" of GD?</A>
 <LI><A HREF="#whatis">What is gd?</A>
 <LI><A HREF="#gdother">What if I want to use another programming language?</A>
 <LI><A HREF="#required">What else do I need to use gd?</A>
 <A NAME="gdother"><H3>What if I want to use another programming
 language?</h3></A>
 Not all of these tools are necessarily up to date and fully compatible
-with 2.0.29.
+with 2.0.30.
 <h4>PHP</h4>
 A variant of gd 2.x is included in PHP 4.3.0. It is also possible
-to patch PHP 4.2.3 for use with gd 2.0.29; see the
+to patch PHP 4.2.3 for use with gd 2.0.30; see the
 <a href="http://www.boutell.com/gd/">gd home page</a> for a link to
 that information. It would be a Good Idea to merge all of the things
 that are better in mainstream gd and all of the things that are
 <li><a href="http://martin.gleeson.com/fly/">fly</a>, by Martin Gleeson
 </ul>
 <p>
+<A NAME="whatsnew2.0.30"><h3>What's new in version 2.0.30?</h3></a>
+<p>
+2.0.29 did not compile correctly when freetype was not available.
+This has been corrected. Thanks to Alessandro Ranellucci.
+<p>
 <A NAME="whatsnew2.0.29"><h3>What's new in version 2.0.29?</h3></a>
 <p>
 <ul>
 </ul>
 <h4>Source Code:</h4>
 <ul>
-<li><a href="http://www.boutell.com/gd/http/gd-2.0.29.tar.gz">Gzipped Tar File (Unix)</a>
-<li><a href="http://www.boutell.com/gd/http/gd-2.0.29.zip">.ZIP File of SOURCE CODE (Windows)</a>
+<li><a href="http://www.boutell.com/gd/http/gd-2.0.30.tar.gz">Gzipped Tar File (Unix)</a>
+<li><a href="http://www.boutell.com/gd/http/gd-2.0.30.zip">.ZIP File of SOURCE CODE (Windows)</a>
 </ul>
 <P>
 <A NAME="buildgd"><H3>How do I build gd?</H3></A>
 consult with an experienced user of your system. Sorry, we cannot
 answer questions about basic Internet skills.
 <p>
-Unpacking the archive will produce a directory called "gd-2.0.29".
+Unpacking the archive will produce a directory called "gd-2.0.30".
 <p>
 <h4>For Unix</h4>
-<code>cd</code> to the 2.0.29 directory and type:
+<code>cd</code> to the 2.0.30 directory and type:
 <p>
 <code>./configure</code>
 <P>