Much faster

[ypp-sc-tools.db-test.git] / pctb / convert.c

diff --git a/pctb/convert.c b/pctb/convert.c
index 546ac6e4864cefd5b34fe6ce40f96145382358e4..4784c653994e8e4bd0c675389075cca391b23cf4 100644 (file)
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -1,13 +1,7 @@
 
 #include "ocr.h"
 
-typedef struct {
-  unsigned long rgb; /* on screen */
-  char c; /* canonical */
-} CanonColourInfo;
-
-static int height, width;
-static char *image;
+static CanonImage *cim;
 
 void debug_flush(void) {
   eassert(!fflush(debug));
@@ -23,7 +17,7 @@ typedef struct { /* both inclusive */
   Point br;
 } Rect;
 
-static inline char get(int x, int y) { return image[y * width + x]; }
+static inline char get(int x, int y) { return cim->d[y * cim->w + x]; }
 static inline char get_p(Point p) { return get(p.x,p.y); }
 
 
@@ -39,7 +33,7 @@ static int colrightx[INTERESTING_COLUMNS];
 static int text_h;
 static OcrReader *rd;
 
-static const CanonColourInfo canoncolourinfos[]= {
+const CanonColourInfo canoncolourinfos[]= {
   { 0x475A5E, '*' }, /* edge */
   { 0x2C5F7A, '*' }, /* edge just under box heading shadow */
   { 0x7D9094, '+' }, /* interbox */
@@ -93,7 +87,7 @@ static void debug_rect(const char *what, int whati, Rect rr) {
   w= rr.br.x - rr.tl.x + 1;
   for (y=rr.tl.y; y<=rr.br.y; y++) {
     fprintf(debug, "%4d%*s|", y, rr.tl.x,"");
-    r= fwrite(image + y*width + rr.tl.x, 1, w, debug);
+    r= fwrite(cim->d + y*cim->w + rr.tl.x, 1, w, debug);
     eassert(r==w);
     fputc('|',debug);
     fputc('\n',debug);
@@ -116,7 +110,7 @@ static void debug_rect(const char *what, int whati, Rect rr) {
   } while(0)
 
 static void find_structure(void) {
-  Rect whole = { {0,0}, {width-1,height-1} };
+  Rect whole = { {0,0}, {cim->w-1,cim->h-1} };
 
   WALK_UNTIL_MUST(mainr.tl, x,-1, whole.tl.x, '*');
   WALK_UNTIL_MUST(mainr.tl, y,-1, whole.tl.y, '*');
@@ -163,7 +157,7 @@ static void find_structure(void) {
   int xscaleunit, y,x;
   for (y=0, xscaleunit=1; y<4; y++, xscaleunit*=10) {
     fprintf(debug,"     ");
-    for (x=0; x<=width; x++) {
+    for (x=0; x<=cim->w; x++) {
       if (x % xscaleunit) fputc(' ',debug);
       else fprintf(debug,"%d",(x / xscaleunit)%10);
     }
@@ -222,42 +216,38 @@ static void find_table_entry(Rect commod, int colno, Rect *cellr) {
   require_rectangle_r(*cellr, " o");
 }
 
-static void load_image_and_canonify(void) {
+CanonImage *alloc_canon_image(int w, int h) {
+  CanonImage *im= malloc(sizeof(CanonImage) + w*h);
+  eassert(im);
+  im->w= w;
+  im->h= h;
+  memset(im->d,'?',w*h);
+  return im;
+}
+
+CanonImage *file_read_image(FILE *f) {
   struct pam inpam;
-  unsigned char rgb[3];
-  int x,y,r;
-  const CanonColourInfo *cci;
+  unsigned char rgb_buf[3];
+  CanonImage *im;
 
-  pnm_readpaminit(stdin, &inpam, sizeof(inpam));
-  height= inpam.height;
-  width= inpam.width;
+  pnm_readpaminit(f, &inpam, sizeof(inpam));
   eassert(inpam.maxval == 255);
   eassert(inpam.bytes_per_sample == 1);
 
-  image= malloc(width*height);
-  eassert(image);
-  memset(image,'?',width*height);
-
-  for (y=0; y<height; y++) {
-    for (x=0; x<width; x++) {
-      r= fread(&rgb,1,3,stdin);  eassert(r==3);
-      unsigned long rgb_l=
-       ((unsigned long)rgb[0]<<16) |
-       ((unsigned long)rgb[1]<<8) |
-                      (rgb[2]);
-      for (cci=canoncolourinfos; cci->c; cci++)
-       if (cci->rgb == rgb_l) {
-         image[y*width + x]= cci->c;
-         break;
-       }
-    }
-#ifdef DEBUG_RECTANGLES
-    fprintf(debug, "%4d ",y);
-    r= fwrite(image + y*width, 1,width, debug);  eassert(r==width);
-    fputc('\n',debug);
-#endif
-  }
-  debug_flush();
+  CANONICALISE_IMAGE(im, inpam.width, inpam.height, {
+    r= fread(&rgb_buf,1,3,f);  eassert(r==3);
+
+    rgb=
+       ((unsigned long)rgb_buf[0]<<16) |
+       ((unsigned long)rgb_buf[1]<<8) |
+                      (rgb_buf[2]);
+  });
+
+  return im;
+}
+
+static void load_image_and_canonify(void) {
+  cim= file_read_image(stdin);
 }
 
 static void ocr_rectangle(Rect r, const OcrCellType ct) {
@@ -288,7 +278,7 @@ static void ocr_rectangle(Rect r, const OcrCellType ct) {
   eassert(!fflush(stdout));
 }
 
-int main(void) {
+int main_test(void) {
   Rect thisr, entryr;
   int tryrect, colno;
 
@@ -296,7 +286,7 @@ int main(void) {
   find_structure();
   rd= ocr_init(text_h);
 
-  for (tryrect= +height; tryrect >= -height; tryrect--) {
+  for (tryrect= +cim->h; tryrect >= -cim->h; tryrect--) {
     find_commodity(tryrect, &thisr);
     if (thisr.tl.x < 0)
       continue;