Mercurial > hg > dmlib

comparison tools/gfxconv.c @ 1874:b386d339056f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 24 Jun 2018 21:13:36 +0300
parents 91705a2bc3a4
children 1af79412f249
comparison
equal deleted inserted replaced
1873:91705a2bc3a4 1874:b386d339056f
1880 } 1880 }
1881 1881
1882 switch (optOutFormat) 1882 switch (optOutFormat)
1883 { 1883 {
1884 case FFMT_IMAGE: 1884 case FFMT_IMAGE:
1885 case FFMT_CHAR:
1886 case FFMT_SPRITE:
1885 res = dmC64ConvertBMP2Image(&outImage, inC64Image, inC64Fmt); 1887 res = dmC64ConvertBMP2Image(&outImage, inC64Image, inC64Fmt);
1886 1888
1887 if (res != DMERR_OK || outImage == NULL) 1889 if (res != DMERR_OK || outImage == NULL)
1888 { 1890 {
1889 dmErrorMsg("Error in bitmap to image conversion.\n"); 1891 dmErrorMsg("Error in bitmap to image conversion.\n");
1890 goto error; 1892 goto error;
1891 } 1893 }
1892 1894
1893 res = dmWriteImage(optOutFilename, outImage, &optSpec, 1895 switch (optOutFormat)
1894 &dmImageFormatList[optOutSubFormat], TRUE); 1896 {
1897 case FFMT_IMAGE:
1898 res = dmWriteImage(optOutFilename, outImage, &optSpec,
1899 &dmImageFormatList[optOutSubFormat], TRUE);
1900 break;
1901
1902 case FFMT_CHAR:
1903 case FFMT_SPRITE:
1904 res = dmWriteSpritesAndChars(optOutFilename, outImage,
1905 optOutFormat, optInMulticolor);
1906 break;
1907 }
1895 break; 1908 break;
1896 1909
1897 case FFMT_BITMAP: 1910 case FFMT_BITMAP:
1898 if ((res = dmConvertC64Bitmap(&outC64Image, inC64Image, 1911 if ((res = dmConvertC64Bitmap(&outC64Image, inC64Image,
1899 &dmC64ImageFormats[optOutSubFormat], inC64Fmt)) != DMERR_OK) 1912 &dmC64ImageFormats[optOutSubFormat], inC64Fmt)) != DMERR_OK)
1907 dmPrint(0, "OUTPUT:\n"); dmC64ImageDump(stderr, outC64Image, &dmC64ImageFormats[optOutSubFormat], " "); 1920 dmPrint(0, "OUTPUT:\n"); dmC64ImageDump(stderr, outC64Image, &dmC64ImageFormats[optOutSubFormat], " ");
1908 } 1921 }
1909 res = dmWriteBitmap(optOutFilename, outC64Image, &dmC64ImageFormats[optOutSubFormat]); 1922 res = dmWriteBitmap(optOutFilename, outC64Image, &dmC64ImageFormats[optOutSubFormat]);
1910 break; 1923 break;
1911 1924
1912 case FFMT_CHAR:
1913 case FFMT_SPRITE:
1914 res = dmC64ConvertBMP2Image(&outImage, inC64Image, inC64Fmt);
1915
1916 if (res != DMERR_OK || outImage == NULL)
1917 {
1918 dmErrorMsg("Error in bitmap to template image conversion.\n");
1919 goto error;
1920 }
1921
1922 res = dmWriteSpritesAndChars(optOutFilename, outImage, optOutFormat, optInMulticolor);
1923 break;
1924
1925 default: 1925 default:
1926 dmErrorMsg("Unsupported output format for bitmap/image conversion.\n"); 1926 dmErrorMsg("Unsupported output format for bitmap conversion.\n");
1927 break; 1927 break;
1928 } 1928 }
1929 1929
1930 dmImageFree(outImage); 1930 dmImageFree(outImage);
1931 } 1931 }
1952 1952
1953 // Read input 1953 // Read input
1954 if (ifmt->readFILE != NULL) 1954 if (ifmt->readFILE != NULL)
1955 res = ifmt->readFILE(fp, &inImage); 1955 res = ifmt->readFILE(fp, &inImage);
1956 else 1956 else
1957 dmErrorMsg("Unsupported input image format for bitmap/image conversion.\n"); 1957 dmErrorMsg("Unsupported input image format for image conversion.\n");
1958 1958
1959 dmf_close(fp); 1959 dmf_close(fp);
1960 1960
1961 if (res != DMERR_OK || inImage == NULL) 1961 if (res != DMERR_OK || inImage == NULL)
1962 break; 1962 goto error;
1963 1963
1964 switch (optOutFormat) 1964 switch (optOutFormat)
1965 { 1965 {
1966 case FFMT_IMAGE: 1966 case FFMT_IMAGE:
1967 res = dmWriteImage(optOutFilename, inImage, &optSpec, 1967 res = dmWriteImage(optOutFilename, inImage, &optSpec,
1972 case FFMT_SPRITE: 1972 case FFMT_SPRITE:
1973 res = dmWriteSpritesAndChars(optOutFilename, inImage, optOutFormat, optInMulticolor); 1973 res = dmWriteSpritesAndChars(optOutFilename, inImage, optOutFormat, optInMulticolor);
1974 break; 1974 break;
1975 1975
1976 default: 1976 default:
1977 dmErrorMsg("Unsupported output format for bitmap/image conversion.\n"); 1977 dmErrorMsg("Unsupported output format for image conversion.\n");
1978 break; 1978 break;
1979 } 1979 }
1980 1980
1981 if (res != DMERR_OK) 1981 if (res != DMERR_OK)
1982 { 1982 {