# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1352004035 -7200
# Node ID 2a4de5fe40037bdfea06d0f392e3079623c2863e
# Parent  b4ed5292d7bf0ae8b50b175babdba0feb29d4185
Improve loading of input images to use the list provided by libgfx.

diff -r b4ed5292d7bf -r 2a4de5fe4003 gfxconv.c
--- a/gfxconv.c	Sun Nov 04 03:32:00 2012 +0200
+++ b/gfxconv.c	Sun Nov 04 06:40:35 2012 +0200
@@ -926,7 +926,7 @@
 
         case FFMT_IMAGE:
             {
-                DMImage *outImage;
+                DMImage *outImage = NULL;
                 int res = DMERR_OK;
 
                 if (optOutFilename == NULL)
@@ -936,16 +936,11 @@
                 }
 
                 // Read input
-                switch (optInSubFormat)
-                {
-                    case IMGFMT_PCX: res = dmReadPCXImageFILE(inFile, &outImage); break;
-//                    case IMGFMT_PNG: res = dmReadPNGImageFILE(inFile, &outImage); break;
-//                    case IMGFMT_ARAW: res = dmReadARAWImageFILE(inFile, &outImage, optSpec.nplanes); break;
-                    default:
-                        dmError("Unsupported input image format for bitmap/image conversion.\n");
-                        break;
-                    
-                }
+                DMImageFormat *ifmt = &dmImageFormatList[optInSubFormat];
+                if (ifmt->readFILE != NULL)
+                    res = ifmt->readFILE(inFile, &outImage);
+                else
+                    dmError("Unsupported input image format for bitmap/image conversion.\n");
 
                 if (res != DMERR_OK || outImage == NULL)
                     break;