--- CV/CV.xs 2005/02/08 10:34:19 1.10 +++ CV/CV.xs 2005/07/20 02:26:46 1.16 @@ -227,9 +227,9 @@ eg += p[1] - (g * 255 + 4) / 7; eb += p[2] - (b * 255 + 2) / 3; - Er[x] = er / 2; er -= er / 2 + RAND % 7 - 3; - Eg[x] = eg / 2; eg -= eg / 2 + RAND % 7 - 3; - Eb[x] = eb / 2; eb -= eb / 2 + RAND % 7 - 3; + Er[x] = er / 2; er -= er / 2 + RAND % 5 - 2; + Eg[x] = eg / 2; eg -= eg / 2 + RAND % 5 - 2; + Eb[x] = eb / 2; eb -= eb / 2 + RAND % 5 - 2; *dst++ = r << 5 | g << 2 | b; } @@ -253,30 +253,36 @@ for (i = 0; i <= av_len (av); ++i) { - int bigst = 1; - int j = 0; + const int HISTSIZE = 64; + + int j; SV *sv = *av_fetch (av, i, 1); STRLEN len; char *buf = SvPVbyte (sv, len); - int tmphist[256]; - char *hist; - SV *histsv = newSV (257);//("", 0); - sv_upgrade (histsv, SVt_PV); - SvCUR_set (histsv, 256); - hist = SvPV_nolen (histsv); - - Zero (tmphist, 256, int); - - while (len--) - ++tmphist[*buf++]; - - for (j = 0; j < 256; ++j) - if (tmphist[j] > bigst) - bigst = tmphist[j]; + int tmphist[HISTSIZE]; + float *hist; + + SV *histsv = newSV (HISTSIZE * sizeof (float) + 1); + SvPOK_on (histsv); + SvCUR_set (histsv, HISTSIZE * sizeof (float)); + hist = (float *)SvPVX (histsv); + + Zero (tmphist, sizeof (tmphist), char); + + for (j = len; j--; ) + { + unsigned int idx + = ((*buf & 0xc0) >> 2) + | ((*buf & 0x18) >> 1) + | (*buf & 0x03); + + ++tmphist[idx]; + ++buf; + } - for (j = 0; j < 256; ++j) - hist[j] = tmphist[j] * 255 / bigst; + for (j = 0; j < HISTSIZE; ++j) + hist[j] = (float)tmphist[j] / (len + 1e-30); av_push (result, histsv); }