upgrade mylibgd tree to gd-2.0.35

use system gd-2.0.34 or later on fc7 or later distros

diff --git a/lib/gd/gd_topal.c b/lib/gd/gd_topal.c
index 16c0e33b38d4a21c8aca4cea01445b00af107f90..37588960202a25be22bf505a7305ebc588bc97fb 100644 (file)
--- a/lib/gd/gd_topal.c
+++ b/lib/gd/gd_topal.c
@@ -49,10 +49,6 @@
   #define ORIGINAL_LIB_JPEG_REVERSE_ODD_ROWS
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <string.h>
 #include "gd.h"
 #include "gdhelpers.h"
@@ -776,6 +772,7 @@ LOCAL (void)
       nim->green[icolor] = 255;
       nim->blue[icolor] = 255;
     }
+               nim->open[icolor] = 0;
 #endif
 }
 
@@ -803,6 +800,9 @@ select_colors (gdImagePtr oim, gdImagePtr nim, my_cquantize_ptr cquantize, int d
     return;
    }
   boxlist = (boxptr) gdMalloc (desired_colors * sizeof (box));
+       if (!boxlist) {
+               return;
+       }
 #endif
   /* Initialize one box containing whole space */
   numboxes = 1;
@@ -1935,11 +1935,12 @@ static void gdImageTrueColorToPaletteBody (gdImagePtr oim, int dither, int color
   init_error_limit (oim, nim, cquantize);
   arraysize = (size_t) ((nim->sx + 2) * (3 * sizeof (FSERROR)));
   /* Allocate Floyd-Steinberg workspace. */
-  cquantize->fserrors = gdCalloc (arraysize, 1);
+       cquantize->fserrors = gdRealloc(cquantize->fserrors, arraysize);
   if (!cquantize->fserrors)
     {
       goto outOfMemory;
     }
+  memset(cquantize->fserrors, 0, arraysize);
   cquantize->on_odd_row = FALSE;
 
   /* Do the work! */

diff --git a/lib/gd/gdcache.c b/lib/gd/gdcache.c
index b5b8913415ac7e1cc187edda87d2bee121f1b4b6..f02f8c343ca0c86f773a0ee2bbf33b5874159ccb 100644 (file)
--- a/lib/gd/gdcache.c
+++ b/lib/gd/gdcache.c
@@ -9,7 +9,7 @@
 #ifdef HAVE_LIBTTF
 #define NEED_CACHE 1
 #else
-#ifdef HAVE_LIBFREETYPE
+#ifdef HAVE_FREETYPE2
 #define NEED_CACHE 1
 #endif
 #endif
@@ -71,6 +71,10 @@ gdCacheCreate (int size,
   gdCache_head_t *head;
 
   head = (gdCache_head_t *) gdMalloc (sizeof (gdCache_head_t));
+       if (!head) {
+               return NULL;
+       }
+
   head->mru = NULL;
   head->size = size;
   head->gdCacheTest = gdCacheTest;
@@ -130,6 +134,11 @@ gdCacheGet (gdCache_head_t * head, void *keydata)
   if (i < head->size)
     {                          /* cache still growing - add new elem */
       elem = (gdCache_element_t *) gdMalloc (sizeof (gdCache_element_t));
+                       if (!elem)
+                        {
+                               (*(head->gdCacheRelease)) (userdata);
+                                       return NULL;
+                        }
     }
   else
     {                          /* cache full - replace least-recently-used */
@@ -195,6 +204,9 @@ main (char *argv[], int argc)
   int elem, key;
 
   cacheTable = gdCacheCreate (3, cacheTest, cacheFetch, cacheRelease);
+       if (!cacheTable) {
+               exit(1);
+       }
 
   key = 20;
   elem = *(int *) gdCacheGet (cacheTable, &key);

diff --git a/lib/gd/gdcmpgif.c b/lib/gd/gdcmpgif.c
index b82eb22d92076801defd95ca251e2eaf5473c1a8..dd2de69bf00ebc9524cffb44bc123bcc4ac90a81 100644 (file)
--- a/lib/gd/gdcmpgif.c
+++ b/lib/gd/gdcmpgif.c
@@ -4,7 +4,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef WIN32
 #include <unistd.h> /* For unlink function */
+#endif
 
 #include "gd.h"
 

diff --git a/lib/gd/gdfontg.c b/lib/gd/gdfontg.c
index 229215e7635c7d86451bf359e167768626222a34..f345c5f8c5578d0fe53cafbe925ad4f02a68b356 100644 (file)
--- a/lib/gd/gdfontg.c
+++ b/lib/gd/gdfontg.c
@@ -10,9 +10,6 @@
    "Libor Skarvada, libor@informatics.muni.cz"
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 #include "gdfontg.h"
 

diff --git a/lib/gd/gdfontl.c b/lib/gd/gdfontl.c
index 54adffa88589c5dd1894d359940ac539085f1ede..5de3ae8a6a155f4f2a2dd97ca29c8551e373e3f1 100644 (file)
--- a/lib/gd/gdfontl.c
+++ b/lib/gd/gdfontl.c
@@ -11,9 +11,6 @@
    "Libor Skarvada, libor@informatics.muni.cz"
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 #include "gdfontl.h"
 

diff --git a/lib/gd/gdfontmb.c b/lib/gd/gdfontmb.c
index b0ed6a363c58891af66e5f9e55bc8b7724f28656..33a1fd449af7524c88e06def7bc3adc1829939f6 100644 (file)
--- a/lib/gd/gdfontmb.c
+++ b/lib/gd/gdfontmb.c
@@ -9,9 +9,6 @@
    No copyright info was found in the original bdf.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 #include "gdfontmb.h"
 

diff --git a/lib/gd/gdfonts.c b/lib/gd/gdfonts.c
index e5d3f7ea94eef1ada94c3e372dbe9950a3136eb2..5e1a0896c60cb29a074d3b6ed1e906878894786b 100644 (file)
--- a/lib/gd/gdfonts.c
+++ b/lib/gd/gdfonts.c
@@ -7,9 +7,6 @@
    No copyright info was found in the original bdf.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 #include "gdfonts.h"
 

diff --git a/lib/gd/gdfontt.c b/lib/gd/gdfontt.c
index d7abcf62735275c7a10ef3ce77f9da0efbe37e52..11bd3a35a885a8c3d923150f1fe2360adad3fded 100644 (file)
--- a/lib/gd/gdfontt.c
+++ b/lib/gd/gdfontt.c
@@ -10,9 +10,6 @@
    "Libor Skarvada, libor@informatics.muni.cz"
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 #include "gdfontt.h"