dmlib: tools/libgfx.c comparison

comparison tools/libgfx.c @ 1886:1af79412f249

Remove the stdio FILE support from libgfx API, now only DMResource is supported.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 25 Jun 2018 13:52:20 +0300
parents	73545a442ffe
children	297aa8f0ca7f

comparison

equal deleted inserted replaced

-:e69de47d2419
+:1af79412f249
 dmFree(row);
 return res;
 }
+#define DMCOL(x) (((x) >> 4) & 0xf)
+int dmWriteIFFMasterRAWHeader(
+DMResource *fp, const char *filename, const char *prefix,
+const DMImage *img, const DMImageConvSpec *spec, const int fmtid)
+{
+dmfprintf(fp,
+"%s_width: dw.w %d\n"
+"%s_height: dw.w %d\n"
+"%s_nplanes: dw.w %d\n",
+prefix, img->width * spec->scaleX,
+prefix, img->height * spec->scaleY,
+prefix, spec->nplanes);
+if (fmtid == DM_IMGFMT_ARAW)
+{
+dmfprintf(fp,
+"%s_ncolors: dw.w %d\n"
+"%s_palette:\n",
+prefix, img->ncolors,
+prefix);
+for (int i = 0; i < (1 << spec->nplanes); i++)
+{
+Uint32 color;
+if (i < img->ncolors)
+{
+color = (DMCOL(img->pal[i].r) << 8) |
+(DMCOL(img->pal[i].g) << 4) |
+(DMCOL(img->pal[i].b));
+}
+else
+color = 0;
+dmfprintf(fp,
+"\tdc.w $%04X\n",
+color);
+}
+dmfprintf(fp,
+"%s: incbin \"%s\"\n",
+prefix, filename);
+}
+return dmferror(fp);
+}
 static BOOL dmWriteRAWRow(DMBitStreamContext *bs, const DMImage *img, const DMImageConvSpec *spec, const int yc, const int plane)
 {
 const Uint8 *sp = img->data + (yc * img->pitch);
 for (int xc = 0; xc < img->width; xc++)
 {
 }
 return TRUE;
 }
-int dmWriteRAWImageFILE(DMResource *fp, const DMImage *img, const DMImageConvSpec *spec)
+int dmWriteRAWImage(DMResource *fp, const DMImage *img, const DMImageConvSpec *spec)
 {
 int res;
 DMBitStreamContext bs;
 if ((res = dmInitBitStreamFILE(&bs, fp)) != DMERR_OK)
 return dmFlushBitStream(&bs);
 }
-int dmWriteRAWImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec)
-{
-DMResource *fp;
-int res;
-if ((res = dmf_open_stdio(filename, "wb", &fp)) != DMERR_OK)
-{
-return dmError(res,
-"RAW: Could not open file '%s' for writing.\n",
-filename);
-}
-res = dmWriteRAWImageFILE(fp, img, spec);
-dmf_close(fp);
-return res;
-}
 static int dmWritePPMRow(void *cbdata, const Uint8 *row, const size_t len)
 {
 if (dmf_write_str((DMResource *) cbdata, row, len))
 return DMERR_OK;
 else
 return DMERR_FWRITE;
 }
-int dmWritePPMImageFILE(DMResource *fp, const DMImage *img, const DMImageConvSpec *spec)
+int dmWritePPMImage(DMResource *fp, const DMImage *img, const DMImageConvSpec *spec)
 {
 DMImageConvSpec tmpSpec;
 // Write PPM header
 char *tmp = dm_strdup_printf(
 tmpSpec.format = DM_COLFMT_RGB;
 return dmWriteImageData(img, (void *) fp, dmWritePPMRow, &tmpSpec);
 }
-int dmWritePPMImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec)
-{
-DMResource *fp;
-int res;
-// Create output file
-if ((res = dmf_open_stdio(filename, "wb", &fp)) != DMERR_OK)
-{
-return dmError(res,
-"PPM: could not open file '%s' for writing.\n",
-filename);
-}
-res = dmWritePPMImageFILE(fp, img, spec);
-dmf_close(fp);
-return res;
-}
 #ifdef DM_USE_LIBPNG
 static int fmtProbePNG(const Uint8 *buf, const size_t len)
 {
 if (len > 64 && buf[0] == 0x89 &&
 buf[1] == 'P' && buf[2] == 'N' && buf[3] == 'G' &&
 {
 (void) png_ptr;
 }
-int dmWritePNGImageFILE(DMResource *fp, const DMImage *img, const DMImageConvSpec *spec)
+int dmWritePNGImage(DMResource *fp, const DMImage *img, const DMImageConvSpec *spec)
 {
 png_structp png_ptr = NULL;
 png_infop info_ptr = NULL;
 int fmt, res;
 return res;
 }
-int dmWritePNGImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec)
-{
-int res;
-DMResource *fp;
-if ((res = dmf_open_stdio(filename, "wb", &fp)) != DMERR_OK)
-{
-return dmError(res,
-"PNG: could not open file '%s' for writing.\n",
-filename);
-}
-res = dmWritePNGImageFILE(fp, img, spec);
-dmf_close(fp);
-return res;
-}
 void dmPNGReadData(png_structp png_ptr, png_bytep data, png_size_t length)
 {
 DMResource *res = (DMResource *) png_get_io_ptr(png_ptr);
 // XXX TODO: How the fuck does one do error handling here?
 dmf_read_str(res, data, length);
 }
-int dmReadPNGImageFILE(DMResource *fp, DMImage **pimg)
+int dmReadPNGImage(DMResource *fp, DMImage **pimg)
 {
 png_structp png_ptr = NULL;
 png_infop info_ptr = NULL;
 png_colorp palette = NULL;
 png_bytep *row_pointers = NULL;
 //    png_free(png_ptr, palette);
 if (png_ptr && info_ptr)
 png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-return res;
-}
-int dmReadPNGImage(const char *filename, DMImage **img)
-{
-int res;
-DMResource *fp;
-if ((res = dmf_open_stdio(filename, "rb", &fp)) != DMERR_OK)
-{
-return dmError(res,
-"PNG: Could not open file '%s' for reading.\n",
-filename);
-}
-res = dmReadPNGImageFILE(fp, img);
-dmf_close(fp);
 return res;
 }
 #endif
 return DMERR_OK;
 }
