dmlib: gfxconv.c comparison

comparison gfxconv.c @ 415:d94f4bcb4be3

IFFMaster RAW output works now, at least to some extent.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 03 Nov 2012 03:50:42 +0200
parents	b529b7e8ff83
children	238e6baf01a8

comparison

equal deleted inserted replaced

-:c452a459e552
+:d94f4bcb4be3
 */
 #include <errno.h>
 #include "dmlib.h"
 #include "dmargs.h"
 #include "dmfile.h"
+#include "dmbstr.h"
 #include "dmmutex.h"
 #include "lib64gfx.h"
 //#define UNFINISHED 1
 optPlanedWidth = 1,
 optBPP = 4;
 int     optInSkip = 0;
 BOOL    optInMulticolor = FALSE,
 optSequential = FALSE,
-optPaletted = FALSE;
+optPaletted = FALSE,
+optInterleave = FALSE;
 int     optColors[C64_MAX_COLORS];
 static DMOptArg optList[] =
 {
 #ifdef UNFINISHED
 {10, 'b', "bformat",      "Force input bitmap format (see below)", OPT_ARGREQ },
 #endif
 {11, 'w', "width",        "Item width (number of items per row, min 1)", OPT_ARGREQ },
 {12, 'P', "paletted",     "Use indexed/paletted output (png, pcx output only)", OPT_NONE },
-{13, 'b', "bpp",          "Bits per pixel (certain image output formats)", OPT_ARGREQ },
+{13, 'b', "bplanes",      "Bits per pixel OR # of bitplanes (certain output formats)", OPT_ARGREQ },
+{14, 'I', "interleave",   "Interleave scanlines (default: output whole planes)", OPT_NONE },
 };
 static const int optListN = sizeof(optList) / sizeof(optList[0]);
 }
 break;
 case 12:
 optPaletted = TRUE;
+break;
+case 13:
+{
+int tmp = atoi(optArg);
+if (tmp < 1 || tmp > 8)
+{
+dmError("Invalid bitplanes/bpp value '%s'.\n", optArg);
+return FALSE;
+}
+optBPP = tmp;
+}
+break;
+case 14:
+optInterleave = TRUE;
 break;
 default:
 dmError("Unknown option '%s'.\n", currArg);
 return FALSE;
 return 0;
 }
