Correct bugs in new AA table cell structure parsing

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

diff --git a/pctb/structure.h b/pctb/structure.h
index 3e30e28c65dca183412c7b77ded3a7797890c412..beadfed469a9476644ce4673d9b6cfa68e2fbf7f 100644 (file)
--- a/pctb/structure.h
+++ b/pctb/structure.h
@@ -34,7 +34,7 @@
 
 
 typedef struct {
-  unsigned long rgb; /* on screen */
+  Rgb rgb; /* on screen */
   char c; /* canonical */
 } CanonColourInfo;
 
@@ -45,7 +45,7 @@ CanonImage *alloc_canon_image(int w, int h);
 #define CANONICALISE_IMAGE(im,w,h, COMPUTE_RGB) do{            \
     /* compute_rgb should be a number of statements, or                \
      * a block, which assigns to                               \
-     *   unsigned long rgb;                                    \
+     *   Rgb rgb;                                              \
      * given the values of                                     \
      *   int x,y;                                              \
      * all of which are anamorphic.  Result is stored in im.   \
@@ -53,23 +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);                               \
-       fwrite(im->d + y*w, 1,w, debug);                        \
+       fwrite(im->d + y*(w), 1,(w), debug);                    \
        fputc('\n',debug);                                      \
       }                                                                \
     }                                                          \
@@ -79,7 +88,7 @@ CanonImage *alloc_canon_image(int w, int h);
 
 #define CANONIMG_ALSO_STORERGB(ri)             \
   do{                                          \
-    char *rip= RI_PIXEL((ri),x,y);             \
+    unsigned char *rip= RI_PIXEL((ri),x,y);    \
     rip[0]= rgb >> 16;                         \
     rip[1]= rgb >> 8;                          \
     rip[2]= rgb;                               \