Mercurial > hg > dmlib

diff tools/gfxconv.c @ 1801:0562dd55a1f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
s/DM_IFMT_/DM_COLFMT_/g
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 14 Jun 2018 12:58:44 +0300
parents 4e4d54135baf
children d53bdee5ffa5
line wrap: on
line diff
--- a/tools/gfxconv.c	Thu Jun 14 12:42:29 2018 +0300
+++ b/tools/gfxconv.c	Thu Jun 14 12:58:44 2018 +0300
@@ -1088,10 +1088,10 @@
         char *str;
         switch (format)
         {
-            case DM_IFMT_PALETTE : str = "Indexed 8bpp"; break;
-            case DM_IFMT_RGB     : str = "24bit RGB"; break;
-            case DM_IFMT_RGBA    : str = "32bit RGBA"; break;
-            default              : str = "???"; break;
+            case DM_COLFMT_PALETTE : str = "Indexed 8bpp"; break;
+            case DM_COLFMT_RGB     : str = "24bit RGB"; break;
+            case DM_COLFMT_RGBA    : str = "32bit RGBA"; break;
+            default                : str = "???"; break;
         }
         dmMsg(2, "%s output.\n", str);
     }
@@ -1153,20 +1153,20 @@
     {
 #ifdef DM_USE_LIBPNG
         case DM_IMGFMT_PNG:
-            spec->format = spec->paletted ? DM_IFMT_PALETTE : DM_IFMT_RGBA;
+            spec->format = spec->paletted ? DM_COLFMT_PALETTE : DM_COLFMT_RGBA;
             dmOutputImageBitFormat(spec->format, info);
             res = dmWritePNGImage(filename, image, spec);
             break;
 #endif
 
         case DM_IMGFMT_PPM:
-            spec->format = DM_IFMT_RGB;
+            spec->format = DM_COLFMT_RGB;
             dmOutputImageBitFormat(spec->format, info);
             res = dmWritePPMImage(filename, image, spec);
             break;
 
         case DM_IMGFMT_PCX:
-            spec->format = spec->paletted ? DM_IFMT_PALETTE : DM_IFMT_RGB;
+            spec->format = spec->paletted ? DM_COLFMT_PALETTE : DM_COLFMT_RGB;
             dmOutputImageBitFormat(spec->format, info);
             res = dmWritePCXImage(filename, image, spec);
             break;
@@ -1509,7 +1509,7 @@
                 goto error;
             }
 
-            outImage = dmImageAlloc(outWidthPX, outHeight, DM_IFMT_PALETTE, -1);
+            outImage = dmImageAlloc(outWidthPX, outHeight, DM_COLFMT_PALETTE, -1);
             dmMsg(1, "Outputting sequence of %d images @ %d x %d -> %d x %d.\n",
                 optItemCount,
                 outImage->width, outImage->height,
@@ -1529,7 +1529,7 @@
             if (optItemCount % optPlanedWidth)
                 outIHeight++;
 
-            outImage = dmImageAlloc(outWidthPX * outIWidth, outIHeight * outHeight, DM_IFMT_PALETTE, -1);
+            outImage = dmImageAlloc(outWidthPX * outIWidth, outIHeight * outHeight, DM_COLFMT_PALETTE, -1);
         }
 
         dmSetDefaultC64Palette(outImage);