Mercurial > hg > dmlib

diff gfxconv.c @ 557:1993cd341079

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust to conform to lib64gfx API changes.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 23 Nov 2012 18:37:47 +0200
parents 0e39e0bbb5ac
children d400e32b62d9
line wrap: on
line diff
--- a/gfxconv.c	Fri Nov 23 18:37:09 2012 +0200
+++ b/gfxconv.c	Fri Nov 23 18:37:47 2012 +0200
@@ -1585,21 +1585,7 @@
                 switch (optOutFormat)
                 {
                     case FFMT_IMAGE:
-                        if ((outImage = dmImageAlloc(C64_SCR_WIDTH, C64_SCR_HEIGHT)) == NULL)
-                        {
-                            dmError("Could not allocate output image surface %d x %d.\n",
-                                C64_SCR_WIDTH, C64_SCR_HEIGHT);
-                            goto error;
-                        }
-                        
-                        outImage->pal      = (DMColor *) &dmC64Palette;
-                        outImage->ncolors  = C64_NCOLORS;
-                        outImage->constpal = TRUE;
-                        
-                        if (cfmt->convertFrom != NULL)
-                            res = cfmt->convertFrom(outImage, &cimage);
-                        else
-                            res = dmC64ConvertGenericBMP2Image(outImage, &cimage);
+                        res = dmC64ConvertBMP2Image(&outImage, &cimage, cfmt, TRUE);
 
                         if (res != DMERR_OK || outImage == NULL)
                         {