-typedef struct
+int dmWriteIFFMasterRAWImageFILE(FILE *fp, DMImage *img, int scale, int nplanes, BOOL interleave)
 {
-int bpp;
+int xc, yc, plane, res;
-DMImage *img;
+DMBitStream bs;
-FILE *fp;
-} DMRawData;
+if ((res = dmInitBitStream(&bs, fp)) != DMERR_OK)
+return res;
-static BOOL dmWriteIFFMasterRAWRow(void *cbdata, Uint8 *row, size_t len)
+if (interleave)
 {
-DMRawData *raw = (DMRawData *) cbdata;
+// Output bitplanes in interleaved format (each plane of line sequentially)
-size_t i;
+for (yc = 0; yc < img->height; yc++)
+{
-for (i = 0; i < len; i++)
+for (plane = 0; plane < nplanes; plane++)
 {
-}
+Uint8 *sp = img->data + yc * img->pitch;
+for (xc = 0; xc < img->width; xc++)
-return fwrite(row, sizeof(Uint8), len, raw->fp) == len;
+{
-}
+if (!dmPutBits(&bs, (sp[xc] & (1 << plane)) ? 1 : 0, 1))
+return DMERR_FWRITE;
+}
-int dmWriteIFFMasterRAWImageFILE(FILE *fp, DMImage *img, int scale, int bpp)
+}
-{
+}
-DMRawData raw;
+}
+else
-raw.fp  = fp;
+{
-raw.img = img;
+// Output each bitplane in sequence
-raw.bpp = bpp;
+for (plane = 0; plane < nplanes; plane++)
+{
-return dmWriteImageData(img, (void *) &raw, dmWriteIFFMasterRAWRow, scale, DM_IFMT_PALETTE);
+for (yc = 0; yc < img->height; yc++)
-}
+{
+Uint8 *sp = img->data + yc * img->pitch;
-int dmWriteIFFMasterRAWImage(const char *filename, DMImage *img, int scale, int bpp)
+for (xc = 0; xc < img->width; xc++)
+{
+if (!dmPutBits(&bs, (sp[xc] & (1 << plane)) ? 1 : 0, 1))
+return DMERR_FWRITE;
+}
+}
+}
+}
+return dmFlushBitStream(&bs);
+}
+int dmWriteIFFMasterRAWImage(const char *filename, DMImage *img, int scale, int nplanes, BOOL interleave)
 {
 FILE *fp;
 int res;
 if ((fp = fopen(filename, "wb")) == NULL)
 {
 dmError("IFFMasterRAW: Could not open file '%s' for writing.\n", filename);
-return -15;
+return DMERR_FOPEN;
 }
-res = dmWriteIFFMasterRAWImageFILE(fp, img, scale, bpp);
+res = dmWriteIFFMasterRAWImageFILE(fp, img, scale, nplanes, interleave);
 fclose(fp);
 return res;
 }
 // Create output file
 if ((fp = fopen(filename, "wb")) == NULL)
 {
 dmError("PPM: could not open file '%s' for writing.\n", filename);
-return -15;
+return DMERR_FOPEN;
 }
 res = dmWritePPMImageFILE(fp, img, scale);
 fclose(fp);
 int dmWritePNGImageFILE(FILE *fp, DMImage *img, int scale, int format)
 {
 png_structp png_ptr = NULL;
 png_infop info_ptr = NULL;
 png_colorp palette = NULL;
-int fmt;
+int fmt, res = DMERR_OK;
 // Create PNG structures
 png_ptr = png_create_write_struct(
 PNG_LIBPNG_VER_STRING,
 NULL, NULL, NULL);
 if (png_ptr == NULL)
 {
 dmError("PNG: png_create_write_struct() failed.\n");
+res = DMERR_MALLOC;
 goto error;
 }
 info_ptr = png_create_info_struct(png_ptr);
 if (info_ptr == NULL)
 {
 dmError("PNG: png_create_info_struct(%p) failed.\n", png_ptr);
+res = DMERR_INIT_FAIL;
 goto error;
 }
 if (setjmp(png_jmpbuf(png_ptr)))
 {
 dmError("PNG: Error during image writing..\n");
+res = DMERR_INIT_FAIL;
 goto error;
 }
 png_init_io(png_ptr, fp);
 dmWriteImageData(img, (void *) png_ptr, dmWritePNGRow, scale, format);
 // Write footer
 png_write_end(png_ptr, NULL);
-png_free(png_ptr, palette);
-palette = NULL;
-// Deallocate shit
-if (png_ptr && info_ptr)
-{
-png_destroy_write_struct(&png_ptr, &info_ptr);
-}
-return 0;
 error:
 png_free(png_ptr, palette);
 palette = NULL;
 if (png_ptr && info_ptr)
-{
 png_destroy_write_struct(&png_ptr, &info_ptr);
-}
-return -15;
+return res;
 }
 int dmWritePNGImage(const char *filename, DMImage *img, int scale, int format)
 {
 FILE *fp;
 if ((fp = fopen(filename, "wb")) == NULL)
 {
 dmError("PNG: could not open file '%s' for writing.\n", filename);
-return -15;
+return DMERR_FOPEN;
 }
 res = dmWritePNGImageFILE(fp, img, scale, format);
 fclose(fp);
 return TRUE;
 }
