CanonColourInfoBlues *blues= greens->green2[g];
if (!blues) {
blues= greens->green2[g]= mmalloc(sizeof(*blues));
- memset(blues, '?', sizeof(blues));
+ memset(blues, '?', sizeof(*blues));
}
blues->blue2[b]= cci->c;
" * YPP client is showing commodity listing screen\n"
" * YPP client window is on top (we try to raise it but your window\n"
" manager might have prevented that from succeeding)\n"
- " * Your X display is 24bpp (NB some VNC servers use 16bpp by default)\n"
"\n"
"If all of these are true, please report this as a fault.\n\n"
"Technical details:"
#define MRGB(v) fprintf(stderr," %s=%06lx", #v,(v))
#define MC(v) fprintf(stderr," %s='%c'", #v,(v))
#define MS(v) fprintf(stderr," %s=\"%s\"", #v,(v))
-#define MF(v) fprintf(stderr," %s=\"%f\"", #v,(v))
+#define MF(v) fprintf(stderr," %s=%f", #v,(v))
#define MSB(v) fprintf(stderr," %s", (v))
#define MR(v) fprintf(stderr," %s=%d,%d..%d,%d",\
#v,(v).tl.x,(v).tl.y,(v).br.x,(v).br.y)
progress_log("read %d screenshots.",npages);
}
+static double find_aa_density(const RgbImage *ri, Point p, long background,
+ long foreground, int fg_extra) {
+ Rgb here= ri_rgb(ri, p.x, p.y);
+
+ double alpha[3], alpha_mean=0;
+ int i;
+ for (i=0; i<3; i++) {
+ unsigned char here_chan= here >> (i*8);
+ unsigned char bg_chan= background >> (i*8);
+ unsigned char fg_chan= foreground >> (i*8);
+ double alpha_chan=
+ ((double)here_chan - (double)bg_chan) /
+ ((fg_chan + fg_extra) - (double)bg_chan);
+ alpha[i]= alpha_chan;
+ alpha_mean += alpha_chan * (1/3.0);
+ }
+
+ double thresh= 1.5/AAMAXVAL;
+ double alpha_min= alpha_mean - thresh;
+ double alpha_max= alpha_mean + thresh;
+ for (i=0; i<3; i++)
+ MUST( alpha_min <= alpha[i] && alpha[i] <= alpha_max,
+ MP(p);
+ MRGB(here);MRGB(background);MRGB(foreground);MI(fg_extra);
+ MF(alpha_min); MI(i);MF(alpha[i]);MF(alpha_max) );
+
+ if ( -1e-5 < alpha_mean && alpha_mean <= 0.0 ) alpha_mean= 0.0;
+ if (1.0 <= alpha_mean && alpha_mean <= 1.0+1e-5) alpha_mean= 1.0;
+
+ MUST( 0 <= alpha_mean &&
+ (fg_extra ? (alpha_mean < 0.999) : (alpha_mean <= 1.0)),
+ MP(p);
+ MRGB(here);MRGB(background);MRGB(foreground);MI(fg_extra);
+ MF(alpha_mean); MF(alpha[0]);MF(alpha[1]);MF(alpha[2]); );
+
+ return alpha_mean;
+}
+
static void find_commodity(int offset, Rect *rr) {
/* rr->tl.x==-1 if offset out of range */
rr->tl.y= commbasey - offset*comminty;
const RgbImage *ri= cim->rgb;
- Rgb background= ri_rgb(ri, cell->br.x, cell->br.y);
+ Rgb background;
+ unsigned char chanbg[3];
long bg_count=0, light_count=0, dark_count=0;
Point p;
+
+ background= ri_rgb(ri, cell->br.x, cell->br.y);
+ memcpy(chanbg, RI_PIXEL(ri, cell->br.x, cell->br.y), 3);
+
FOR_P_RECT(p,*cell) {
- Rgb here= ri_rgb(ri, p.x, p.y);
- if (here == background) bg_count++;
- else if (here < background) dark_count++;
- else if (here > background) light_count++;
+ const unsigned char *here_pixel= RI_PIXEL(ri, p.x, p.y);
+ int i;
+ for (i=0; i<3; i++) {
+ unsigned here= here_pixel[i];
+ if (here == chanbg[i]) bg_count++;
+ else if (here < chanbg[i]) dark_count += (chanbg[i] - here)/4 + 1;
+ else if (here > chanbg[i]) light_count += (here - chanbg[i])/4 + 1;
+ }
}
- long total_count= RECT_W(*cell) * RECT_H(*cell);
+ long total_count= RECT_W(*cell) * RECT_H(*cell) * 3;
+
MUST( bg_count > total_count / 2,
MR(*cell);MIL(total_count);MIL(bg_count);
MIL(light_count);MIL(dark_count) );
+
if (bg_count == total_count)
return;
- MUST( !!dark_count != !!light_count,
- MR(*cell);MIL(total_count);MIL(bg_count);
- MIL(light_count);MIL(dark_count) );
-
- debugf("TABLEENTRY col=%d %d,%d..%d,%d bg=%ld light=%ld dark=%ld\n",
- colno, cell->tl.x,cell->tl.y, cell->br.x,cell->br.y,
- bg_count, light_count, dark_count);
-
Rgb foreground;
double fg_extra;
- if (light_count) {
+
+ if (light_count/16 > dark_count) {
foreground= 0xffffffU;
fg_extra= +1;
- } else {
+ } else if (dark_count/16 > light_count) {
foreground= 0;
fg_extra= -1;
+ } else {
+ MUST( !"tell light from dark",
+ MR(*cell);MIL(total_count);MIL(bg_count);
+ MIL(light_count);MIL(dark_count);MRGB(background); );
}
+
+ debugf("TABLEENTRY col=%d %d,%d..%d,%d bg=%ld light=%ld dark=%ld\n",
+ colno, cell->tl.x,cell->tl.y, cell->br.x,cell->br.y,
+ bg_count, light_count, dark_count);
+
int monochrome= 1;
FOR_P_RECT(p,*cell) {
- Rgb here= ri_rgb(ri, p.x, p.y);
- double alpha[3], alpha_mean=0;
- int i;
- for (i=0; i<3; i++) {
- unsigned char here_chan= here >> (i*8);
- unsigned char bg_chan= background >> (i*8);
- unsigned char fg_chan= foreground >> (i*8);
- double alpha_chan=
- ((double)here_chan - (double)bg_chan) /
- ((fg_chan + fg_extra) - (double)bg_chan);
- alpha[i]= alpha_chan;
- alpha_mean += alpha_chan * (1/3.0);
- }
+ double alpha= find_aa_density(ri,p,background,foreground,fg_extra);
- double thresh= 1.5/AAMAXVAL;
- double alpha_min= alpha_mean - thresh;
- double alpha_max= alpha_mean + thresh;
- for (i=0; i<3; i++)
- MUST( alpha_min <= alpha[i] && alpha[i] <= alpha_max,
- MI(i);MRGB(here);MRGB(background);MRGB(foreground);
- MF(alpha_min);MF(alpha[i]);MF(alpha_max) );
-
- MUST( 0 <= alpha_mean && alpha_mean < 0.999,
- MRGB(here);MRGB(background);MRGB(foreground);
- MF(alpha_mean); MF(alpha[0]);MF(alpha[1]);MF(alpha[2]); );
- int here_int= floor((AAMAXVAL+1)*alpha_mean);
+ int here_int= floor((AAMAXVAL+1)*alpha);
assert(here_int <= AAMAXVAL);
if (!(here_int==0 || here_int==AAMAXVAL)) monochrome=0;
cim->d[p.y * cim->w + p.x]= '0' + here_int;
return sunshiner;
}
-void find_islandname(RgbImage *ri) {
+void find_islandname(void) {
find_structure(page_images[0], 0);
+ RgbImage *ri= alloc_rgb_image(page_images[0]->rgb->w,
+ page_images[0]->rgb->h);
+ memcpy(ri->data, page_images[0]->rgb->data, ri->w * ri->h * 3);
+
Rect sunshiner= find_sunshine_widget();
char sunshine[MAXIMGIDENT], archisland[MAXIMGIDENT];
for (p.y=islandnamer.tl.y; p.y<=islandnamer.br.y; p.y++) {
pattern <<= 1;
- switch (get_p(p)) {
- case '*': if (runs[nruns]) { nruns++; runs[nruns]=0; } break;
- case 'O': runs[nruns]++; pattern |= 1u; break;
- default: pattern |= 1UL<<31; break;
+ double alpha= find_aa_density(ri,p, 0xCCCCAA,0x002255,0);
+ if (alpha >= 0.49) {
+ runs[nruns]++;
+ pattern |= 1u;
+ } else {
+ if (runs[nruns]) {
+ nruns++;
+ runs[nruns]=0;
+ }
}
}
nspaces++;
might_be_colon=0;
} else {
- if (!(pattern & 1UL<<31) && nruns==2 && runs[1]==runs[0]) {
+ if (nruns==2 && runs[1]==runs[0]) {
if (!nspaces) {
if (pattern==colon_pattern)
goto ok_might_be_colon;
~yarrgweb / ypp-sc-tools.web-live.git / blobdiff