Mercurial > hg > dmlib
diff tools/libgfx.h @ 1609:c29adf5ce240
Convert libgfx file format routines to use DMResource instead of stdio FILE.
Also do necessary changes in gfxconv due to these API changes.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 14 May 2018 12:42:24 +0300 |
| parents | 3b613fcbf3ff |
| children | 36d073c45327 |
line wrap: on
line diff
--- a/tools/libgfx.h Mon May 14 12:40:57 2018 +0300 +++ b/tools/libgfx.h Mon May 14 12:42:24 2018 +0300 @@ -9,6 +9,7 @@ #define LIBMGFX_H 1 #include "dmlib.h" +#include "dmres.h" #ifdef __cplusplus @@ -66,7 +67,7 @@ }; -// Bitmapped image struct +// Bitmapped image struct typedef struct { int format; // one of types specified by DM_IFMT_* @@ -99,9 +100,9 @@ char *desc; int (*probe)(const Uint8 *buf, const size_t len); int (*read)(const char *filename, DMImage **pimg); - int (*readFILE)(FILE *fp, DMImage **pimg); + int (*readFILE)(DMResource *fp, DMImage **pimg); int (*write)(const char *filename, const DMImage *pimg, const DMImageConvSpec *spec); - int (*writeFILE)(FILE *fp, const DMImage *pimg, const DMImageConvSpec *spec); + int (*writeFILE)(DMResource *fp, const DMImage *pimg, const DMImageConvSpec *spec); } DMImageFormat; @@ -119,24 +120,23 @@ int dmWriteImageData(const DMImage *img, void *cbdata, int (*writeRowCB)(void *, const Uint8 *, const size_t), const DMImageConvSpec *spec); -int dmWriteIFFMasterRAWPalette(FILE *fp, const DMImage *img, int ncolors, const char *indent, const char *type); -int dmWriteRAWImageFILE(FILE *fp, const DMImage *img, const DMImageConvSpec *spec); +int dmWriteRAWImageFILE(DMResource *fp, const DMImage *img, const DMImageConvSpec *spec); int dmWriteRAWImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec); -int dmWritePPMImageFILE(FILE *fp, const DMImage *img, const DMImageConvSpec *spec); +int dmWritePPMImageFILE(DMResource *fp, const DMImage *img, const DMImageConvSpec *spec); int dmWritePPMImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec); #ifdef DM_USE_LIBPNG -int dmWritePNGImageFILE(FILE *fp, const DMImage *img, const DMImageConvSpec *spec); +int dmWritePNGImageFILE(DMResource *fp, const DMImage *img, const DMImageConvSpec *spec); int dmWritePNGImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec); #endif -int dmReadILBMImageFILE(FILE *fp, DMImage **pimg); +int dmReadILBMImageFILE(DMResource *fp, DMImage **pimg); int dmReadILBMImage(const char *filename, DMImage **pimg); -int dmWritePCXImageFILE(FILE *fp, const DMImage *img, const DMImageConvSpec *spec); +int dmWritePCXImageFILE(DMResource *fp, const DMImage *img, const DMImageConvSpec *spec); int dmWritePCXImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec); -int dmReadPCXImageFILE(FILE *fp, DMImage **pimg); +int dmReadPCXImageFILE(DMResource *fp, DMImage **pimg); int dmReadPCXImage(const char *filename, DMImage **pimg); @@ -153,7 +153,7 @@ void dmInitBitStreamContext(DMBitStreamContext *ctx); int dmFlushBitStream(DMBitStreamContext *ctx); BOOL dmPutBits(DMBitStreamContext *ctx, const int val, const int n); -int dmInitBitStreamFILE(DMBitStreamContext *ctx, FILE *fp); +int dmInitBitStreamFILE(DMBitStreamContext *ctx, DMResource *fp);