summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/fitz/bitmap.c4
-rw-r--r--source/fitz/output-pcl.c8
-rw-r--r--source/fitz/output-pwg.c34
-rw-r--r--source/fitz/pixmap.c58
-rw-r--r--source/fitz/stext-output.c2
-rw-r--r--source/fitz/svg-device.c8
-rw-r--r--source/tools/mudraw.c14
7 files changed, 67 insertions, 61 deletions
diff --git a/source/fitz/bitmap.c b/source/fitz/bitmap.c
index a9a53a98..2e6cdfcc 100644
--- a/source/fitz/bitmap.c
+++ b/source/fitz/bitmap.c
@@ -46,7 +46,7 @@ fz_clear_bitmap(fz_context *ctx, fz_bitmap *bit)
}
void
-fz_output_pbm(fz_context *ctx, fz_output *out, fz_bitmap *bitmap)
+fz_write_bitmap_as_pbm(fz_context *ctx, fz_output *out, fz_bitmap *bitmap)
{
unsigned char *p;
int h, bytestride;
@@ -71,7 +71,7 @@ fz_save_bitmap_as_pbm(fz_context *ctx, fz_bitmap *bitmap, char *filename)
{
fz_output *out = fz_new_output_with_path(ctx, filename, 0);
fz_try(ctx)
- fz_output_pbm(ctx, out, bitmap);
+ fz_write_bitmap_as_pbm(ctx, out, bitmap);
fz_always(ctx)
fz_drop_output(ctx, out);
fz_catch(ctx)
diff --git a/source/fitz/output-pcl.c b/source/fitz/output-pcl.c
index a87a84a9..ebfc4e8b 100644
--- a/source/fitz/output-pcl.c
+++ b/source/fitz/output-pcl.c
@@ -397,7 +397,7 @@ pcl_header(fz_context *ctx, fz_output *out, fz_pcl_options *pcl, int num_copies,
}
void
-fz_output_pcl(fz_context *ctx, fz_output *out, const fz_pixmap *pixmap, fz_pcl_options *pcl)
+fz_write_pixmap_as_pcl(fz_context *ctx, fz_output *out, const fz_pixmap *pixmap, fz_pcl_options *pcl)
{
//unsigned char *sp;
//int y, x, sn, dn, ss;
@@ -590,7 +590,7 @@ void wind(void)
{}
void
-fz_output_pcl_bitmap(fz_context *ctx, fz_output *out, const fz_bitmap *bitmap, fz_pcl_options *pcl)
+fz_write_bitmap_as_pcl(fz_context *ctx, fz_output *out, const fz_bitmap *bitmap, fz_pcl_options *pcl)
{
unsigned char *data, *out_data;
int y, ss, rmask, line_size;
@@ -794,7 +794,7 @@ fz_save_pixmap_as_pcl(fz_context *ctx, fz_pixmap *pixmap, char *filename, int ap
{
fz_output *out = fz_new_output_with_path(ctx, filename, append);
fz_try(ctx)
- fz_output_pcl(ctx, out, pixmap, pcl);
+ fz_write_pixmap_as_pcl(ctx, out, pixmap, pcl);
fz_always(ctx)
fz_drop_output(ctx, out);
fz_catch(ctx)
@@ -806,7 +806,7 @@ fz_save_bitmap_as_pcl(fz_context *ctx, fz_bitmap *bitmap, char *filename, int ap
{
fz_output *out = fz_new_output_with_path(ctx, filename, append);
fz_try(ctx)
- fz_output_pcl_bitmap(ctx, out, bitmap, pcl);
+ fz_write_bitmap_as_pcl(ctx, out, bitmap, pcl);
fz_always(ctx)
fz_drop_output(ctx, out);
fz_catch(ctx)
diff --git a/source/fitz/output-pwg.c b/source/fitz/output-pwg.c
index 4810049a..982f8bec 100644
--- a/source/fitz/output-pwg.c
+++ b/source/fitz/output-pwg.c
@@ -1,7 +1,7 @@
#include "mupdf/fitz.h"
void
-fz_output_pwg_file_header(fz_context *ctx, fz_output *out)
+fz_write_pwg_header(fz_context *ctx, fz_output *out)
{
static const unsigned char pwgsig[4] = { 'R', 'a', 'S', '2' };
@@ -10,7 +10,8 @@ fz_output_pwg_file_header(fz_context *ctx, fz_output *out)
}
static void
-output_header(fz_context *ctx, fz_output *out, const fz_pwg_options *pwg, int xres, int yres, int w, int h, int bpp)
+fz_write_pwg_page_header(fz_context *ctx, fz_output *out, const fz_pwg_options *pwg,
+ int xres, int yres, int w, int h, int bpp)
{
static const char zero[64] = { 0 };
int i;
@@ -87,7 +88,7 @@ output_header(fz_context *ctx, fz_output *out, const fz_pwg_options *pwg, int xr
}
void
-fz_output_pwg_page(fz_context *ctx, fz_output *out, const fz_pixmap *pixmap, const fz_pwg_options *pwg)
+fz_write_pixmap_as_pwg_page(fz_context *ctx, fz_output *out, const fz_pixmap *pixmap, const fz_pwg_options *pwg)
{
unsigned char *sp;
int y, x, sn, dn, ss;
@@ -103,7 +104,7 @@ fz_output_pwg_page(fz_context *ctx, fz_output *out, const fz_pixmap *pixmap, con
if (dn > 1)
dn--;
- output_header(ctx, out, pwg, pixmap->xres, pixmap->yres, pixmap->w, pixmap->h, dn*8);
+ fz_write_pwg_page_header(ctx, out, pwg, pixmap->xres, pixmap->yres, pixmap->w, pixmap->h, dn*8);
/* Now output the actual bitmap, using a packbits like compression */
sp = pixmap->samples;
@@ -174,7 +175,7 @@ fz_output_pwg_page(fz_context *ctx, fz_output *out, const fz_pixmap *pixmap, con
}
void
-fz_output_pwg_bitmap_page(fz_context *ctx, fz_output *out, const fz_bitmap *bitmap, const fz_pwg_options *pwg)
+fz_write_bitmap_as_pwg_page(fz_context *ctx, fz_output *out, const fz_bitmap *bitmap, const fz_pwg_options *pwg)
{
unsigned char *sp;
int y, x, ss;
@@ -183,7 +184,7 @@ fz_output_pwg_bitmap_page(fz_context *ctx, fz_output *out, const fz_bitmap *bitm
if (!out || !bitmap)
return;
- output_header(ctx, out, pwg, bitmap->xres, bitmap->yres, bitmap->w, bitmap->h, 1);
+ fz_write_pwg_page_header(ctx, out, pwg, bitmap->xres, bitmap->yres, bitmap->w, bitmap->h, 1);
/* Now output the actual bitmap, using a packbits like compression */
sp = bitmap->samples;
@@ -251,10 +252,17 @@ fz_output_pwg_bitmap_page(fz_context *ctx, fz_output *out, const fz_bitmap *bitm
}
void
-fz_output_pwg(fz_context *ctx, fz_output *out, const fz_pixmap *pixmap, const fz_pwg_options *pwg)
+fz_write_pixmap_as_pwg(fz_context *ctx, fz_output *out, const fz_pixmap *pixmap, const fz_pwg_options *pwg)
{
- fz_output_pwg_file_header(ctx, out);
- fz_output_pwg_page(ctx, out, pixmap, pwg);
+ fz_write_pwg_header(ctx, out);
+ fz_write_pixmap_as_pwg_page(ctx, out, pixmap, pwg);
+}
+
+void
+fz_write_bitmap_as_pwg(fz_context *ctx, fz_output *out, const fz_bitmap *bitmap, const fz_pwg_options *pwg)
+{
+ fz_write_pwg_header(ctx, out);
+ fz_write_bitmap_as_pwg_page(ctx, out, bitmap, pwg);
}
void
@@ -264,8 +272,8 @@ fz_save_pixmap_as_pwg(fz_context *ctx, fz_pixmap *pixmap, char *filename, int ap
fz_try(ctx)
{
if (!append)
- fz_output_pwg_file_header(ctx, out);
- fz_output_pwg_page(ctx, out, pixmap, pwg);
+ fz_write_pwg_header(ctx, out);
+ fz_write_pixmap_as_pwg_page(ctx, out, pixmap, pwg);
}
fz_always(ctx)
fz_drop_output(ctx, out);
@@ -280,8 +288,8 @@ fz_save_bitmap_as_pwg(fz_context *ctx, fz_bitmap *bitmap, char *filename, int ap
fz_try(ctx)
{
if (!append)
- fz_output_pwg_file_header(ctx, out);
- fz_output_pwg_bitmap_page(ctx, out, bitmap, pwg);
+ fz_write_pwg_header(ctx, out);
+ fz_write_bitmap_as_pwg_page(ctx, out, bitmap, pwg);
}
fz_always(ctx)
fz_drop_output(ctx, out);
diff --git a/source/fitz/pixmap.c b/source/fitz/pixmap.c
index 255418bb..ed20265e 100644
--- a/source/fitz/pixmap.c
+++ b/source/fitz/pixmap.c
@@ -526,7 +526,7 @@ fz_gamma_pixmap(fz_context *ctx, fz_pixmap *pix, float gamma)
*/
void
-fz_output_pnm_header(fz_context *ctx, fz_output *out, int w, int h, int n)
+fz_write_pnm_header(fz_context *ctx, fz_output *out, int w, int h, int n)
{
if (n != 1 && n != 2 && n != 4)
fz_throw(ctx, FZ_ERROR_GENERIC, "pixmap must be grayscale or rgb to write as pnm");
@@ -540,7 +540,7 @@ fz_output_pnm_header(fz_context *ctx, fz_output *out, int w, int h, int n)
}
void
-fz_output_pnm_band(fz_context *ctx, fz_output *out, int w, int h, int n, int band, int bandheight, unsigned char *p)
+fz_write_pnm_band(fz_context *ctx, fz_output *out, int w, int h, int n, int band, int bandheight, unsigned char *p)
{
int len;
int start = band * bandheight;
@@ -576,18 +576,18 @@ fz_output_pnm_band(fz_context *ctx, fz_output *out, int w, int h, int n, int ban
}
void
-fz_output_pnm(fz_context *ctx, fz_output *out, fz_pixmap *pixmap)
+fz_write_pixmap_as_pnm(fz_context *ctx, fz_output *out, fz_pixmap *pixmap)
{
- fz_output_pnm_header(ctx, out, pixmap->w, pixmap->h, pixmap->n);
- fz_output_pnm_band(ctx, out, pixmap->w, pixmap->h, pixmap->n, 0, pixmap->h, pixmap->samples);
+ fz_write_pnm_header(ctx, out, pixmap->w, pixmap->h, pixmap->n);
+ fz_write_pnm_band(ctx, out, pixmap->w, pixmap->h, pixmap->n, 0, pixmap->h, pixmap->samples);
}
void
fz_save_pixmap_as_pnm(fz_context *ctx, fz_pixmap *pixmap, char *filename)
{
fz_output *out = fz_new_output_with_path(ctx, filename, 0);
- fz_output_pnm_header(ctx, out, pixmap->w, pixmap->h, pixmap->n);
- fz_output_pnm_band(ctx, out, pixmap->w, pixmap->h, pixmap->n, 0, pixmap->h, pixmap->samples);
+ fz_write_pnm_header(ctx, out, pixmap->w, pixmap->h, pixmap->n);
+ fz_write_pnm_band(ctx, out, pixmap->w, pixmap->h, pixmap->n, 0, pixmap->h, pixmap->samples);
fz_drop_output(ctx, out);
}
@@ -596,7 +596,7 @@ fz_save_pixmap_as_pnm(fz_context *ctx, fz_pixmap *pixmap, char *filename)
*/
void
-fz_output_pam_header(fz_context *ctx, fz_output *out, int w, int h, int n, int savealpha)
+fz_write_pam_header(fz_context *ctx, fz_output *out, int w, int h, int n, int savealpha)
{
int sn = n;
int dn = n;
@@ -618,7 +618,7 @@ fz_output_pam_header(fz_context *ctx, fz_output *out, int w, int h, int n, int s
}
void
-fz_output_pam_band(fz_context *ctx, fz_output *out, int w, int h, int n, int band, int bandheight, unsigned char *sp, int savealpha)
+fz_write_pam_band(fz_context *ctx, fz_output *out, int w, int h, int n, int band, int bandheight, unsigned char *sp, int savealpha)
{
int y, x, k;
int start = band * bandheight;
@@ -645,18 +645,18 @@ fz_output_pam_band(fz_context *ctx, fz_output *out, int w, int h, int n, int ban
}
void
-fz_output_pam(fz_context *ctx, fz_output *out, fz_pixmap *pixmap, int savealpha)
+fz_write_pixmap_as_pam(fz_context *ctx, fz_output *out, fz_pixmap *pixmap, int savealpha)
{
- fz_output_pam_header(ctx, out, pixmap->w, pixmap->h, pixmap->n, savealpha);
- fz_output_pam_band(ctx, out, pixmap->w, pixmap->h, pixmap->n, 0, pixmap->h, pixmap->samples, savealpha);
+ fz_write_pam_header(ctx, out, pixmap->w, pixmap->h, pixmap->n, savealpha);
+ fz_write_pam_band(ctx, out, pixmap->w, pixmap->h, pixmap->n, 0, pixmap->h, pixmap->samples, savealpha);
}
void
fz_save_pixmap_as_pam(fz_context *ctx, fz_pixmap *pixmap, char *filename, int savealpha)
{
fz_output *out = fz_new_output_with_path(ctx, filename, 0);
- fz_output_pam_header(ctx, out, pixmap->w, pixmap->h, pixmap->n, savealpha);
- fz_output_pam_band(ctx, out, pixmap->w, pixmap->h, pixmap->n, 0, pixmap->h, pixmap->samples, savealpha);
+ fz_write_pam_header(ctx, out, pixmap->w, pixmap->h, pixmap->n, savealpha);
+ fz_write_pam_band(ctx, out, pixmap->w, pixmap->h, pixmap->n, 0, pixmap->h, pixmap->samples, savealpha);
fz_drop_output(ctx, out);
}
@@ -696,12 +696,12 @@ fz_save_pixmap_as_png(fz_context *ctx, fz_pixmap *pixmap, const char *filename,
fz_try(ctx)
{
- poc = fz_output_png_header(ctx, out, pixmap->w, pixmap->h, pixmap->n, savealpha);
- fz_output_png_band(ctx, out, pixmap->w, pixmap->h, pixmap->n, 0, pixmap->h, pixmap->samples, savealpha, poc);
+ poc = fz_write_png_header(ctx, out, pixmap->w, pixmap->h, pixmap->n, savealpha);
+ fz_write_png_band(ctx, out, pixmap->w, pixmap->h, pixmap->n, 0, pixmap->h, pixmap->samples, savealpha, poc);
}
fz_always(ctx)
{
- fz_output_png_trailer(ctx, out, poc);
+ fz_write_png_trailer(ctx, out, poc);
fz_drop_output(ctx, out);
}
fz_catch(ctx)
@@ -711,22 +711,22 @@ fz_save_pixmap_as_png(fz_context *ctx, fz_pixmap *pixmap, const char *filename,
}
void
-fz_output_png(fz_context *ctx, fz_output *out, const fz_pixmap *pixmap, int savealpha)
+fz_write_pixmap_as_png(fz_context *ctx, fz_output *out, const fz_pixmap *pixmap, int savealpha)
{
fz_png_output_context *poc;
if (!out)
return;
- poc = fz_output_png_header(ctx, out, pixmap->w, pixmap->h, pixmap->n, savealpha);
+ poc = fz_write_png_header(ctx, out, pixmap->w, pixmap->h, pixmap->n, savealpha);
fz_try(ctx)
{
- fz_output_png_band(ctx, out, pixmap->w, pixmap->h, pixmap->n, 0, pixmap->h, pixmap->samples, savealpha, poc);
+ fz_write_png_band(ctx, out, pixmap->w, pixmap->h, pixmap->n, 0, pixmap->h, pixmap->samples, savealpha, poc);
}
fz_always(ctx)
{
- fz_output_png_trailer(ctx, out, poc);
+ fz_write_png_trailer(ctx, out, poc);
}
fz_catch(ctx)
{
@@ -743,7 +743,7 @@ struct fz_png_output_context_s
};
fz_png_output_context *
-fz_output_png_header(fz_context *ctx, fz_output *out, int w, int h, int n, int savealpha)
+fz_write_png_header(fz_context *ctx, fz_output *out, int w, int h, int n, int savealpha)
{
static const unsigned char pngsig[8] = { 137, 80, 78, 71, 13, 10, 26, 10 };
unsigned char head[13];
@@ -785,7 +785,7 @@ fz_output_png_header(fz_context *ctx, fz_output *out, int w, int h, int n, int s
}
void
-fz_output_png_band(fz_context *ctx, fz_output *out, int w, int h, int n, int band, int bandheight, unsigned char *sp, int savealpha, fz_png_output_context *poc)
+fz_write_png_band(fz_context *ctx, fz_output *out, int w, int h, int n, int band, int bandheight, unsigned char *sp, int savealpha, fz_png_output_context *poc)
{
unsigned char *dp;
int y, x, k, sn, dn, err, finalband;
@@ -877,7 +877,7 @@ fz_output_png_band(fz_context *ctx, fz_output *out, int w, int h, int n, int ban
}
void
-fz_output_png_trailer(fz_context *ctx, fz_output *out, fz_png_output_context *poc)
+fz_write_png_trailer(fz_context *ctx, fz_output *out, fz_png_output_context *poc)
{
unsigned char block[1];
int err;
@@ -925,7 +925,7 @@ png_from_pixmap(fz_context *ctx, fz_pixmap *pix, int drop)
}
buf = fz_new_buffer(ctx, 1024);
out = fz_new_output_with_buffer(ctx, buf);
- fz_output_png(ctx, out, pix, 1);
+ fz_write_pixmap_as_png(ctx, out, pix, 1);
}
fz_always(ctx)
{
@@ -941,15 +941,13 @@ png_from_pixmap(fz_context *ctx, fz_pixmap *pix, int drop)
}
fz_buffer *
-fz_new_png_from_image(fz_context *ctx, fz_image *image, int w, int h)
+fz_new_buffer_from_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);
-
- return png_from_pixmap(ctx, pix, 1);
+ return png_from_pixmap(ctx, fz_image_get_pixmap(ctx, image, image->w, image->h), 1);
}
fz_buffer *
-fz_new_png_from_pixmap(fz_context *ctx, fz_pixmap *pix)
+fz_new_buffer_from_pixmap_as_png(fz_context *ctx, fz_pixmap *pix)
{
return png_from_pixmap(ctx, pix, 0);
}
diff --git a/source/fitz/stext-output.c b/source/fitz/stext-output.c
index bd348af1..1ba9fe51 100644
--- a/source/fitz/stext-output.c
+++ b/source/fitz/stext-output.c
@@ -258,7 +258,7 @@ fz_print_stext_page_html(fz_context *ctx, fz_output *out, fz_stext_page *page)
break;
default:
{
- fz_buffer *buf = fz_new_png_from_image(ctx, image->image, image->image->w, image->image->h);
+ fz_buffer *buf = fz_new_buffer_from_image_as_png(ctx, image->image, image->image->w, image->image->h);
fz_printf(ctx, out, "image/png;base64,");
send_data_base64(ctx, out, buf);
fz_drop_buffer(ctx, buf);
diff --git a/source/fitz/svg-device.c b/source/fitz/svg-device.c
index 879b3bd0..4dd60727 100644
--- a/source/fitz/svg-device.c
+++ b/source/fitz/svg-device.c
@@ -744,7 +744,7 @@ svg_dev_fill_image(fz_context *ctx, fz_device *dev, fz_image *image, const fz_ma
break;
default:
{
- fz_buffer *buf = fz_new_png_from_image(ctx, image, image->w, image->h);
+ fz_buffer *buf = fz_new_buffer_from_image_as_png(ctx, image, image->w, image->h);
fz_printf(ctx, out, "image/png;base64,");
send_data_base64(ctx, out, buf);
fz_drop_buffer(ctx, buf);
@@ -781,7 +781,7 @@ svg_dev_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shade, const fz_ma
fz_try(ctx)
{
fz_paint_shade(ctx, shade, ctm, pix, &bbox);
- buf = fz_new_png_from_pixmap(ctx, pix);
+ buf = fz_new_buffer_from_pixmap_as_png(ctx, pix);
if (alpha != 1.0f)
fz_printf(ctx, out, "<g opacity=\"%g\">", alpha);
fz_printf(ctx, out, "<image x=\"%dpx\" y=\"%dpx\" width=\"%dpx\" height=\"%dpx\" xlink:href=\"data:image/png;base64,", pix->x, pix->y, pix->w, pix->h);
@@ -831,7 +831,7 @@ fz_colorspace *colorspace, float *color, float alpha)
break;
default:
{
- fz_buffer *buf = fz_new_png_from_image(ctx, image, image->w, image->h);
+ fz_buffer *buf = fz_new_buffer_from_image_as_png(ctx, image, image->w, image->h);
fz_printf(ctx, out, "image/png;base64,");
send_data_base64(ctx, out, buf);
fz_drop_buffer(ctx, buf);
@@ -875,7 +875,7 @@ svg_dev_clip_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const
break;
default:
{
- fz_buffer *buf = fz_new_png_from_image(ctx, image, image->w, image->h);
+ fz_buffer *buf = fz_new_buffer_from_image_as_png(ctx, image, image->w, image->h);
fz_printf(ctx, out, "image/png;base64,");
send_data_base64(ctx, out, buf);
fz_drop_buffer(ctx, buf);
diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c
index f80c2c0e..a00646d6 100644
--- a/source/tools/mudraw.c
+++ b/source/tools/mudraw.c
@@ -568,11 +568,11 @@ static void drawpage(fz_context *ctx, fz_document *doc, int pagenum)
}
if (output_format == OUT_PGM || output_format == OUT_PPM || output_format == OUT_PNM)
- fz_output_pnm_header(ctx, output_file, pix->w, totalheight, pix->n);
+ fz_write_pnm_header(ctx, output_file, pix->w, totalheight, pix->n);
else if (output_format == OUT_PAM)
- fz_output_pam_header(ctx, output_file, pix->w, totalheight, pix->n, savealpha);
+ fz_write_pam_header(ctx, output_file, pix->w, totalheight, pix->n, savealpha);
else if (output_format == OUT_PNG)
- poc = fz_output_png_header(ctx, output_file, pix->w, totalheight, pix->n, savealpha);
+ poc = fz_write_png_header(ctx, output_file, pix->w, totalheight, pix->n, savealpha);
}
for (band = 0; band < bands; band++)
@@ -603,11 +603,11 @@ static void drawpage(fz_context *ctx, fz_document *doc, int pagenum)
if (output)
{
if (output_format == OUT_PGM || output_format == OUT_PPM || output_format == OUT_PNM)
- fz_output_pnm_band(ctx, output_file, pix->w, totalheight, pix->n, band, drawheight, pix->samples);
+ fz_write_pnm_band(ctx, output_file, pix->w, totalheight, pix->n, band, drawheight, pix->samples);
else if (output_format == OUT_PAM)
- fz_output_pam_band(ctx, output_file, pix->w, totalheight, pix->n, band, drawheight, pix->samples, savealpha);
+ fz_write_pam_band(ctx, output_file, pix->w, totalheight, pix->n, band, drawheight, pix->samples, savealpha);
else if (output_format == OUT_PNG)
- fz_output_png_band(ctx, output_file, pix->w, totalheight, pix->n, band, drawheight, pix->samples, savealpha, poc);
+ fz_write_png_band(ctx, output_file, pix->w, totalheight, pix->n, band, drawheight, pix->samples, savealpha, poc);
else if (output_format == OUT_PWG)
{
if (has_percent_d(output))
@@ -669,7 +669,7 @@ static void drawpage(fz_context *ctx, fz_document *doc, int pagenum)
if (output)
{
if (output_format == OUT_PNG)
- fz_output_png_trailer(ctx, output_file, poc);
+ fz_write_png_trailer(ctx, output_file, poc);
}
fz_drop_device(ctx, dev);
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 07:25:22 +0000