Mercurial > hg > dmlib

changeset 465:ffd5e730d313

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust verbosity levels.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 04 Nov 2012 16:40:37 +0200
parents 358776103ceb
children 0bfa6a15bb46
files gfxconv.c libgfx.c
diffstat 2 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/gfxconv.c	Sun Nov 04 16:36:21 2012 +0200
+++ b/gfxconv.c	Sun Nov 04 16:40:37 2012 +0200
@@ -827,7 +827,7 @@
     if (optInFormat == FFMT_AUTO && optInFilename != NULL)
     {
         char *dext = strrchr(optInFilename, '.');
-        dmMsg(2, "Trying to determine file format by extension.\n");
+        dmMsg(4, "Trying to determine file format by extension.\n");
         if (dext)
         {
             dmGetFormatByExt(dext + 1, &optInFormat, &optInSubFormat);
@@ -883,7 +883,7 @@
     {
         DMImageFormat *ifmt = NULL;
         int index;
-        dmMsg(2, "Trying to probe image formats.\n");
+        dmMsg(4, "Trying to probe image formats.\n");
         if (dmImageProbeGeneric(dataBuf + optInSkip, dataSize - optInSkip, &ifmt, &index) > 0)
         {
             optInFormat = FFMT_IMAGE;
--- a/libgfx.c	Sun Nov 04 16:36:21 2012 +0200
+++ b/libgfx.c	Sun Nov 04 16:40:37 2012 +0200
@@ -410,7 +410,7 @@
         PNG_COMPRESSION_TYPE_DEFAULT,
         PNG_FILTER_TYPE_DEFAULT);
 
-    dmMsg(2, "PNG: %d x %d, depth=%d, type=%d\n",
+    dmMsg(3, "PNG: %d x %d, depth=%d, type=%d\n",
         img->width * spec->scale,
         img->height * spec->scale,
         8, fmt);
@@ -561,7 +561,7 @@
     }
 
     // Allocate image
-    dmMsg(2, "PNG: %d x %d, depth=%d, type=%d\n",
+    dmMsg(3, "PNG: %d x %d, depth=%d, type=%d\n",
         width, height, bit_depth, color_type);
 
     if ((*pimg = img = dmImageAlloc(width, height)) == NULL)
@@ -585,7 +585,7 @@
     {
         case PNG_COLOR_TYPE_GRAY:
             ncolors = 256;
-            dmMsg(2, "PNG: Generating %d color grayscale palette.\n", ncolors);
+            dmMsg(3, "PNG: Generating %d color grayscale palette.\n", ncolors);
 
             if (!dmImageAllocPalette(img, ncolors, -1))
             {
@@ -601,7 +601,7 @@
         
         case PNG_COLOR_TYPE_PALETTE:
             png_get_PLTE(png_ptr, info_ptr, &palette, &ncolors);
-            dmMsg(2, "PNG: Palette of %d colors found.\n", ncolors);            
+            dmMsg(3, "PNG: Palette of %d colors found.\n", ncolors);            
             if (ncolors <= 0)
                 goto error;
 
@@ -819,7 +819,7 @@
     if (res % 2) hdr.bpl++;
     hdr.bpl *= 2;
 
-    dmMsg(2, "PCX: paletted=%d, nplanes=%d, bpp=%d, bpl=%d\n",
+    dmMsg(3, "PCX: paletted=%d, nplanes=%d, bpp=%d, bpl=%d\n",
         spec->paletted, hdr.nplanes, hdr.bpp, hdr.bpl);
 
     pcx.bufLen       = hdr.bpl * 4;
@@ -880,7 +880,7 @@
     {
         int i;
         dm_fwrite_byte(pcx.fp, 0x0C);
-        dmMsg(2, "PCX: Writing palette of %d active entries.\n", img->ncolors);
+        dmMsg(3, "PCX: Writing palette of %d active entries.\n", img->ncolors);
 
         for (i = 0; i < img->ncolors; i++)
         {
@@ -1227,7 +1227,7 @@
 {
     if (chunk->size > used)
     {
-        dmMsg(3, "ILBM: Skipping %d bytes (%d of %d consumed)\n",
+        dmMsg(4, "ILBM: Skipping %d bytes (%d of %d consumed)\n",
             chunk->size - used, used, chunk->size);
         return fseeko(fp, chunk->size - used, SEEK_CUR) == 0;
     }
@@ -1335,7 +1335,7 @@
     if ((buf = dmMalloc(bufLen)) == NULL)
         return DMERR_MALLOC;
 
-    dmMsg(2, "ILBM: plane row size %d bytes.\n", bufLen);
+    dmMsg(3, "ILBM: plane row size %d bytes.\n", bufLen);
     
     // Decode the chunk
     for (yc = 0; yc < img->height; yc++)
@@ -1489,7 +1489,7 @@
                     dmError("ILBM: Error reading BMHD chunk.\n");
                     return DMERR_FREAD;
                 }
-                dmMsg(2, "ILBM: BMHD %d x %d @ %d, %d : nplanes=%d, comp=%d, mask=%d\n",
+                dmMsg(3, "ILBM: BMHD %d x %d @ %d, %d : nplanes=%d, comp=%d, mask=%d\n",
                     iff.bmhd.w, iff.bmhd.h, iff.bmhd.x, iff.bmhd.y,
                     iff.bmhd.nplanes, iff.bmhd.compression, iff.bmhd.masking);
                 
@@ -1520,11 +1520,11 @@
                     dmError("ILBM: CMAP chunk size not divisible by 3, possibly broken file.\n");
 
                 iff.ncolors = chunk.size / 3;
-                dmMsg(2, "ILBM: CMAP %d entries (%d bytes)\n",
+                dmMsg(3, "ILBM: CMAP %d entries (%d bytes)\n",
                     iff.ncolors, chunk.size, 1 << iff.bmhd.nplanes);
 
                 if (iff.bmhd.nplanes > 0 && iff.ncolors != 1 << iff.bmhd.nplanes)
-                    dmMsg(2, "ILBM: Expected %d entries in CMAP.\n", 1 << iff.bmhd.nplanes);
+                    dmMsg(3, "ILBM: Expected %d entries in CMAP.\n", 1 << iff.bmhd.nplanes);
                 
                 // Read palette
                 if (iff.ncolors > 0)
@@ -1558,7 +1558,7 @@
                     return DMERR_INVALID_DATA;
                 }
 
-                dmMsg(2, "ILBM: BODY chunk size %d bytes\n", chunk.size);
+                dmMsg(3, "ILBM: BODY chunk size %d bytes\n", chunk.size);
                 
                 // Decode the body
                 if (iff.planar)
@@ -1587,7 +1587,7 @@
                     return DMERR_FREAD;
                 }
                 
-                dmMsg(2, "ILBM: CAMG value 0x%08x\n", iff.camg);
+                dmMsg(3, "ILBM: CAMG value 0x%08x\n", iff.camg);
 
                 if ((iff.camg & IFF_CAMG_HAM))
                 {
@@ -1602,7 +1602,7 @@
             
             default:
                 {
-                    dmMsg(3, "Unknown chunk ID '%s', size %d\n",
+                    dmMsg(4, "Unknown chunk ID '%s', size %d\n",
                         dmGetIFFChunkID(&chunk), chunk.size);
                     
                     if (fseeko(fp, chunk.size, SEEK_CUR) != 0)