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

gdft: fix image pointer types 

These are equiv, but switch them over for clarity & consistency.
master
Mike Frysinger 2021-05-26 20:12:50 -04:00
parent c44cb824de
commit d6baf4c5c9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gd.h
View File

@ -808,12 +808,12 @@ BGD_DECLARE(void) gdFontCacheShutdown (void);
BGD_DECLARE(void) gdFreeFontCache (void);
/* Calls gdImageStringFT. Provided for backwards compatibility only. */
BGD_DECLARE(char *) gdImageStringTTF (gdImage * im, int *brect, int fg, const char *fontlist,
BGD_DECLARE(char *) gdImageStringTTF (gdImagePtr im, int *brect, int fg, const char *fontlist,
double ptsize, double angle, int x, int y,
const char *string);
/* FreeType 2 text output */
BGD_DECLARE(char *) gdImageStringFT (gdImage * im, int *brect, int fg, const char *fontlist,
BGD_DECLARE(char *) gdImageStringFT (gdImagePtr im, int *brect, int fg, const char *fontlist,
double ptsize, double angle, int x, int y,
const char *string);
@ -897,7 +897,7 @@ BGD_DECLARE(int) gdFTUseFontConfig(int flag);
#define gdFTEX_Big5 2
#define gdFTEX_Adobe_Custom 3
BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const char *fontlist,
BGD_DECLARE(char *) gdImageStringFTEx (gdImagePtr im, int *brect, int fg, const char *fontlist,
double ptsize, double angle, int x, int y,
const char *string, gdFTStringExtraPtr strex);

12
src/gdft.c
View File

@ -100,7 +100,7 @@ static char *font_path(char **fontpath, char *name_list);
*
* Alias of <gdImageStringFT>.
*/
BGD_DECLARE(char *) gdImageStringTTF (gdImage * im, int *brect, int fg, const char *fontlist,
BGD_DECLARE(char *) gdImageStringTTF (gdImagePtr im, int *brect, int fg, const char *fontlist,
double ptsize, double angle, int x, int y, const char *string)
{
/* 2.0.6: valid return */
@ -109,7 +109,7 @@ BGD_DECLARE(char *) gdImageStringTTF (gdImage * im, int *brect, int fg, const ch
}
#ifndef HAVE_LIBFREETYPE
BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const char *fontlist,
BGD_DECLARE(char *) gdImageStringFTEx (gdImagePtr im, int *brect, int fg, const char *fontlist,
double ptsize, double angle, int x, int y, const char *string,
gdFTStringExtraPtr strex)
{
@ -127,7 +127,7 @@ BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const c
return "libgd was not built with FreeType font support\n";
}
BGD_DECLARE(char *) gdImageStringFT (gdImage * im, int *brect, int fg, const char *fontlist,
BGD_DECLARE(char *) gdImageStringFT (gdImagePtr im, int *brect, int fg, const char *fontlist,
double ptsize, double angle, int x, int y, const char *string)
{
(void)im;
@ -724,7 +724,7 @@ tweenColorRelease (void *element)
/* draw_bitmap - transfers glyph bitmap to GD image */
static char *
gdft_draw_bitmap (gdCache_head_t * tc_cache, gdImage * im, int fg,
gdft_draw_bitmap (gdCache_head_t *tc_cache, gdImagePtr im, int fg,
FT_Bitmap bitmap, int pen_x, int pen_y)
{
unsigned char *pixel = NULL;
@ -926,7 +926,7 @@ BGD_DECLARE(void) gdFontCacheShutdown ()
* See also:
* - <gdImageString>
*/
BGD_DECLARE(char *) gdImageStringFT (gdImage * im, int *brect, int fg, const char *fontlist,
BGD_DECLARE(char *) gdImageStringFT (gdImagePtr im, int *brect, int fg, const char *fontlist,
double ptsize, double angle, int x, int y, const char *string)
{
return gdImageStringFTEx (im, brect, fg, fontlist,
@ -1091,7 +1091,7 @@ BGD_DECLARE(int) gdFontCacheSetup (void)
/* the size of the error introduced by rounding is affected by this number */
#define METRIC_RES 300
BGD_DECLARE(char *) gdImageStringFTEx (gdImage * im, int *brect, int fg, const char *fontlist,
BGD_DECLARE(char *) gdImageStringFTEx (gdImagePtr im, int *brect, int fg, const char *fontlist,
double ptsize, double angle, int x, int y, const char *string,
gdFTStringExtraPtr strex)
{