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))
+ 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__))
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) {
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");
+ 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) {
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", RI_PIXEL(base,x,y)[i]);
+ fprintf(f," %3d", (rgb>>(i*8)) & 0xff);
}
putc('\n',f);
}
static int synced;
if (!synced) {
- fetch_with_rsync("pixmap");
+ if (o_flags & ff_dict_fetch)
+ fetch_with_rsync_gz("pixmap");
synced++;
}
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;