diff options
author | Tor Andersson <tor@ghostscript.com> | 2010-07-25 13:34:38 +0000 |
---|---|---|
committer | Tor Andersson <tor@ghostscript.com> | 2010-07-25 13:34:38 +0000 |
commit | bf7a5bbe52b3d6f74db37756518c4215a3c04a62 (patch) | |
tree | 1a953168844898852176c8d1dec8db62680bf3a8 /draw | |
parent | f1cac331247fbf673e02bdb8a657e4cf56a88cb1 (diff) | |
download | mupdf-bf7a5bbe52b3d6f74db37756518c4215a3c04a62.tar.xz |
Use a separate decodetile function for non-indexed images.
Diffstat (limited to 'draw')
-rw-r--r-- | draw/imageunpack.c | 49 |
1 files changed, 40 insertions, 9 deletions
diff --git a/draw/imageunpack.c b/draw/imageunpack.c index a1afe49b..4465d587 100644 --- a/draw/imageunpack.c +++ b/draw/imageunpack.c @@ -161,11 +161,10 @@ fz_unpacktile(fz_pixmap *dst, unsigned char * restrict src, int n, int depth, in /* Apply decode array */ void -fz_decodetile(fz_pixmap *pix, float *decode, int maxval) +fz_decodeindexedtile(fz_pixmap *pix, float *decode, int maxval) { - int min[FZ_MAXCOLORS]; - int max[FZ_MAXCOLORS]; - int sub[FZ_MAXCOLORS]; + int add[FZ_MAXCOLORS]; + int mul[FZ_MAXCOLORS]; unsigned char *p = pix->samples; int len = pix->w * pix->h; int n = pix->n - 1; @@ -175,10 +174,11 @@ fz_decodetile(fz_pixmap *pix, float *decode, int maxval) needed = 0; for (k = 0; k < n; k++) { - min[k] = decode[k * 2] * 256; - max[k] = decode[k * 2 + 1] * 256; - sub[k] = (max[k] - min[k]) / maxval; - needed |= min[k] != 0 || max[k] != maxval * 256; + int min = decode[k * 2] * 256; + int max = decode[k * 2 + 1] * 256; + add[k] = min; + mul[k] = (max - min) / maxval; + needed |= min != 0 || max != maxval * 256; } if (!needed) @@ -187,8 +187,39 @@ fz_decodetile(fz_pixmap *pix, float *decode, int maxval) while (len--) { for (k = 0; k < n; k++) - p[k] = (min[k] + (((p[k] << 8) * sub[k]) >> 8)) >> 8; + p[k] = (add[k] + (((p[k] << 8) * mul[k]) >> 8)) >> 8; p += n + 1; } } +void +fz_decodetile(fz_pixmap *pix, float *decode) +{ + int add[FZ_MAXCOLORS]; + int mul[FZ_MAXCOLORS]; + unsigned char *p = pix->samples; + int len = pix->w * pix->h; + int n = pix->n - 1; + int needed; + int k; + + needed = 0; + for (k = 0; k < n; k++) + { + int min = decode[k * 2] * 255; + int max = decode[k * 2 + 1] * 255; + add[k] = min; + mul[k] = max - min; + needed |= min != 0 || max != 255; + } + + if (!needed) + return; + + while (len--) + { + for (k = 0; k < n; k++) + p[k] = add[k] + fz_mul255(p[k], mul[k]); + p += n + 1; + } +} |