X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Frgbimage.c;h=dc9fa68996069fbc3518b5d445f6b1766622cf20;hb=b958771fa67513ba09630953ec91b9d21b3f42f9;hp=634ead1362a2bacb0870f891e769c623d1327e12;hpb=8360f12a6a457b73ebb18dbeedbb15e6ed91318b;p=ypp-sc-tools.db-live.git

diff --git a/pctb/rgbimage.c b/pctb/rgbimage.c
index 634ead1..dc9fa68 100644
--- 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, int (*opener)(const char *fn)) {
+  char *dbfile_name= masprintf("_%s-pixmap.txt",which);
+  if (!opener(dbfile_name))
+    goto not_found;
 
 #define FGETSLINE (dbfile_getsline(result,MAXIMGIDENT,__FILE__,__LINE__))
 
@@ -82,12 +85,16 @@ static int identify(const RgbImage *base, Rect portion,
     int x,y,i;
     for (y=0; y<h; y++) {
       for (x=0; x<w; x++) {
+	uint32_t rgb=0;
 	for (i=0; i<3; i++) {
 	  int c;
 	  dbassert( dbfile_scanf("%d",&c) == 1);
 	  dbassert(c>=0 && c<=255);
-	  diff |= (c != RI_PIXEL(base, portion.tl.x + x, portion.tl.y + y)[i]);
+	  rgb |= (Rgb)c << (i*8);
 	}
+	int px= portion.tl.x + x, py= portion.tl.y + y;
+	diff |= px > portion.br.x || py > portion.br.y ||
+	        rgb != ri_rgb(base,px,py);
       }
     }
     if (!diff) {
@@ -95,36 +102,86 @@ 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", dbfile_gzopen) ||
+         identify1(base,portion,result,what, "local",  dbfile_open);
+}
+
+void fwrite_ppmraw(FILE *f, const RgbImage *ri) {
+  int i;
+  fprintf(f,
+	  "P6\n"
+	  "%d %d\n"
+	  "255\n", ri->w, ri->h);
+  for (i=0; i < ri->w * ri->h; i++) {
+    Rgb rgb= ri->data[i];
+    fputc_unlocked(rgb >> 0,  f);
+    fputc_unlocked(rgb >> 8,  f);
+    fputc_unlocked(rgb >> 16, f);
+  }
+  sysassert(!ferror(f));
+  sysassert(!fflush(f));
+}
+
+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);
+      Rgb rgb= ri_rgb(base,x,y);
+      for (i=0; i<3; i++)
+	fprintf(f," %3d", (rgb>>(i*8)) & 0xff);
+    }
+    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) {
+    if (o_flags & ff_dict_fetch)
+      fetch_with_rsync_gz("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) {
   RgbImage *ri;
-  ri= mmalloc(sizeof(*ri) + w*h*3);
+  ri= mmalloc(sizeof(*ri) + w*h*sizeof(ri->data[0]));
   ri->w= w;
   ri->h= h;
   return ri;