diff options
Diffstat (limited to 'fitzdraw')
| -rw-r--r-- | fitzdraw/imagescale.c | 17 | ||||
| -rw-r--r-- | fitzdraw/pixmap.c | 5 |
2 files changed, 17 insertions, 5 deletions
diff --git a/fitzdraw/imagescale.c b/fitzdraw/imagescale.c index 147e31af..ad73ece1 100644 --- a/fitzdraw/imagescale.c +++ b/fitzdraw/imagescale.c @@ -228,9 +228,11 @@ fz_scalepixmaptile(fz_pixmap *dst, int xoffs, int yoffs, fz_pixmap *src, int xde for (y = 0, oy = 0; y < (src->h / ydenom) * ydenom; y += ydenom, oy++) { for (iy = 0; iy < ydenom; iy++) + { srowx(src->samples + (y + iy) * src->w * n, buf + iy * ow * n, src->w, xdenom); + } scolx(buf, dstsamples + oy * dst->w * n, ow, ydenom); } @@ -238,9 +240,11 @@ fz_scalepixmaptile(fz_pixmap *dst, int xoffs, int yoffs, fz_pixmap *src, int xde if (remaining) { for (iy = 0; iy < remaining; iy++) + { srowx(src->samples + (y + iy) * src->w * n, buf + iy * ow * n, src->w, xdenom); + } scolx(buf, dstsamples + oy * dst->w * n, ow, remaining); } } @@ -250,9 +254,11 @@ fz_scalepixmaptile(fz_pixmap *dst, int xoffs, int yoffs, fz_pixmap *src, int xde for (y = 0, oy = 0; y < (src->h / ydenom) * ydenom; y += ydenom, oy++) { for (iy = 0; iy < ydenom; iy++) + { fz_srown(src->samples + (y + iy) * src->w * n, buf + iy * ow * n, src->w, xdenom, n); + } fz_scoln(buf, dstsamples + oy * dst->w * n, ow, ydenom, n); } @@ -260,10 +266,11 @@ fz_scalepixmaptile(fz_pixmap *dst, int xoffs, int yoffs, fz_pixmap *src, int xde if (remaining) { for (iy = 0; iy < remaining; iy++) + { fz_srown(src->samples + (y + iy) * src->w * n, buf + iy * ow * n, src->w, xdenom, n); - + } fz_scoln(buf, dstsamples + oy * dst->w * n, ow, remaining, n); } } @@ -313,9 +320,11 @@ fz_scalepixmap(fz_pixmap **dstp, fz_pixmap *src, int xdenom, int ydenom) for (y = 0, oy = 0; y < (src->h / ydenom) * ydenom; y += ydenom, oy++) { for (iy = 0; iy < ydenom; iy++) + { srowx(src->samples + (y + iy) * src->w * n, buf + iy * ow * n, src->w, xdenom); + } scolx(buf, dst->samples + oy * dst->w * n, dst->w, ydenom); } @@ -323,9 +332,11 @@ fz_scalepixmap(fz_pixmap **dstp, fz_pixmap *src, int xdenom, int ydenom) if (remaining) { for (iy = 0; iy < remaining; iy++) + { srowx(src->samples + (y + iy) * src->w * n, buf + iy * ow * n, src->w, xdenom); + } scolx(buf, dst->samples + oy * dst->w * n, dst->w, remaining); } } @@ -335,9 +346,11 @@ fz_scalepixmap(fz_pixmap **dstp, fz_pixmap *src, int xdenom, int ydenom) for (y = 0, oy = 0; y < (src->h / ydenom) * ydenom; y += ydenom, oy++) { for (iy = 0; iy < ydenom; iy++) + { fz_srown(src->samples + (y + iy) * src->w * n, buf + iy * ow * n, src->w, xdenom, n); + } fz_scoln(buf, dst->samples + oy * dst->w * n, dst->w, ydenom, n); } @@ -345,9 +358,11 @@ fz_scalepixmap(fz_pixmap **dstp, fz_pixmap *src, int xdenom, int ydenom) if (remaining) { for (iy = 0; iy < remaining; iy++) + { fz_srown(src->samples + (y + iy) * src->w * n, buf + iy * ow * n, src->w, xdenom, n); + } fz_scoln(buf, dst->samples + oy * dst->w * n, dst->w, remaining, n); } } diff --git a/fitzdraw/pixmap.c b/fitzdraw/pixmap.c index 78c8dc2f..592eaf44 100644 --- a/fitzdraw/pixmap.c +++ b/fitzdraw/pixmap.c @@ -29,10 +29,7 @@ fz_newpixmap(fz_pixmap **pixp, int x, int y, int w, int h, int n) fz_error fz_newpixmapwithrect(fz_pixmap **pixp, fz_irect r, int n) { - return fz_newpixmap(pixp, - r.x0, r.y0, - r.x1 - r.x0, - r.y1 - r.y0, n); + return fz_newpixmap(pixp, r.x0, r.y0, r.x1 - r.x0, r.y1 - r.y0, n); } fz_error |