Store full-colour image with every screenshot

[ypp-sc-tools.db-test.git] / pctb / structure.h

diff --git a/pctb/structure.h b/pctb/structure.h
index c6a8c9a9280a909a3dd296df2ad39551f93b1b01..f3fbb72ed2d157ea01a3b103e2d2854544bb2f85 100644 (file)
--- a/pctb/structure.h
+++ b/pctb/structure.h
@@ -1,3 +1,31 @@
+/*
+ * Image canonicalisation function for use by callers feeding
+ *  images into structure.c's routines.
+ */
+/*
+ *  This is part of ypp-sc-tools, a set of third-party tools for assisting
+ *  players of Yohoho Puzzle Pirates.
+ * 
+ *  Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * 
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ *  Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+ *  are used without permission.  This program is not endorsed or
+ *  sponsored by Three Rings.
+ */
+
 #ifndef STRUCTURE_H
 #define STRUCTURE_H
 
@@ -25,24 +53,32 @@ CanonImage *alloc_canon_image(int w, int h);
      * each pixel in reading order.                            \
      */                                                                \
     (im)= alloc_canon_image((w), (h));                         \
+    (im)->rgb= alloc_rgb_image((w), (h));                      \
                                                                \
     int x,y;                                                   \
+    unsigned long last_rgb= ~0UL;                              \
+    int last_c= -1;                                            \
     for (y=0; y<(h); y++) {                                    \
       for (x=0; x<(w); x++) {                                  \
         const CanonColourInfo *cci;                            \
         unsigned long rgb;                                     \
        COMPUTE_RGB;                                            \
-       for (cci=canoncolourinfos; cci->c; cci++) {             \
-         if (cci->rgb == rgb) {                                \
-           (im)->d[y*(w) + x]= cci->c;                         \
-           break;                                              \
+        CANONIMG_ALSO_STORERGB((im)->rgb);                     \
+       if (rgb == last_rgb) {                                  \
+         (im)->d[y*(w) + x]= last_c;                           \
+       } else {                                                \
+         for (cci=canoncolourinfos; cci->c; cci++) {           \
+           if (cci->rgb == rgb) {                              \
+             last_rgb= rgb;                                    \
+             (im)->d[y*(w) + x]= last_c= cci->c;               \
+             break;                                            \
+           }                                                   \
          }                                                     \
        }                                                       \
       }                                                                \
       if (DEBUGP(rect)) {                                      \
        fprintf(debug, "%4d ",y);                               \
-       int r= fwrite(im->d + y*w, 1,w, debug);                 \
-       eassert(r==w);                                          \
+       fwrite(im->d + y*(w), 1,(w), debug);                    \
        fputc('\n',debug);                                      \
       }                                                                \
     }                                                          \
@@ -50,4 +86,13 @@ CanonImage *alloc_canon_image(int w, int h);
   }while(0)
 
 
+#define CANONIMG_ALSO_STORERGB(ri)             \
+  do{                                          \
+    unsigned char *rip= RI_PIXEL((ri),x,y);    \
+    rip[0]= rgb >> 16;                         \
+    rip[1]= rgb >> 8;                          \
+    rip[2]= rgb;                               \
+  }while(0)
+
+
 #endif /*STRUCTURE_H*/