diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-05-09 20:08:09 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-05-10 18:44:57 +0100 |
| commit | 13577a1ec82a9443ddb1943582a4d387ba15a99f (patch) | |
| tree | 2ecaec84d1322954df8f786fe8204b6b632d3825 /fitz/res_pixmap.c | |
| parent | 81626cb122701420a15dae49ed0e7ec3c442e9d3 (diff) | |
| download | mupdf-13577a1ec82a9443ddb1943582a4d387ba15a99f.tar.xz | |
Tweak png outputting functions.
Allow us to get an image as a png in a buffer.
Diffstat (limited to 'fitz/res_pixmap.c')
| -rw-r--r-- | fitz/res_pixmap.c | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/fitz/res_pixmap.c b/fitz/res_pixmap.c index 12d5956e..5c12f19b 100644 --- a/fitz/res_pixmap.c +++ b/fitz/res_pixmap.c @@ -574,7 +574,7 @@ fz_write_png(fz_context *ctx, fz_pixmap *pixmap, char *filename, int savealpha) fz_try(ctx) { - fz_output_pixmap_to_png(ctx, pixmap, fz_new_output_with_file(ctx, fp), savealpha); + fz_output_png(ctx, pixmap, fz_new_output_with_file(ctx, fp), savealpha); } fz_always(ctx) { @@ -587,7 +587,7 @@ fz_write_png(fz_context *ctx, fz_pixmap *pixmap, char *filename, int savealpha) } void -fz_output_pixmap_to_png(fz_context *ctx, fz_pixmap *pixmap, fz_output *out, int savealpha) +fz_output_png(fz_context *ctx, const fz_pixmap *pixmap, fz_output *out, int savealpha) { static const unsigned char pngsig[8] = { 137, 80, 78, 71, 13, 10, 26, 10 }; unsigned char head[13]; @@ -676,6 +676,42 @@ fz_output_pixmap_to_png(fz_context *ctx, fz_pixmap *pixmap, fz_output *out, int fz_free(ctx, cdata); } +fz_buffer * +fz_image_as_png(fz_context *ctx, fz_image *image, int w, int h) +{ + fz_pixmap *pix = fz_image_get_pixmap(ctx, image, image->w, image->h); + fz_buffer *buf = NULL; + fz_output *out; + + fz_var(buf); + fz_var(out); + + fz_try(ctx) + { + if (pix->colorspace != fz_device_gray || pix->colorspace != fz_device_rgb) + { + fz_pixmap *pix2 = fz_new_pixmap(ctx, fz_device_rgb, pix->w, pix->h); + fz_convert_pixmap(ctx, pix2, pix); + fz_drop_pixmap(ctx, pix); + pix = pix2; + } + buf = fz_new_buffer(ctx, 1024); + out = fz_new_output_with_buffer(ctx, buf); + fz_output_png(ctx, pix, out, 0); + } + fz_always(ctx) + { + fz_close_output(out); + fz_drop_pixmap(ctx, pix); + } + fz_catch(ctx) + { + fz_drop_buffer(ctx, buf); + fz_rethrow(ctx); + } + return buf; +} + unsigned int fz_pixmap_size(fz_context *ctx, fz_pixmap * pix) { |