Mercurial > hg > dmlib

changeset 1290:e7dc9bb9777e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename struct DMImageSpec to DMImageConvSpec.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 18 Aug 2017 17:47:30 +0300
parents 4b025a96ad46
children 2c4acbc3e7bf
files src/libgfx.c src/libgfx.h tools/gfxconv.c
diffstat 3 files changed, 26 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/src/libgfx.c	Fri Aug 18 17:34:33 2017 +0300
+++ b/src/libgfx.c	Fri Aug 18 17:47:30 2017 +0300
@@ -137,13 +137,13 @@
 }
 
 
-int dmImageConvertTo(DMImage **dst, const DMImage *src, const DMImageSpec *spec)
+int dmImageConvertTo(DMImage **dst, const DMImage *src, const DMImageConvSpec *spec)
 {
     return DMERR_OK;
 }
 
 
-int dmWriteImageData(DMImage *img, void *cbdata, int (*writeRowCB)(void *, Uint8 *, size_t), const DMImageSpec *spec)
+int dmWriteImageData(DMImage *img, void *cbdata, int (*writeRowCB)(void *, Uint8 *, size_t), const DMImageConvSpec *spec)
 {
     int x, y, yscale, xscale, res = 0, rowSize, rowWidth;
     Uint8 *row = NULL;
@@ -260,7 +260,7 @@
 }
 
 
-int dmWriteRAWImageFILE(FILE *fp, DMImage *img, const DMImageSpec *spec)
+int dmWriteRAWImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec)
 {
     int xc, yc, plane, res;
     DMBitStreamContext bs;
@@ -305,7 +305,7 @@
 }
 
 
-int dmWriteRAWImage(const char *filename, DMImage *img, const DMImageSpec *spec)
+int dmWriteRAWImage(const char *filename, DMImage *img, const DMImageConvSpec *spec)
 {
     FILE *fp;
     int res;
@@ -333,9 +333,9 @@
 }
 
 
-int dmWritePPMImageFILE(FILE *fp, DMImage *img, const DMImageSpec *spec)
+int dmWritePPMImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec)
 {
-    DMImageSpec tmpSpec;
+    DMImageConvSpec tmpSpec;
 
     // Write PPM header
     fprintf(fp,
@@ -344,13 +344,13 @@
         img->height * spec->scaleY);
 
     // Write image data
-    memcpy(&tmpSpec, spec, sizeof(DMImageSpec));
+    memcpy(&tmpSpec, spec, sizeof(DMImageConvSpec));
     tmpSpec.format = DM_IFMT_RGB;
     return dmWriteImageData(img, (void *) fp, dmWritePPMRow, &tmpSpec);
 }
 
 
-int dmWritePPMImage(const char *filename, DMImage *img, const DMImageSpec *spec)
+int dmWritePPMImage(const char *filename, DMImage *img, const DMImageConvSpec *spec)
 {
     FILE *fp;
     int res;
@@ -385,7 +385,7 @@
 }
 
 
-int dmWritePNGImageFILE(FILE *fp, DMImage *img, const DMImageSpec *spec)
+int dmWritePNGImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec)
 {
     png_structp png_ptr = NULL;
     png_infop info_ptr = NULL;
@@ -492,7 +492,7 @@
 }
 
 
-int dmWritePNGImage(const char *filename, DMImage *img, const DMImageSpec *spec)
+int dmWritePNGImage(const char *filename, DMImage *img, const DMImageConvSpec *spec)
 {
     int res;
     FILE *fp;
@@ -822,7 +822,7 @@
 }
 
 
-int dmWritePCXImageFILE(FILE *fp, DMImage *img, const DMImageSpec *spec)
+int dmWritePCXImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec)
 {
     DMPCXData pcx;
     DMPCXHeader hdr;
@@ -951,7 +951,7 @@
 }
 
 
