Commits

Anonymous committed 2e0174f

- sync to 2.0.6

Comments (0)

Files changed (6)

 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "gd.h"
 
 /* A short program which converts a .png file into a .gd file, for
 gdImageStringTTF (gdImage * im, int *brect, int fg, char *fontlist,
 		  double ptsize, double angle, int x, int y, char *string)
 {
-  gdImageStringFT (im, brect, fg, fontlist, ptsize,
+  /* 2.0.6: valid return */ 
+  return gdImageStringFT (im, brect, fg, fontlist, ptsize,
 		   angle, x, y, string);
 }
 
   int render_mode = FT_LOAD_RENDER | FT_LOAD_FORCE_AUTOHINT;
   /* Now tuneable thanks to Wez Furlong */
   double linespace = LINESPACE;
-  if (strex) {
-    if ((strex->flags & gdFTEX_LINESPACE) == gdFTEX_LINESPACE) {
-      linespace = strex->linespacing;
-    }
-  }
+  /* 2.0.6: put this declaration with the other declarations! */
   /*
    *   make a new tweenColorCache on every call
    *   because caching colormappings between calls
    */
   gdCache_head_t  *tc_cache;
 
+  if (strex) {
+    if ((strex->flags & gdFTEX_LINESPACE) == gdFTEX_LINESPACE) {
+      linespace = strex->linespacing;
+    }
+  }
   tc_cache = gdCacheCreate( TWEENCOLORCACHESIZE,
                tweenColorTest, tweenColorFetch, tweenColorRelease );
 
 
 #include "gd.h"
 #include <string.h>
+#include <stdlib.h>
 
 #define PI 3.141592
 #define DEG2RAD(x) ((x)*PI/180.)
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "gd.h"
 #include "gdhelpers.h"
 
   gdImagePtr im = 0;
   char *apixel;
   int *pointer;
-  int red = 0, green = 0, blue = 0, color = 0;
+  int red = 0, green = 0, blue = 0;
   int *colors;
   int ret;
 
     return (0);
   apixel[image.cpp] = '\0';
 
-  pointer = image.data;
+  pointer = (int *) image.data;
   for (i = 0; i < image.height; i++)
     {
       for (j = 0; j < image.width; j++)
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "gd.h"
 
 /* A short program which converts a .png file into a .gd file, for
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "gd.h"
 
 /* If palette is true, we convert from truecolor to palette at the end,
 #ifdef HAVE_LIBPNG
   /* Input and output files */
   FILE *in;
-  FILE *out;
 
   /* Input image */
   gdImagePtr im_in = 0;
 
-  /* Colors */
-  int lightBlue;
-
   if (argc != 2)
     {
       fprintf (stderr, "Usage: testac filename.png\n");
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.