gd.h (libgd-2.3.1) | : | gd.h (libgd-2.3.2) | ||
---|---|---|---|---|
skipping to change at line 16 | skipping to change at line 16 | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif | #endif | |||
/* Version information. This gets parsed by build scripts as well as | /* Version information. This gets parsed by build scripts as well as | |||
* gcc so each #define line in this group must also be splittable on | * gcc so each #define line in this group must also be splittable on | |||
* whitespace, take the form GD_*_VERSION and contain the magical | * whitespace, take the form GD_*_VERSION and contain the magical | |||
* trailing comment. */ | * trailing comment. */ | |||
#define GD_MAJOR_VERSION 2 /*version605b5d1778*/ | #define GD_MAJOR_VERSION 2 /*version605b5d1778*/ | |||
#define GD_MINOR_VERSION 3 /*version605b5d1778*/ | #define GD_MINOR_VERSION 3 /*version605b5d1778*/ | |||
#define GD_RELEASE_VERSION 1 /*version605b5d1778*/ | #define GD_RELEASE_VERSION 2 /*version605b5d1778*/ | |||
#define GD_EXTRA_VERSION "" /*version605b5d1778*/ | #define GD_EXTRA_VERSION "" /*version605b5d1778*/ | |||
/* End parsable section. */ | /* End parsable section. */ | |||
/* The version string. This is constructed from the version number | /* The version string. This is constructed from the version number | |||
* parts above via macro abuse^Wtrickery. */ | * parts above via macro abuse^Wtrickery. */ | |||
#define GDXXX_VERSION_STR(mjr, mnr, rev, ext) mjr "." mnr "." rev ext | #define GDXXX_VERSION_STR(mjr, mnr, rev, ext) mjr "." mnr "." rev ext | |||
#define GDXXX_STR(s) GDXXX_SSTR(s) /* Two levels needed to expand args. */ | #define GDXXX_STR(s) GDXXX_SSTR(s) /* Two levels needed to expand args. */ | |||
#define GDXXX_SSTR(s) #s | #define GDXXX_SSTR(s) #s | |||
#define GD_VERSION_STRING \ | #define GD_VERSION_STRING \ | |||
skipping to change at line 81 | skipping to change at line 81 | |||
# else | # else | |||
# define BGD_EXPORT_DATA_PROT | # define BGD_EXPORT_DATA_PROT | |||
# define BGD_EXPORT_DATA_IMPL | # define BGD_EXPORT_DATA_IMPL | |||
# endif | # endif | |||
# define BGD_STDCALL | # define BGD_STDCALL | |||
#endif | #endif | |||
#define BGD_DECLARE(rt) BGD_EXPORT_DATA_PROT rt BGD_STDCALL | #define BGD_DECLARE(rt) BGD_EXPORT_DATA_PROT rt BGD_STDCALL | |||
/* VS2012+ disable keyword macroizing unless _ALLOW_KEYWORD_MACROS is set | /* VS2012+ disable keyword macroizing unless _ALLOW_KEYWORD_MACROS is set | |||
We define inline, snprintf, and strcasecmp if they're missing | We define inline, and strcasecmp if they're missing | |||
*/ | */ | |||
#ifdef _MSC_VER | #ifdef _MSC_VER | |||
# define _ALLOW_KEYWORD_MACROS | # define _ALLOW_KEYWORD_MACROS | |||
# ifndef inline | # ifndef inline | |||
# define inline __inline | # define inline __inline | |||
# endif | # endif | |||
# ifndef strcasecmp | # ifndef strcasecmp | |||
# define strcasecmp _stricmp | # define strcasecmp _stricmp | |||
# endif | # endif | |||
#if _MSC_VER < 1900 | ||||
extern int snprintf(char*, size_t, const char*, ...); | ||||
#endif | ||||
#endif | #endif | |||
/* gd.h: declarations file for the graphic-draw module. | /* gd.h: declarations file for the graphic-draw module. | |||
* Permission to use, copy, modify, and distribute this software and its | * Permission to use, copy, modify, and distribute this software and its | |||
* documentation for any purpose and without fee is hereby granted, provided | * documentation for any purpose and without fee is hereby granted, provided | |||
* that the above copyright notice appear in all copies and that both that | * that the above copyright notice appear in all copies and that both that | |||
* copyright notice and this permission notice appear in supporting | * copyright notice and this permission notice appear in supporting | |||
* documentation. This software is provided "AS IS." Thomas Boutell and | * documentation. This software is provided "AS IS." Thomas Boutell and | |||
* Boutell.Com, Inc. disclaim all warranties, either express or implied, | * Boutell.Com, Inc. disclaim all warranties, either express or implied, | |||
* including but not limited to implied warranties of merchantability and | * including but not limited to implied warranties of merchantability and | |||
skipping to change at line 333 | skipping to change at line 330 | |||
GD_NEAREST_NEIGHBOUR, | GD_NEAREST_NEIGHBOUR, | |||
GD_POWER, | GD_POWER, | |||
GD_QUADRATIC, | GD_QUADRATIC, | |||
GD_SINC, | GD_SINC, | |||
GD_TRIANGLE, | GD_TRIANGLE, | |||
GD_WEIGHTED4, | GD_WEIGHTED4, | |||
GD_LINEAR, | GD_LINEAR, | |||
GD_METHOD_COUNT = 23 | GD_METHOD_COUNT = 23 | |||
} gdInterpolationMethod; | } gdInterpolationMethod; | |||
/** | ||||
* Group: HEIF Coding Format | ||||
* | ||||
* Values that select the HEIF coding format. | ||||
* | ||||
* Constants: gdHeifCodec | ||||
* | ||||
* GD_HEIF_CODEC_UNKNOWN | ||||
* GD_HEIF_CODEC_HEVC | ||||
* GD_HEIF_CODEC_AV1 | ||||
* | ||||
* See also: | ||||
* - <gdImageHeif> | ||||
*/ | ||||
typedef enum { | ||||
GD_HEIF_CODEC_UNKNOWN = 0, | ||||
GD_HEIF_CODEC_HEVC, | ||||
GD_HEIF_CODEC_AV1 = 4, | ||||
} gdHeifCodec; | ||||
/** | ||||
* Group: HEIF Chroma Subsampling | ||||
* | ||||
* Values that select the HEIF chroma subsampling. | ||||
* | ||||
* Constants: gdHeifCompression | ||||
* | ||||
* GD_HEIF_CHROMA_420 | ||||
* GD_HEIF_CHROMA_422 | ||||
* GD_HEIF_CHROMA_444 | ||||
* | ||||
* See also: | ||||
* - <gdImageHeif> | ||||
*/ | ||||
typedef const char *gdHeifChroma; | ||||
#define GD_HEIF_CHROMA_420 "420" | ||||
#define GD_HEIF_CHROMA_422 "422" | ||||
#define GD_HEIF_CHROMA_444 "444" | ||||
/* define struct with name and func ptr and add it to gdImageStruct gdInterpolat ionMethod interpolation; */ | /* define struct with name and func ptr and add it to gdImageStruct gdInterpolat ionMethod interpolation; */ | |||
/* Interpolation function ptr */ | /* Interpolation function ptr */ | |||
typedef double (* interpolation_method )(double); | typedef double (* interpolation_method )(double); | |||
/* | /* | |||
Group: Types | Group: Types | |||
typedef: gdImage | typedef: gdImage | |||
skipping to change at line 624 | skipping to change at line 661 | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromJpeg (FILE * infile); | BGD_DECLARE(gdImagePtr) gdImageCreateFromJpeg (FILE * infile); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromJpegEx (FILE * infile, int ignore_warni ng); | BGD_DECLARE(gdImagePtr) gdImageCreateFromJpegEx (FILE * infile, int ignore_warni ng); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromJpegCtx (gdIOCtx * infile); | BGD_DECLARE(gdImagePtr) gdImageCreateFromJpegCtx (gdIOCtx * infile); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromJpegCtxEx (gdIOCtx * infile, int ignore _warning); | BGD_DECLARE(gdImagePtr) gdImageCreateFromJpegCtxEx (gdIOCtx * infile, int ignore _warning); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromJpegPtr (int size, void *data); | BGD_DECLARE(gdImagePtr) gdImageCreateFromJpegPtr (int size, void *data); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromJpegPtrEx (int size, void *data, int ig nore_warning); | BGD_DECLARE(gdImagePtr) gdImageCreateFromJpegPtrEx (int size, void *data, int ig nore_warning); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromWebp (FILE * inFile); | BGD_DECLARE(gdImagePtr) gdImageCreateFromWebp (FILE * inFile); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromWebpPtr (int size, void *data); | BGD_DECLARE(gdImagePtr) gdImageCreateFromWebpPtr (int size, void *data); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromWebpCtx (gdIOCtx * infile); | BGD_DECLARE(gdImagePtr) gdImageCreateFromWebpCtx (gdIOCtx * infile); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromHeif(FILE *inFile); | ||||
BGD_DECLARE(gdImagePtr) gdImageCreateFromHeifPtr(int size, void *data); | ||||
BGD_DECLARE(gdImagePtr) gdImageCreateFromHeifCtx(gdIOCtx *infile); | ||||
BGD_DECLARE(gdImagePtr) gdImageCreateFromAvif(FILE *inFile); | ||||
BGD_DECLARE(gdImagePtr) gdImageCreateFromAvifPtr(int size, void *data); | ||||
BGD_DECLARE(gdImagePtr) gdImageCreateFromAvifCtx(gdIOCtx *infile); | ||||
BGD_DECLARE(gdImagePtr) gdImageCreateFromTiff(FILE *inFile); | BGD_DECLARE(gdImagePtr) gdImageCreateFromTiff(FILE *inFile); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromTiffCtx(gdIOCtx *infile); | BGD_DECLARE(gdImagePtr) gdImageCreateFromTiffCtx(gdIOCtx *infile); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromTiffPtr(int size, void *data); | BGD_DECLARE(gdImagePtr) gdImageCreateFromTiffPtr(int size, void *data); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromTga( FILE * fp ); | BGD_DECLARE(gdImagePtr) gdImageCreateFromTga( FILE * fp ); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromTgaCtx(gdIOCtx* ctx); | BGD_DECLARE(gdImagePtr) gdImageCreateFromTgaCtx(gdIOCtx* ctx); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromTgaPtr(int size, void *data); | BGD_DECLARE(gdImagePtr) gdImageCreateFromTgaPtr(int size, void *data); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromBmp (FILE * inFile); | BGD_DECLARE(gdImagePtr) gdImageCreateFromBmp (FILE * inFile); | |||
BGD_DECLARE(gdImagePtr) gdImageCreateFromBmpPtr (int size, void *data); | BGD_DECLARE(gdImagePtr) gdImageCreateFromBmpPtr (int size, void *data); | |||
skipping to change at line 1076 | skipping to change at line 1121 | |||
/* Best to free this memory with gdFree(), not free() */ | /* Best to free this memory with gdFree(), not free() */ | |||
BGD_DECLARE(void *) gdImageJpegPtr (gdImagePtr im, int *size, int quality); | BGD_DECLARE(void *) gdImageJpegPtr (gdImagePtr im, int *size, int quality); | |||
BGD_DECLARE(void) gdImageWebpEx (gdImagePtr im, FILE * outFile, int quantization ); | BGD_DECLARE(void) gdImageWebpEx (gdImagePtr im, FILE * outFile, int quantization ); | |||
BGD_DECLARE(void) gdImageWebp (gdImagePtr im, FILE * outFile); | BGD_DECLARE(void) gdImageWebp (gdImagePtr im, FILE * outFile); | |||
BGD_DECLARE(void *) gdImageWebpPtr (gdImagePtr im, int *size); | BGD_DECLARE(void *) gdImageWebpPtr (gdImagePtr im, int *size); | |||
BGD_DECLARE(void *) gdImageWebpPtrEx (gdImagePtr im, int *size, int quantization ); | BGD_DECLARE(void *) gdImageWebpPtrEx (gdImagePtr im, int *size, int quantization ); | |||
BGD_DECLARE(void) gdImageWebpCtx (gdImagePtr im, gdIOCtx * outfile, int quantiza tion); | BGD_DECLARE(void) gdImageWebpCtx (gdImagePtr im, gdIOCtx * outfile, int quantiza tion); | |||
BGD_DECLARE(void) gdImageHeifEx(gdImagePtr im, FILE *outFile, int quality, gdHei | ||||
fCodec codec, gdHeifChroma chroma); | ||||
BGD_DECLARE(void) gdImageHeif(gdImagePtr im, FILE *outFile); | ||||
BGD_DECLARE(void *) gdImageHeifPtr(gdImagePtr im, int *size); | ||||
BGD_DECLARE(void *) gdImageHeifPtrEx(gdImagePtr im, int *size, int quality, gdHe | ||||
ifCodec codec, gdHeifChroma chroma); | ||||
BGD_DECLARE(void) gdImageHeifCtx(gdImagePtr im, gdIOCtx *outfile, int quality, g | ||||
dHeifCodec codec, gdHeifChroma chroma); | ||||
BGD_DECLARE(void) gdImageAvif(gdImagePtr im, FILE *outFile); | ||||
BGD_DECLARE(void) gdImageAvifEx(gdImagePtr im, FILE *outFile, int quality, int s | ||||
peed); | ||||
BGD_DECLARE(void *) gdImageAvifPtr(gdImagePtr im, int *size); | ||||
BGD_DECLARE(void *) gdImageAvifPtrEx(gdImagePtr im, int *size, int quality, int | ||||
speed); | ||||
BGD_DECLARE(void) gdImageAvifCtx(gdImagePtr im, gdIOCtx *outfile, int quality, i | ||||
nt speed); | ||||
/** | /** | |||
* Group: GifAnim | * Group: GifAnim | |||
* | * | |||
* Legal values for Disposal. gdDisposalNone is always used by | * Legal values for Disposal. gdDisposalNone is always used by | |||
* the built-in optimizer if previm is passed. | * the built-in optimizer if previm is passed. | |||
* | * | |||
* Constants: gdImageGifAnim | * Constants: gdImageGifAnim | |||
* | * | |||
* gdDisposalUnknown - Not recommended | * gdDisposalUnknown - Not recommended | |||
* gdDisposalNone - Preserve previous frame | * gdDisposalNone - Preserve previous frame | |||
End of changes. 6 change blocks. | ||||
5 lines changed or deleted | 68 lines changed or added |