-int dmWritePCXImage(const char *filename, DMImage *img, const DMImageSpec *spec)
+int dmWritePCXImage(const char *filename, DMImage *img, const DMImageConvSpec *spec)
 {
     FILE *fp;
     int res;
--- a/src/libgfx.h	Fri Aug 18 17:34:33 2017 +0300
+++ b/src/libgfx.h	Fri Aug 18 17:47:30 2017 +0300
@@ -70,7 +70,7 @@
     int scaleX, scaleY;
     int nplanes, bpp;
     BOOL interleave, paletted;
-} DMImageSpec;
+} DMImageConvSpec;
 
 
 typedef struct
@@ -80,8 +80,8 @@
     int  (*probe)(const Uint8 *buf, const size_t len);
     int  (*read)(const char *filename, DMImage **pimg);
     int  (*readFILE)(FILE *fp, DMImage **pimg);
-    int  (*write)(const char *filename, DMImage *pimg, const DMImageSpec *spec);
-    int  (*writeFILE)(FILE *fp, DMImage *pimg, const DMImageSpec *spec);
+    int  (*write)(const char *filename, DMImage *pimg, const DMImageConvSpec *spec);
+    int  (*writeFILE)(FILE *fp, DMImage *pimg, const DMImageConvSpec *spec);
 } DMImageFormat;
 
 
@@ -105,22 +105,22 @@
 BOOL dmCompareColor(const DMColor *c1, const DMColor *c2, BOOL alpha);
 
 
-int dmWriteImageData(DMImage *img, void *cbdata, int (*writeRowCB)(void *, Uint8 *, size_t), const DMImageSpec *spec);
+int dmWriteImageData(DMImage *img, void *cbdata, int (*writeRowCB)(void *, Uint8 *, size_t), const DMImageConvSpec *spec);
 
 int dmWriteIFFMasterRAWPalette(FILE *fp, DMImage *img, int ncolors, const char *indent, const char *type);
-int dmWriteRAWImageFILE(FILE *fp, DMImage *img, const DMImageSpec *spec);
-int dmWriteRAWImage(const char *filename, DMImage *img, const DMImageSpec *spec);
+int dmWriteRAWImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec);
+int dmWriteRAWImage(const char *filename, DMImage *img, const DMImageConvSpec *spec);
 
-int dmWritePPMImageFILE(FILE *fp, DMImage *img, const DMImageSpec *spec);
-int dmWritePPMImage(const char *filename, DMImage *img, const DMImageSpec *spec);
+int dmWritePPMImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec);
+int dmWritePPMImage(const char *filename, DMImage *img, const DMImageConvSpec *spec);
 
 #ifdef DM_USE_LIBPNG
-int dmWritePNGImageFILE(FILE *fp, DMImage *img, const DMImageSpec *spec);
-int dmWritePNGImage(const char *filename, DMImage *img, const DMImageSpec *spec);
+int dmWritePNGImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec);
+int dmWritePNGImage(const char *filename, DMImage *img, const DMImageConvSpec *spec);
 #endif
 
-int dmWritePCXImageFILE(FILE *fp, DMImage *img, const DMImageSpec *spec);
-int dmWritePCXImage(const char *filename, DMImage *img, const DMImageSpec *spec);
+int dmWritePCXImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec);
+int dmWritePCXImage(const char *filename, DMImage *img, const DMImageConvSpec *spec);
 int dmReadPCXImageFILE(FILE *fp, DMImage **pimg);
 int dmReadPCXImage(const char *filename, DMImage **pimg);
 
--- a/tools/gfxconv.c	Fri Aug 18 17:34:33 2017 +0300
+++ b/tools/gfxconv.c	Fri Aug 18 17:47:30 2017 +0300
@@ -140,7 +140,7 @@
 DMMapValue optRemapTable[DM_MAX_COLORS];
 int     optColors[C64_MAX_COLORS];
 
-DMImageSpec optSpec =
+DMImageConvSpec optSpec =
 {
     .scaleX = 1,
     .scaleY = 1,
@@ -1075,7 +1075,7 @@
 }
 
 
-int dmWriteImage(const char *filename, DMImage *image, DMImageSpec *spec, int iformat, BOOL info)
+int dmWriteImage(const char *filename, DMImage *image, DMImageConvSpec *spec, int iformat, BOOL info)
 {
     if (info)
     {