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

- sync to 2.0.24

master
pierre 2006-04-05 15:52:22 +00:00
parent b163e4237d
commit f7a1a94acb
2 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/gd_gd2.c
View File

@ -274,8 +274,7 @@ _gd2ReadChunk (int offset, char *compBuf, int compSize, char *chunkBuf,
return TRUE;
}
gdImagePtr
gdImageCreateFromGd2 (FILE * inFile)
BGD_DECLARE(gdImagePtr) gdImageCreateFromGd2 (FILE * inFile)
{
gdIOCtx *in = gdNewFileCtx (inFile);
gdImagePtr im;
@ -287,8 +286,7 @@ gdImageCreateFromGd2 (FILE * inFile)
return im;
}
gdImagePtr
gdImageCreateFromGd2Ptr (int size, void *data)
BGD_DECLARE(gdImagePtr) gdImageCreateFromGd2Ptr (int size, void *data)
{
gdImagePtr im;
gdIOCtx *in = gdNewDynamicCtxEx (size, data, 0);
@ -297,8 +295,7 @@ gdImageCreateFromGd2Ptr (int size, void *data)
return im;
}
gdImagePtr
gdImageCreateFromGd2Ctx (gdIOCtxPtr in)
BGD_DECLARE(gdImagePtr) gdImageCreateFromGd2Ctx (gdIOCtxPtr in)
{
int sx, sy;
int i;
@ -472,8 +469,7 @@ fail2:
}
gdImagePtr
gdImageCreateFromGd2Part (FILE * inFile, int srcx, int srcy, int w, int h)
BGD_DECLARE(gdImagePtr) gdImageCreateFromGd2Part (FILE * inFile, int srcx, int srcy, int w, int h)
{
gdImagePtr im;
gdIOCtx *in = gdNewFileCtx (inFile);
@ -485,8 +481,7 @@ gdImageCreateFromGd2Part (FILE * inFile, int srcx, int srcy, int w, int h)
return im;
}
gdImagePtr
gdImageCreateFromGd2PartPtr (int size, void *data, int srcx, int srcy, int w,
BGD_DECLARE(gdImagePtr) gdImageCreateFromGd2PartPtr (int size, void *data, int srcx, int srcy, int w,
int h)
{
gdImagePtr im;
@ -496,8 +491,7 @@ gdImageCreateFromGd2PartPtr (int size, void *data, int srcx, int srcy, int w,
return im;
}
gdImagePtr
gdImageCreateFromGd2PartCtx (gdIOCtx * in, int srcx, int srcy, int w, int h)
BGD_DECLARE(gdImagePtr) gdImageCreateFromGd2PartCtx (gdIOCtx * in, int srcx, int srcy, int w, int h)
{
int scx, scy, ecx, ecy, fsx, fsy;
int nc, ncx, ncy, cs, cx, cy;
@ -1001,16 +995,14 @@ _gdImageGd2 (gdImagePtr im, gdIOCtx * out, int cs, int fmt)
}
void
gdImageGd2 (gdImagePtr im, FILE * outFile, int cs, int fmt)
BGD_DECLARE(void) gdImageGd2 (gdImagePtr im, FILE * outFile, int cs, int fmt)
{
gdIOCtx *out = gdNewFileCtx (outFile);
_gdImageGd2 (im, out, cs, fmt);
out->gd_free (out);
}
void *
gdImageGd2Ptr (gdImagePtr im, int cs, int fmt, int *size)
BGD_DECLARE(void *) gdImageGd2Ptr (gdImagePtr im, int cs, int fmt, int *size)
{
void *rv;
gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
@ -1021,15 +1013,13 @@ gdImageGd2Ptr (gdImagePtr im, int cs, int fmt, int *size)
}
#else /* no HAVE_LIBZ */
gdImagePtr
gdImageCreateFromGd2 (FILE * inFile)
BGD_DECLARE(gdImagePtr) gdImageCreateFromGd2 (FILE * inFile)
{
fprintf (stderr, "GD2 support is not available - no libz\n");
return NULL;
}
gdImagePtr
gdImageCreateFromGd2Ctx (gdIOCtxPtr in)
BGD_DECLARE(gdImagePtr) gdImageCreateFromGd2Ctx (gdIOCtxPtr in)
{
fprintf (stderr, "GD2 support is not available - no libz\n");
return NULL;

9
src/gd_io_dp.c
View File

@ -69,15 +69,13 @@ static int dynamicSeek (struct gdIOCtx *, const int);
static long dynamicTell (struct gdIOCtx *);
/* return data as a dynamic pointer */
gdIOCtx *
gdNewDynamicCtx (int initialSize, void *data)
BGD_DECLARE(gdIOCtx *) gdNewDynamicCtx (int initialSize, void *data)
{
/* 2.0.23: Phil Moore: 'return' keyword was missing! */
return gdNewDynamicCtxEx (initialSize, data, 1);
}
gdIOCtx *
gdNewDynamicCtxEx (int initialSize, void *data, int freeOKFlag)
BGD_DECLARE(gdIOCtx *) gdNewDynamicCtxEx (int initialSize, void *data, int freeOKFlag)
{
dpIOCtx *ctx;
dynamicPtr *dp;
@ -111,8 +109,7 @@ gdNewDynamicCtxEx (int initialSize, void *data, int freeOKFlag)
return (gdIOCtx *) ctx;
}
void *
gdDPExtractData (struct gdIOCtx *ctx, int *size)
BGD_DECLARE(void *) gdDPExtractData (struct gdIOCtx *ctx, int *size)
{
dynamicPtr *dp;
dpIOCtx *dctx;