rewrote pixmap::read to do more sanity checks

3 files changed, 7 insertions, 7 deletions

diff --git a/ue2/imgsynth2/test/input_yellow_man1_indexed8 b/ue2/imgsynth2/test/input_yellow_man1_indexed8
index 997cd4f..c0385c3 100644
--- a/ue2/imgsynth2/test/input_yellow_man1_indexed8
+++ b/ue2/imgsynth2/test/input_yellow_man1_indexed8
@@ -1,6 +1,6 @@
-#in: test/yellow_man1_xpm_in.xpm
-#out: test/yellow_man1_xpm_out.xpm
-#ref: test/yellow_man1_xpm_ref.xpm
+#in: test/yellow_man1_indexed8_in.xpm
+#out: test/yellow_man1_indexed8_out.xpm
+#ref: test/yellow_man1_indexed8_ref.xpm
 
 read(XPM, test/yellow_man1_indexed8_in.xpm)
 
diff --git a/ue2/imgsynth2/test/yellow_man1_indexed8_in.xpm b/ue2/imgsynth2/test/yellow_man1_indexed8_in.xpm
index 6e5fa2c..bd11b48 100644
--- a/ue2/imgsynth2/test/yellow_man1_indexed8_in.xpm
+++ b/ue2/imgsynth2/test/yellow_man1_indexed8_in.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char * yellow_man1_default_xpm[] = {
 "9 17 2 1 0 0 XPMEXT",
-".      c #000000",
+".      c #000000 g4 #000000",
 "#      c #FFF200",
 ".........",
 ".........",
@@ -19,7 +19,7 @@ static char * yellow_man1_default_xpm[] = {
 "...#.#...",
 "...#.#...",
 ".........",
-"........."
+".........",
 "XPMEXT ext1 data1",
 "XPMEXT ext2",
 "data2_1",
diff --git a/ue2/imgsynth2/test/yellow_man1_indexed8_ref.xpm b/ue2/imgsynth2/test/yellow_man1_indexed8_ref.xpm
index 57db73d..bd3beb4 100644
--- a/ue2/imgsynth2/test/yellow_man1_indexed8_ref.xpm
+++ b/ue2/imgsynth2/test/yellow_man1_indexed8_ref.xpm
@@ -1,6 +1,6 @@
 /* XPM */
-static char * yellow_man1_rgb24_ref_xpm[] = {
-"9 17 4 1",
+static char * yellow_man1_default_xpm[] = {
+"9 17 4 1 0 0 XPMEXT",
 ".      c #000000",
 "#      c #FFF200",
 "+      c #00FF00",