libgd
/
libgd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Ondřej Surý 2013-05-16 08:34:23 +02:00
parent b22f9885ae
commit b628d27295
16 changed files with 71 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gd_color_map.h
View File

@ -1,10 +1,6 @@
#ifndef GD_COLOR_MAP_H
#define GD_COLOR_MAP_H 1
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gd.h"
#ifdef __cplusplus

5
src/gd_io_stream.cxx
View File

@ -14,6 +14,11 @@
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

4
src/gd_io_stream.h
View File

@ -31,10 +31,6 @@
#ifndef _gd_io_stream_h
#define _gd_io_stream_h
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gd.h"
#include <iostream>

4
src/gd_tga.h
View File

@ -21,10 +21,6 @@
#ifndef __TGA_H
#define __TGA_H 1
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gd.h"
#include "gdhelpers.h"

4
src/gdcache.h
View File

@ -44,10 +44,6 @@ extern "C" {
/* header */
/*********************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdlib.h>
#ifndef NULL
# define NULL (void *)0

3
src/gdfontg.c
View File

@ -10,6 +10,9 @@
"Libor Skarvada, libor@informatics.muni.cz"
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gdfontg.h"

4
src/gdfontg.h
View File

@ -16,10 +16,6 @@ extern "C"
"Libor Skarvada, libor@informatics.muni.cz"
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gd.h"
extern BGD_EXPORT_DATA_PROT gdFontPtr gdFontGiant;

3
src/gdfontl.c
View File

@ -11,6 +11,9 @@
"Libor Skarvada, libor@informatics.muni.cz"
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gdfontl.h"

4
src/gdfontl.h
View File

@ -17,10 +17,6 @@ extern "C"
"Libor Skarvada, libor@informatics.muni.cz"
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gd.h"
extern BGD_EXPORT_DATA_PROT gdFontPtr gdFontLarge;

3
src/gdfontmb.c
View File

@ -9,6 +9,9 @@
No copyright info was found in the original bdf.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gdfontmb.h"

4
src/gdfontmb.h
View File

@ -15,10 +15,6 @@ extern "C"
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;

3
src/gdfonts.c
View File

@ -7,6 +7,9 @@
No copyright info was found in the original bdf.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gdfonts.h"

4
src/gdfonts.h
View File

@ -15,10 +15,6 @@ extern "C"
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;

3
src/gdfontt.c
View File

@ -10,6 +10,9 @@
"Libor Skarvada, libor@informatics.muni.cz"
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gdfontt.h"

4
src/gdfontt.h
View File

@ -16,10 +16,6 @@ extern "C"
"Libor Skarvada, libor@informatics.muni.cz"
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "gd.h"
extern BGD_EXPORT_DATA_PROT gdFontPtr gdFontTiny;

108
src/gdfx.h
View File

@ -5,69 +5,63 @@ extern "C" {
#ifndef GDFX_H
#define GDFX_H 1
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
/* 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." */
#include "gd.h"
BGD_DECLARE(gdImagePtr) gdImageSquareToCircle(gdImagePtr im, int radius);
/* 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." */
/* 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.
BGD_DECLARE(gdImagePtr) gdImageSquareToCircle(gdImagePtr im, int radius);
Returns 0 on success, or an error string. */
/* 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.
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);
Returns 0 on success, or an error string. */
/* 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(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
*/
BGD_DECLARE(void) gdImageSharpen (gdImagePtr im, int pct);
BGD_DECLARE(void) gdImageSharpen (gdImagePtr im, int pct);
#endif /* GDFX_H */