Merge ijackson@chiark:/home/ijackson/things/ypp-sc-tools.pctb-dict-test

[ypp-sc-tools.main.git] / pctb / rgbimage.c

diff --git a/pctb/rgbimage.c b/pctb/rgbimage.c
index 634ead1362a2bacb0870f891e769c623d1327e12..d0ba6b797442ef7e7b5c64f6d6d1f557c0c9cafd 100644 (file)
--- a/pctb/rgbimage.c
+++ b/pctb/rgbimage.c
@@ -48,9 +48,12 @@
 
 #include "convert.h"
 
-static int identify(const RgbImage *base, Rect portion,
-                   char result[MAXIMGIDENT], const char *what) {
-  sysassert( dbfile_open("pixmaps.txt") );
+static int identify1(const RgbImage *base, Rect portion,
+                   char result[MAXIMGIDENT], const char *what,
+                   const char *which) {
+  char *dbfile_name= masprintf("#%s-pixmap#.txt",which);
+  if (!dbfile_open(dbfile_name))
+    goto not_found;
 
 #define FGETSLINE (dbfile_getsline(result,MAXIMGIDENT,__FILE__,__LINE__))
 
@@ -95,31 +98,63 @@ static int identify(const RgbImage *base, Rect portion,
       goto found;
     }
   }
+ not_found:
   result[0]= 0;
 
-found:
+ found:
   dbfile_close();
+  free(dbfile_name);
   return !!result[0];
 }
- 
+
+static int identify(const RgbImage *base, Rect portion,
+                   char result[MAXIMGIDENT], const char *what) {
+  return identify1(base,portion,result,what, "master") ||
+         identify1(base,portion,result,what, "local");
+}
+
+static void fwrite_ppm(FILE *f, const RgbImage *base, Rect portion) {
+  int x,y,i;
+  fprintf(f,"P3\n%d %d\n255\n", RECT_W(portion), RECT_H(portion));
+  for (y=portion.tl.y; y<=portion.br.y; y++) {
+    for (x=portion.tl.x; x<=portion.br.x; x++) {
+      putc(' ',f);
+      for (i=0; i<3; i++)
+       fprintf(f," %3d", RI_PIXEL(base,x,y)[i]);
+    }
+    putc('\n',f);
+  }
+  sysassert(!ferror(f));
+  sysassert(!fflush(f));
+}
+
 void identify_rgbimage(const RgbImage *base, Rect portion,
                       char result[MAXIMGIDENT], const char *what) {
-  int ok= identify(base, portion, result, what);
-  if (ok) return;
+  static int synced;
 
-  if (DEBUGP(pixmap)) {
-    int x,y,i;
-    fprintf(stderr,"P3\n%d %d\n255\n", RECT_W(portion), RECT_H(portion));
-    for (y=portion.tl.y; y<=portion.br.y; y++) {
-      for (x=portion.tl.x; x<=portion.br.x; x++) {
-       putc(' ',stderr);
-       for (i=0; i<3; i++)
-         fprintf(stderr," %3d", RI_PIXEL(base,x,y)[i]);
-      }
-      putc('\n',stderr);
-    }
+  if (!synced) {
+    fetch_with_rsync("pixmap");
+    synced++;
+  }
+  
+  for (;;) {
+    int ok= identify(base, portion, result, what);
+    if (ok) return;
+    
+    if (DEBUGP(pixmap))
+      fwrite_ppm(stderr,base,portion);
+
+    FILE *resolver= resolve_start();
+    if (!resolver)
+       fatal("Image recognition failed - unrecognised island.\n"
+             "See FIXME.FIXME\n");
+
+    fprintf(resolver, "pixmap\n" "%s\n", what);
+    fwrite_ppm(resolver, base, portion);
+    putc('\n',resolver);
+
+    resolve_finish();
   }
-  fatal("Unrecognised pixmap for %s.", what);
 }
 
 RgbImage *alloc_rgb_image(int w, int h) {