diff options
Diffstat (limited to 'source/fitz')
-rw-r--r-- | source/fitz/bitmap.c | 16 | ||||
-rw-r--r-- | source/fitz/halftone.c | 8 |
2 files changed, 21 insertions, 3 deletions
diff --git a/source/fitz/bitmap.c b/source/fitz/bitmap.c index b6eba35f..bc14162a 100644 --- a/source/fitz/bitmap.c +++ b/source/fitz/bitmap.c @@ -46,16 +46,28 @@ fz_clear_bitmap(fz_context *ctx, fz_bitmap *bit) } void +fz_write_pbm_header(fz_context *ctx, fz_output *out, int w, int h) +{ + fz_printf(ctx, out, "P4\n%d %d\n", w, h); +} + +void fz_write_bitmap_as_pbm(fz_context *ctx, fz_output *out, fz_bitmap *bitmap) { + fz_write_pbm_header(ctx, out, bitmap->w, bitmap->h); + + fz_write_pbm_band(ctx, out, bitmap); +} + +void +fz_write_pbm_band(fz_context *ctx, fz_output *out, fz_bitmap *bitmap) +{ unsigned char *p; int h, bytestride; if (bitmap->n != 1) fz_throw(ctx, FZ_ERROR_GENERIC, "too many color components in bitmap"); - fz_printf(ctx, out, "P4\n%d %d\n", bitmap->w, bitmap->h); - p = bitmap->samples; h = bitmap->h; bytestride = (bitmap->w + 7) >> 3; diff --git a/source/fitz/halftone.c b/source/fitz/halftone.c index 705d4718..8cc48a14 100644 --- a/source/fitz/halftone.c +++ b/source/fitz/halftone.c @@ -172,6 +172,11 @@ static void do_threshold_1(unsigned char *ht_line, unsigned char *pixmap, unsign fz_bitmap *fz_new_bitmap_from_pixmap(fz_context *ctx, fz_pixmap *pix, fz_halftone *ht) { + return fz_new_bitmap_from_pixmap_band(ctx, pix, ht, 0, 0); +} + +fz_bitmap *fz_new_bitmap_from_pixmap_band(fz_context *ctx, fz_pixmap *pix, fz_halftone *ht, int band, int bandheight) +{ fz_bitmap *out = NULL; unsigned char *ht_line = NULL; unsigned char *o, *p; @@ -186,6 +191,7 @@ fz_bitmap *fz_new_bitmap_from_pixmap(fz_context *ctx, fz_pixmap *pix, fz_halfton fz_var(ht_line); fz_var(out); + band *= bandheight; n = pix->n-1; /* Remove alpha */ if (ht == NULL) { @@ -200,7 +206,7 @@ fz_bitmap *fz_new_bitmap_from_pixmap(fz_context *ctx, fz_pixmap *pix, fz_halfton h = pix->h; x = pix->x; - y = pix->y; + y = pix->y + band; w = pix->w; ostride = out->stride; pstride = pix->w * pix->n; |