-int dmWritePCXImageFILE(DMResource *fp, const DMImage *img, const DMImageConvSpec *pspec)
+int dmWritePCXImage(DMResource *fp, const DMImage *img, const DMImageConvSpec *pspec)
 {
 DMPCXData pcx;
 DMPCXHeader hdr;
 DMImageConvSpec spec;
 int res;
 dmFree(pcx.buf);
 return res;
 }
-int dmWritePCXImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec)
-{
-DMResource *fp;
-int res;
-if ((res = dmf_open_stdio(filename, "wb", &fp)) != DMERR_OK)
-{
-return dmError(res,
-"PCX: Could not open file '%s' for writing.\n",
-filename);
-}
-res = dmWritePCXImageFILE(fp, img, spec);
-dmf_close(fp);
-return res;
-}
 static BOOL dmPCXDecodeRLERow(DMResource *fp, Uint8 *buf, const size_t bufLen)
 {
 size_t offs = 0;
 do
 {
 return TRUE;
 }
-int dmReadPCXImageFILE(DMResource *fp, DMImage **pimg)
+int dmReadPCXImage(DMResource *fp, DMImage **pimg)
 {
 DMImage *img;
 DMPCXData pcx;
 DMPCXHeader hdr;
 int res = 0;
 dmFree(pcx.buf);
 return res;
 }
-int dmReadPCXImage(const char *filename, DMImage **pimg)
-{
-DMResource *fp;
-int res;
-if ((res = dmf_open_stdio(filename, "rb", &fp)) != DMERR_OK)
-{
-return dmError(res,
-"PCX: Could not open file '%s' for reading.\n",
-filename);
-}
-res = dmReadPCXImageFILE(fp, pimg);
-dmf_close(fp);
-return res;
-}
 //
 // IFF ILBM / PBM format
 //
 #define IFF_ID_FORM        0x464F524D // "FORM"
 #define IFF_ID_ILBM        0x494C424D // "ILBM"
 error:
 return res;
 }
-int dmReadILBMImageFILE(DMResource *fp, DMImage **pimg)
+int dmReadILBMImage(DMResource *fp, DMImage **pimg)
 {
 DMIFFChunk chunk;
 DMIFF iff;
 Uint32 read, idsig;
 BOOL parsed = FALSE, planar;
 return res;
 }
-int dmReadILBMImage(const char *filename, DMImage **pimg)
-{
-DMResource *fp;
-int res;
-if ((res = dmf_open_stdio(filename, "rb", &fp)) != DMERR_OK)
-{
-return dmError(res,
-"ILBM: Could not open file '%s' for reading.\n",
-filename);
-}
-res = dmReadILBMImageFILE(fp, pimg);
-dmf_close(fp);
-return res;
-}
 //
 // List of formats
 //
 const DMImageFormat dmImageFormatList[] =
 {
 #ifdef DM_USE_LIBPNG
 {
 "png", "Portable Network Graphics",
 DM_IMGFMT_PNG, DM_FMT_RDWR,
-fmtProbePNG,
+fmtProbePNG, dmReadPNGImage, dmWritePNGImage,
-dmReadPNGImage, dmReadPNGImageFILE,
-dmWritePNGImage, dmWritePNGImageFILE,
 },
 #endif
 {
 "ppm", "Portable PixMap",
 DM_IMGFMT_PPM, DM_FMT_WR,
-NULL,
+NULL, NULL, dmWritePPMImage,
-NULL, NULL,
-dmWritePPMImage, dmWritePPMImageFILE,
 },
 {
 "pcx", "Z-Soft Paintbrush",
 DM_IMGFMT_PCX, DM_FMT_RDWR,
-fmtProbePCX,
+fmtProbePCX, dmReadPCXImage, dmWritePCXImage,
-dmReadPCXImage, dmReadPCXImageFILE,
-dmWritePCXImage, dmWritePCXImageFILE,
 },
 {
 "ilbm", "IFF ILBM / PBM",
-DM_IMGFMT_ILBM, DM_FMT_RD,
+DM_IMGFMT_ILBM, DM_FMT_RDWR,
-fmtProbeILBM,
+fmtProbeILBM, dmReadILBMImage,
-dmReadILBMImage, dmReadILBMImageFILE,
+NULL,
-NULL, NULL,
 },
 {
 "raw", "Plain bitplaned (planar or non-planar) RAW",
 DM_IMGFMT_RAW, DM_FMT_WR,
-NULL,
+NULL, NULL, dmWriteRAWImage,
-NULL, NULL,
-dmWriteRAWImage, dmWriteRAWImageFILE,
 },
 {
 "araw", "IFFMaster Amiga RAW",
 DM_IMGFMT_ARAW, DM_FMT_WR,
-NULL,
+NULL, NULL, dmWriteRAWImage,
-NULL, NULL,
-dmWriteRAWImage, dmWriteRAWImageFILE,
 }
 };
 const int ndmImageFormatList = sizeof(dmImageFormatList) / sizeof(dmImageFormatList[0]);

Mercurial > hg > dmlib

comparison tools/libgfx.c @ 1886:1af79412f249