X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Frgbimage.c;h=c4fd11d470c9a06ea39cbf81eb647a4fe26b0698;hp=798a1043decc6c8badbf5370a9b9df49ba55c5f9;hb=6d7c97eb148bbc805f506a5d7453daafa6a18898;hpb=b4e128efc860c4416fe913abe97b190404e866dd

diff --git a/pctb/rgbimage.c b/pctb/rgbimage.c
index 798a104..c4fd11d 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) {
+  char *dbfile_name= masprintf("#%s-pixmap#.txt",which);
+  if (!dbfile_open(dbfile_name))
+    goto not_found;
 
 #define FGETSLINE (dbfile_getsline(result,MAXIMGIDENT,__FILE__,__LINE__))
 
@@ -86,7 +89,9 @@ static int identify(const RgbImage *base, Rect portion,
 	  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]);
+	  int px= portion.tl.x + x, py= portion.tl.y + y;
+	  diff |= px > portion.br.x || py > portion.br.y ||
+	          (c != RI_PIXEL(base,px,py)[i]);
 	}
       }
     }
@@ -95,13 +100,21 @@ 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));
@@ -119,6 +132,13 @@ static void fwrite_ppm(FILE *f, const RgbImage *base, Rect portion) {
 
 void identify_rgbimage(const RgbImage *base, Rect portion,
 		       char result[MAXIMGIDENT], const char *what) {
+  static int synced;
+
+  if (!synced) {
+    fetch_with_rsync("pixmap");
+    synced++;
+  }
+  
   for (;;) {
     int ok= identify(base, portion, result, what);
     if (ok) return;