dmlib: gfxconv.c comparison

comparison gfxconv.c @ 479:b768bfb0b364

Improve color remapping, add option for removing unused colors from the final output palette.

author	Matti Hamalainen <ccr@tnsp.org>
date	Wed, 07 Nov 2012 04:09:00 +0200
parents	7c7a57590236
children	d7fc7e011c90

comparison

equal deleted inserted replaced

-:7c7a57590236
+:b768bfb0b364
 optPlanedWidth = 1,
 optForcedFormat = -1;
 int     optInSkip = 0;
 BOOL    optInMulticolor = FALSE,
 optSequential = FALSE,
-optRemapColors = FALSE;
+optRemapColors = FALSE,
+optRemapRemove = FALSE;
 int     optNRemapTable = 0;
 DMMapValue optRemapTable[DM_MAX_COLORS];
 int     optColors[C64_MAX_COLORS];
 DMImageSpec optSpec =
 { 11, 'w', "width",        "Item width (number of items per row, min 1)", OPT_ARGREQ },
 { 12, 'P', "paletted",     "Use indexed/paletted output (png, pcx output only)", OPT_NONE },
 { 13, 'B', "bplanes",      "Bits per pixel OR # of bitplanes (certain output formats)", OPT_ARGREQ },
 { 14, 'I', "interleave",   "Interleave scanlines (default: output whole planes)", OPT_NONE },
 { 16, 'R', "remap",        "Remap output image colors (-R <(#RRGGBB|index):index>[,<..>] | -R @map.txt)", OPT_ARGREQ },
+{ 18, 'r', "remap-remove", "Remove unused colors from remapped palette (requires -R)\n", OPT_NONE },
 };
 static const int optListN = sizeof(optList) / sizeof(optList[0]);
 }
 optRemapColors = TRUE;
 break;
