CODECS: memcpy static palette

HappySeaFox · Nov 16, 2023 · a0378b4 · a0378b4
1 parent 3e0e63c
commit a0378b4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 29 deletions.
diff --git a/src/sail-codecs/pcx/helpers.c b/src/sail-codecs/pcx/helpers.c
@@ -34,6 +34,8 @@
 /* 256-color palette signature. */
 static const unsigned SAIL_PCX_PALETTE_SIGNATURE = 0x0C;
 
+static const unsigned char SAIL_PCX_MONO_PALETTE[] = { 0, 0, 0, 255, 255, 255 };
+
 sail_status_t pcx_private_read_header(struct sail_io *io, struct SailPcxHeader *header) {
 
     SAIL_TRY(io->strict_read(io->stream, &header->id,             sizeof(header->id)));
@@ -93,16 +95,7 @@ sail_status_t pcx_private_build_palette(enum SailPixelFormat pixel_format, struc
     switch (pixel_format) {
         case SAIL_PIXEL_FORMAT_BPP1_INDEXED: {
             SAIL_TRY(sail_alloc_palette_for_data(SAIL_PIXEL_FORMAT_BPP24_RGB, 2, palette));
-
-            unsigned char *palette_data = (*palette)->data;
-
-            *palette_data++ = 0;
-            *palette_data++ = 0;
-            *palette_data++ = 0;
-            *palette_data++ = 255;
-            *palette_data++ = 255;
-            *palette_data++ = 255;
-
+            memcpy((*palette)->data, SAIL_PCX_MONO_PALETTE, 6);
             break;
         }
         case SAIL_PIXEL_FORMAT_BPP4_INDEXED: {

diff --git a/src/sail-codecs/psd/psd.c b/src/sail-codecs/psd/psd.c
@@ -26,13 +26,16 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <sail-common/sail-common.h>
 
 #include "helpers.h"
 
 static const unsigned SAIL_PSD_MAGIC = 0x38425053;
 
+static const unsigned char SAIL_PSD_MONO_PALETTE[] = { 255, 255, 255, 0, 0, 0 };
+
 /*
  * Codec-specific state.
  */
@@ -172,16 +175,7 @@ SAIL_EXPORT sail_status_t sail_codec_load_seek_next_frame_v8_psd(void *state, st
         }
     } else if (mode == SAIL_PSD_MODE_BITMAP) {
         SAIL_TRY(sail_alloc_palette_for_data(SAIL_PIXEL_FORMAT_BPP24_RGB, 2, &psd_state->palette));
-
-        unsigned char *palette_data = psd_state->palette->data;
-
-        *palette_data++ = 255;
-        *palette_data++ = 255;
-        *palette_data++ = 255;
-
-        *palette_data++ = 0;
-        *palette_data++ = 0;
-        *palette_data++ = 0;
+        memcpy(psd_state->palette->data, SAIL_PSD_MONO_PALETTE, 6);
     }
 
     /* Skip the image resources. */

diff --git a/src/sail-codecs/xbm/xbm.c b/src/sail-codecs/xbm/xbm.c
@@ -32,6 +32,8 @@
 
 #include "helpers.h"
 
+static const unsigned char SAIL_XBM_MONO_PALETTE[] = { 255, 255, 255, 0, 0, 0 };
+
 enum SailXbmVersion {
     SAIL_XBM_VERSION_10 = 10,
     SAIL_XBM_VERSION_11 = 11,
@@ -176,15 +178,7 @@ SAIL_EXPORT sail_status_t sail_codec_load_seek_next_frame_v8_xbm(void *state, st
     SAIL_TRY_OR_CLEANUP(sail_alloc_palette_for_data(SAIL_PIXEL_FORMAT_BPP24_RGB, 2, &image_local->palette),
                         /* cleanup */ sail_destroy_image(image_local));
 
-    unsigned char *palette = image_local->palette->data;
-
-    *palette++ = 255;
-    *palette++ = 255;
-    *palette++ = 255;
-
-    *palette++ = 0;
-    *palette++ = 0;
-    *palette++ = 0;
+    memcpy(image_local->palette->data, SAIL_XBM_MONO_PALETTE, 6);
 
     *image = image_local;