Mercurial > hg > dmlib

changeset 1731:474055f25ab0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move dmDefaultC64Palette back to lib64gfx.c
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 08 Jun 2018 22:07:05 +0300
parents 881a3fc421d8
children 07111a60cd4e
files tools/lib64fmts.c tools/lib64gfx.c
diffstat 2 files changed, 22 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/tools/lib64fmts.c	Fri Jun 08 22:03:19 2018 +0300
+++ b/tools/lib64fmts.c	Fri Jun 08 22:07:05 2018 +0300
@@ -9,27 +9,6 @@
 #include "lib64gfx.h"
 
 
-// Based on Pepto's palette, stolen from VICE
-DMColor dmDefaultC64Palette[C64_NCOLORS] =
-{
-    { 0x00, 0x00, 0x00, 0xff },
-    { 0xFF, 0xFF, 0xFF, 0xff },
-    { 0x68, 0x37, 0x2B, 0xff },
-    { 0x70, 0xA4, 0xB2, 0xff },
-    { 0x6F, 0x3D, 0x86, 0xff },
-    { 0x58, 0x8D, 0x43, 0xff },
-    { 0x35, 0x28, 0x79, 0xff },
-    { 0xB8, 0xC7, 0x6F, 0xff },
-    { 0x6F, 0x4F, 0x25, 0xff },
-    { 0x43, 0x39, 0x00, 0xff },
-    { 0x9A, 0x67, 0x59, 0xff },
-    { 0x44, 0x44, 0x44, 0xff },
-    { 0x6C, 0x6C, 0x6C, 0xff },
-    { 0x9A, 0xD2, 0x84, 0xff },
-    { 0x6C, 0x5E, 0xB5, 0xff },
-    { 0x95, 0x95, 0x95, 0xff },
-};
-
 
 static int fmtProbeKoalaPaintPacked(const Uint8 *buf, const size_t len, const DMC64ImageFormat *fmt)
 {
--- a/tools/lib64gfx.c	Fri Jun 08 22:03:19 2018 +0300
+++ b/tools/lib64gfx.c	Fri Jun 08 22:07:05 2018 +0300
@@ -12,6 +12,28 @@
 #define BUF_SIZE_GROW      (4*1024)
 
 
+// Based on Pepto's palette, stolen from VICE
+DMColor dmDefaultC64Palette[C64_NCOLORS] =
+{
+    { 0x00, 0x00, 0x00, 0xff },
+    { 0xFF, 0xFF, 0xFF, 0xff },
+    { 0x68, 0x37, 0x2B, 0xff },
+    { 0x70, 0xA4, 0xB2, 0xff },
+    { 0x6F, 0x3D, 0x86, 0xff },
+    { 0x58, 0x8D, 0x43, 0xff },
+    { 0x35, 0x28, 0x79, 0xff },
+    { 0xB8, 0xC7, 0x6F, 0xff },
+    { 0x6F, 0x4F, 0x25, 0xff },
+    { 0x43, 0x39, 0x00, 0xff },
+    { 0x9A, 0x67, 0x59, 0xff },
+    { 0x44, 0x44, 0x44, 0xff },
+    { 0x6C, 0x6C, 0x6C, 0xff },
+    { 0x9A, 0xD2, 0x84, 0xff },
+    { 0x6C, 0x5E, 0xB5, 0xff },
+    { 0x95, 0x95, 0x95, 0xff },
+};
+
+
 char * dmC64GetImageTypeString(char *buf, const size_t len, const int type, const BOOL lng)
 {
     snprintf(buf, len,