-int dmWritePCXImage(const char *filename, DMImage *img, int scale, BOOL paletted)
+int dmWritePCXImageFILE(FILE *fp, DMImage *img, int scale, BOOL paletted)
 {
 DMPCXData pcx;
 DMPCXHeader hdr;
 int res;
 // Create output file
 pcx.buf    = NULL;
 pcx.format = paletted ? DM_IFMT_PALETTE : DM_IFMT_RGB_PLANE;
 pcx.header = &hdr;
-if ((pcx.fp = fopen(filename, "wb")) == NULL)
+pcx.fp     = fp;
-{
-dmError("PCX: Could not open file '%s' for writing.\n", filename);
-res = DMERR_FOPEN;
-goto error;
-}
 // Create PCX header
 memset(&hdr, 0, sizeof(hdr));
 if (paletted)
 {
 dm_fwrite_byte(pcx.fp, 0);
 }
 }
 error:
-if (pcx.fp != NULL)
-fclose(pcx.fp);
 dmFree(pcx.buf);
+return res;
+}
+int dmWritePCXImage(const char *filename, DMImage *img, int scale, BOOL paletted)
+{
+FILE *fp;
+int res;
+if ((fp = fopen(filename, "wb")) == NULL)
+{
+dmError("PCX: Could not open file '%s' for writing.\n", filename);
+return DMERR_FOPEN;
+}
+res = dmWritePCXImageFILE(fp, img, scale, paletted);
+fclose(fp);
 return res;
 }
 static BOOL dmPCXDecodeRLERow(FILE *fp, Uint8 *buf, const size_t bufLen)
 return 0;
 }
 #endif
-int dmWriteImage(char *filename, DMImage *image, int format, BOOL paletted, int scale, int bpp)
+int dmWriteImage(char *filename, DMImage *image)
 {
-switch (format)
+switch (optOutFormat)
 {
 #ifdef HAVE_LIBPNG
 case OUTFMT_PNG:
-return dmWritePNGImage(filename, image, scale, paletted ? DM_IFMT_PALETTE : DM_IFMT_RGBA);
+return dmWritePNGImage(filename, image, optScale, optPaletted ? DM_IFMT_PALETTE : DM_IFMT_RGBA);
 #endif
 case OUTFMT_PPM:
-return dmWritePPMImage(filename, image, scale);
+return dmWritePPMImage(filename, image, optScale);
 case OUTFMT_PCX:
-return dmWritePCXImage(filename, image, scale, paletted);
+return dmWritePCXImage(filename, image, optScale, optPaletted);
 case OUTFMT_ARAW:
 {
 int res;
 char *palFilename = dm_strdup_printf("%s.pal", filename);
-res = dmWriteIFFMasterRAWPalette(palFilename, image, 1 << bpp);
+res = dmWriteIFFMasterRAWPalette(palFilename, image, 1 << optBPP);
 dmFree(palFilename);
 if (res != DMERR_OK)
 return res;
-return dmWriteIFFMasterRAWImage(filename, image, scale, bpp);
+return dmWriteIFFMasterRAWImage(filename, image, optScale, optBPP, optInterleave);
 }
 default:
 return FALSE;
 }
 {
 dmError("Could not allocate memory for filename template?\n");
 goto error;
 }
-dmWriteImage(outFilename, outImage, optOutFormat, optPaletted, optScale, optBPP);
+dmWriteImage(outFilename, outImage);
 dmFree(outFilename);
 }
 else
 {
 if (++outX >= optPlanedWidth)
 itemCount++;
 }
 if (!optSequential)
 {
-dmWriteImage(optOutFilename, outImage, optOutFormat, optPaletted, optScale, optBPP);
+dmWriteImage(optOutFilename, outImage);
 }
 dmImageFree(outImage);
 }
 {
 case OUTFMT_PCX:
 case OUTFMT_PPM:
 case OUTFMT_PNG:
 case OUTFMT_ARAW:
-res = dmWriteImage(optOutFilename, img, optOutFormat, optPaletted, optScale, optBPP);
+res = dmWriteImage(optOutFilename, img);
 break;
 }
 }
 break;
 }

Mercurial > hg > dmlib

comparison gfxconv.c @ 415:d94f4bcb4be3