Mercurial > hg > dmlib

comparison gfxconv.c @ 607:360b1ad83ed9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename things; Fix build by combining the conflicting rules.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 12 Apr 2013 11:21:37 +0300
parents d400e32b62d9
children
comparison
equal deleted inserted replaced
606:a0082ce261c8 607:360b1ad83ed9
1097 } 1097 }
1098 1098
1099 if (info) dmMsg(2, "%d bitplanes, %s interleave.\n", spec->nplanes, spec->interleave ? "with" : "without"); 1099 if (info) dmMsg(2, "%d bitplanes, %s interleave.\n", spec->nplanes, spec->interleave ? "with" : "without");
1100 return dmWriteRAWImage(filename, image, spec); 1100 return dmWriteRAWImage(filename, image, spec);
1101 } 1101 }
1102 break;
1102 1103
1103 default: 1104 default:
1104 return DMERR_INVALID_DATA; 1105 return DMERR_INVALID_DATA;
1105 } 1106 }
1106 } 1107 }
1439 dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE); 1440 dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
1440 } 1441 }
1441 1442
1442 dmImageFree(outImage); 1443 dmImageFree(outImage);
1443 } 1444 }
1445 else
1446 if (optOutFormat == FFMT_BITMAP)
1447 {
1448 if (optSequential)
1449 {
1450 dmError("Sequential output not supported for spr/char -> bitmap conversion.\n");
1451 goto error;
1452 }
1453 }
1444 1454
1445 dmFree(bufData); 1455 dmFree(bufData);
1446 return 0; 1456 return 0;
1447 1457
1448 error: 1458 error:
1614 break; 1624 break;
1615 1625
1616 1626
1617 case FFMT_BITMAP: 1627 case FFMT_BITMAP:
1618 res = dmWriteBitmap(optOutFilename, &cimage, optOutSubFormat, TRUE); 1628 res = dmWriteBitmap(optOutFilename, &cimage, optOutSubFormat, TRUE);
1629 break;
1630
1631 case FFMT_CHAR:
1632 case FFMT_SPRITE:
1633 res = dmWriteSpritesAndChars(optOutFilename, outImage, optOutFormat, optInMulticolor);
1619 break; 1634 break;
1620 1635
1621 default: 1636 default:
1622 dmError("Unsupported output format for bitmap/image conversion.\n"); 1637 dmError("Unsupported output format for bitmap/image conversion.\n");
1623 break; 1638 break;