+case 18:
+optRemapRemove = TRUE;
+break;
 default:
 dmError("Unknown option '%s'.\n", currArg);
 return FALSE;
 }
 int dmRemapImageColors(DMImage *image)
 {
 dmMsg(1, "Remapping %d output image colors.\n", optNRemapTable);
 DMColor *npal = dmCalloc(image->ncolors, sizeof(DMColor));
-int *dpal = dmMalloc(image->ncolors * sizeof(int));
+int  *mapping = dmMalloc(image->ncolors * sizeof(int));
-BOOL *spal = dmCalloc(image->ncolors, sizeof(BOOL));
+BOOL *mapped  = dmMalloc(image->ncolors * sizeof(BOOL));
-int index, xc, yc, nncolors = image->ncolors;
+BOOL *used    = dmMalloc(image->ncolors * sizeof(BOOL));
+int n, index, xc, yc, ncolors = image->ncolors;
-if (npal == NULL || spal == NULL || dpal == NULL)
-{
+if (npal == NULL || mapping == NULL || mapped == NULL || used == NULL)
-dmError("Could not allocate memory for remapped palette.\n");
+{
+dmError("Could not allocate memory for reused palette.\n");
 return DMERR_MALLOC;
 }
 for (index = 0; index < image->ncolors; index++)
-dpal[index] = -1;
+{
+mapping[index] = -1;
-// Find and mark mapped colors
+used[index] = mapped[index] = FALSE;
+}
+// Find used colors
+dmMsg(2, "Scanning image for used colors...\n");
+for (yc = 0; yc < image->height; yc++)
+{
+Uint8 *dp = image->data + image->pitch * yc;
+for (xc = 0; xc < image->width; xc++)
+{
+Uint8 col = dp[xc];
+if (col < image->ncolors)
+used[col] = TRUE;
+}
+}
+// Match and mark mapped colors
 for (index = 0; index < optNRemapTable; index++)
 {
 DMMapValue *map = &optRemapTable[index];
 if (map->triplet)
 {
 BOOL found = FALSE;
-int n;
 for (n = 0; n < image->ncolors; n++)
 {
 if (dmCompareColor(&(image->pal[n]), &(map->color), map->alpha))
 {
 dmMsg(3, "RGBA match #%02x%02x%02x%02x: %d -> %d\n",
 map->color.r, map->color.g, map->color.b, map->color.a,
 n,
 map->to);
-dpal[map->to] = n;
+if (used[n])
-spal[n] = TRUE;
+{
-found = TRUE;
+mapping[n] = map->to;
-//                    break;
+mapped[map->to] = TRUE;
+found = TRUE;
+}
 }
 }
 if (!found)
 {
 map->color.r, map->color.g, map->color.b, map->color.a);
 }
 }
 else
 {
-dmMsg(3, "Map index: %d -> %d\n",
+if (used[map->from])
-map->from, map->to);
+{
+dmMsg(3, "Map index: %d -> %d\n",
-dpal[map->to] = map->from;
+map->from, map->to);
-spal[map->from] = TRUE;
+mapping[map->from] = map->to;
+mapped[map->to] = TRUE;
+}
 }
 }
 // Fill in the rest
-dmMsg(3, "Placing non-mapped palette entries.\n");
+if (optRemapRemove)
+{
+dmMsg(2, "Removing unused colors.\n");
+for (index = 0; index < image->ncolors; index++)
+if (mapping[index] < 0 && used[index])
+{
+for (n = 0; n < image->ncolors; n++)
+if (!mapped[n])
+{
+mapping[index] = n;
+mapped[n] = TRUE;
+break;
+}
+}
+}
+else
+{
+for (index = 0; index < image->ncolors; index++)
+if (mapping[index] < 0)
+{
+for (n = 0; n < image->ncolors; n++)
+if (!mapped[n])
+{
+mapping[index] = n;
+mapped[n] = TRUE;
+break;
+}
+}
+}
+// Calculate final number of palette colors
+ncolors = 0;
 for (index = 0; index < image->ncolors; index++)
 {
-if (dpal[index] < 0)
+if (mapping[index] > ncolors)
-{
+ncolors = mapping[index] + 1;
-int src;
-for (src = 0; src < image->ncolors; src++)
-{
-if (!spal[src])
-{
-dpal[index] = src;
-spal[src] = TRUE;
-break;
-}
-}
-}
 }
 // Copy palette entries
-dmMsg(3, "Creating new palette.\n");
+for (index = 0; index < ncolors; index++)
-for (index = 0; index < image->ncolors; index++)
+{
-{
+if (mapping[index] >= 0)
-if (dpal[index] >= 0 && dpal[index] < image->ncolors)
+{
-{
+memcpy(&npal[index], &(image->pal[mapping[index]]), sizeof(DMColor));
-memcpy(&npal[index], &(image->pal[dpal[index]]), sizeof(DMColor));
+}
-nncolors = index;
+}
-}
-}
 // Remap image
-dmMsg(1, "Remapping image ...\n");
+dmMsg(1, "Remapping image to %d colors...\n", ncolors);
 for (yc = 0; yc < image->height; yc++)
 {
 Uint8 *dp = image->data + image->pitch * yc;
 for (xc = 0; xc < image->width; xc++)
 {
 Uint8 col = dp[xc];
-if (col < image->ncolors && dpal[col] >= 0 && dpal[col] < image->ncolors)
+if (col < image->ncolors && mapping[col] >= 0 && mapping[col] < image->ncolors)
-{
+dp[xc] = mapping[col];
-dp[xc] = dpal[col];
-}
 else
 dp[xc] = 0;
 }
 }
 // Set new palette, free memory
 dmFree(image->pal);
 image->pal = npal;
-image->ncolors = nncolors;
+image->ncolors = ncolors;
-dmFree(spal);
-dmFree(dpal);
+dmFree(mapping);
+dmFree(mapped);
+dmFree(used);
 return DMERR_OK;
 }
 int dmWriteImage(const char *filename, DMImage *image, DMImageSpec *spec, int iformat, BOOL info)

Mercurial > hg > dmlib

comparison gfxconv.c @ 479:b768bfb0b364