Commits

Ondřej Surý committed b628d27

Move HAVE_CONFIG_H from .h to .c to not break when external app define the symbol (See Debian Bug#708413)

Comments (0)

Files changed (16)

src/gd_color_map.h

 #ifndef GD_COLOR_MAP_H
 #define GD_COLOR_MAP_H 1
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 
 #ifdef __cplusplus

src/gd_io_stream.cxx

 	as an input stream has no need of output methods, and vice-versa.
 */
 #ifdef __cplusplus
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "gd_io_stream.h"
 
 /**	Read into buffer from stream

src/gd_io_stream.h

 #ifndef _gd_io_stream_h
 #define _gd_io_stream_h
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 #include <iostream>
 
 #ifndef __TGA_H
 #define __TGA_H	1
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 #include "gdhelpers.h"
 
 	/* header                                                */
 	/*********************************************************/
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
 #include <stdlib.h>
 #ifndef NULL
 #	define NULL (void *)0
    "Libor Skarvada, libor@informatics.muni.cz"
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gdfontg.h"
 
 	"Libor Skarvada, libor@informatics.muni.cz"
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 
 extern BGD_EXPORT_DATA_PROT gdFontPtr gdFontGiant;
    "Libor Skarvada, libor@informatics.muni.cz"
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gdfontl.h"
 
 	"Libor Skarvada, libor@informatics.muni.cz"
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 
 extern BGD_EXPORT_DATA_PROT gdFontPtr gdFontLarge;
    No copyright info was found in the original bdf.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gdfontmb.h"
 
 	No copyright info was found in the original bdf.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 
 extern BGD_EXPORT_DATA_PROT gdFontPtr gdFontMediumBold;
    No copyright info was found in the original bdf.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gdfonts.h"
 
 	No copyright info was found in the original bdf.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 
 extern BGD_EXPORT_DATA_PROT gdFontPtr gdFontSmall;
    "Libor Skarvada, libor@informatics.muni.cz"
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gdfontt.h"
 
 	"Libor Skarvada, libor@informatics.muni.cz"
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "gd.h"
 
 extern BGD_EXPORT_DATA_PROT gdFontPtr gdFontTiny;
 #ifndef GDFX_H
 #define GDFX_H 1
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gd.h"
-
-	/* im MUST be square, but can have any size. Returns a new image
-		of width and height radius * 2, in which the X axis of
-		the original has been remapped to theta (angle) and the Y axis
-		of the original has been remapped to rho (distance from center).
-		This is known as a "polar coordinate transform." */
+/* im MUST be square, but can have any size. Returns a new image
+	of width and height radius * 2, in which the X axis of
+	the original has been remapped to theta (angle) and the Y axis
+	of the original has been remapped to rho (distance from center).
+	This is known as a "polar coordinate transform." */
 
-	BGD_DECLARE(gdImagePtr) gdImageSquareToCircle(gdImagePtr im, int radius);
+BGD_DECLARE(gdImagePtr) gdImageSquareToCircle(gdImagePtr im, int radius);
 
-	/* Draws the text 'top' and 'bottom' on 'im', curved along the
-		edge of a circle of radius 'radius', with its
-		center at 'cx' and 'cy'. 'top' is written clockwise
-		along the top; 'bottom' is written counterclockwise
-		along the bottom. 'textRadius' determines the 'height'
-		of each character; if 'textRadius' is 1/2 of 'radius',
-		characters extend halfway from the edge to the center.
-		'fillPortion' varies from 0 to 1.0, with useful values
-		from about 0.4 to 0.9, and determines how much of the
-		180 degrees of arc assigned to each section of text
-		is actually occupied by text; 0.9 looks better than
-		1.0 which is rather crowded. 'font' is a freetype
-		font; see gdImageStringFT. 'points' is passed to the
-		freetype engine and has an effect on hinting; although
-		the size of the text is determined by radius, textRadius,
-		and fillPortion, you should pass a point size that
-		'hints' appropriately -- if you know the text will be
-		large, pass a large point size such as 24.0 to get the
-		best results. 'fgcolor' can be any color, and may have
-		an alpha component, do blending, etc.
+/* Draws the text 'top' and 'bottom' on 'im', curved along the
+	edge of a circle of radius 'radius', with its
+	center at 'cx' and 'cy'. 'top' is written clockwise
+	along the top; 'bottom' is written counterclockwise
+	along the bottom. 'textRadius' determines the 'height'
+	of each character; if 'textRadius' is 1/2 of 'radius',
+	characters extend halfway from the edge to the center.
+	'fillPortion' varies from 0 to 1.0, with useful values
+	from about 0.4 to 0.9, and determines how much of the
+	180 degrees of arc assigned to each section of text
+	is actually occupied by text; 0.9 looks better than
+	1.0 which is rather crowded. 'font' is a freetype
+	font; see gdImageStringFT. 'points' is passed to the
+	freetype engine and has an effect on hinting; although
+	the size of the text is determined by radius, textRadius,
+	and fillPortion, you should pass a point size that
+	'hints' appropriately -- if you know the text will be
+	large, pass a large point size such as 24.0 to get the
+	best results. 'fgcolor' can be any color, and may have
+	an alpha component, do blending, etc.
 
-		Returns 0 on success, or an error string. */
+	Returns 0 on success, or an error string. */
 
-	BGD_DECLARE(char *) gdImageStringFTCircle(
-	    gdImagePtr im,
-	    int cx,
-	    int cy,
-	    double radius,
-	    double textRadius,
-	    double fillPortion,
-	    char *font,
-	    double points,
-	    char *top,
-	    char *bottom,
-	    int fgcolor);
+BGD_DECLARE(char *) gdImageStringFTCircle(
+    gdImagePtr im,
+    int cx,
+    int cy,
+    double radius,
+    double textRadius,
+    double fillPortion,
+    char *font,
+    double points,
+    char *top,
+    char *bottom,
+    int fgcolor);
 
-	/* 2.0.16:
-	 * Sharpen function added on 2003-11-19
-	 * by Paul Troughton (paul<dot>troughton<at>ieee<dot>org)
-	 * Simple 3x3 convolution kernel
-	 * Makes use of seperability
-	 * Faster, but less flexible, than full-blown unsharp masking
-	 * pct is sharpening percentage, and can be greater than 100
-	 * Silently does nothing to non-truecolor images
-	 * Silently does nothing for pct<0, as not a useful blurring function
-	 * Leaves transparency/alpha-channel untouched
-	 */
+/* 2.0.16:
+ * Sharpen function added on 2003-11-19
+ * by Paul Troughton (paul<dot>troughton<at>ieee<dot>org)
+ * Simple 3x3 convolution kernel
+ * Makes use of seperability
+ * Faster, but less flexible, than full-blown unsharp masking
+ * pct is sharpening percentage, and can be greater than 100
+ * Silently does nothing to non-truecolor images
+ * Silently does nothing for pct<0, as not a useful blurring function
+ * Leaves transparency/alpha-channel untouched
+ */
 
-	BGD_DECLARE(void) gdImageSharpen (gdImagePtr im, int pct);
+BGD_DECLARE(void) gdImageSharpen (gdImagePtr im, int pct);
 
 #endif /* GDFX_H */
 
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.