summaryrefslogtreecommitdiff
path: root/fitz
diff options
context:
space:
mode:
Diffstat (limited to 'fitz')
-rw-r--r--fitz/base_hash.c2
-rw-r--r--fitz/dev_text.c20
-rw-r--r--fitz/dev_trace.c10
-rw-r--r--fitz/doc_outline.c4
-rw-r--r--fitz/fitz-internal.h22
-rw-r--r--fitz/fitz.h24
-rw-r--r--fitz/image_save.c4
-rw-r--r--fitz/res_bitmap.c2
-rw-r--r--fitz/res_font.c8
-rw-r--r--fitz/res_halftone.c4
-rw-r--r--fitz/res_path.c2
-rw-r--r--fitz/res_pixmap.c6
-rw-r--r--fitz/res_shade.c2
-rw-r--r--fitz/res_store.c8
-rw-r--r--fitz/res_text.c2
15 files changed, 60 insertions, 60 deletions
diff --git a/fitz/base_hash.c b/fitz/base_hash.c
index 59ed8872..bf56b9bc 100644
--- a/fitz/base_hash.c
+++ b/fitz/base_hash.c
@@ -268,7 +268,7 @@ fz_hash_remove(fz_context *ctx, fz_hash_table *table, void *key)
}
void
-fz_debug_hash(fz_context *ctx, fz_hash_table *table)
+fz_print_hash(fz_context *ctx, fz_hash_table *table)
{
int i, k;
diff --git a/fitz/dev_text.c b/fitz/dev_text.c
index 7a56b56c..b92372a1 100644
--- a/fitz/dev_text.c
+++ b/fitz/dev_text.c
@@ -42,7 +42,7 @@ fz_free_text_sheet(fz_context *ctx, fz_text_sheet *sheet)
}
static fz_text_style *
-fz_find_text_style_imp(fz_context *ctx, fz_text_sheet *sheet,
+fz_lookup_text_style_imp(fz_context *ctx, fz_text_sheet *sheet,
float size, fz_font *font, int wmode, int script)
{
fz_text_style *style;
@@ -71,7 +71,7 @@ fz_find_text_style_imp(fz_context *ctx, fz_text_sheet *sheet,
}
static fz_text_style *
-fz_find_text_style(fz_context *ctx, fz_text_sheet *sheet, fz_text *text, fz_matrix *ctm,
+fz_lookup_text_style(fz_context *ctx, fz_text_sheet *sheet, fz_text *text, fz_matrix *ctm,
fz_colorspace *colorspace, float *color, float alpha, fz_stroke_state *stroke)
{
float size = 1.0f;
@@ -86,7 +86,7 @@ fz_find_text_style(fz_context *ctx, fz_text_sheet *sheet, fz_text *text, fz_matr
trm = fz_concat(tm, *ctm);
size = fz_matrix_expansion(trm);
}
- return fz_find_text_style_imp(ctx, sheet, size, font, wmode, 0);
+ return fz_lookup_text_style_imp(ctx, sheet, size, font, wmode, 0);
}
fz_text_page *
@@ -178,7 +178,7 @@ append_line(fz_context *ctx, fz_text_block *block, fz_text_line *line)
}
static fz_text_block *
-find_block_for_line(fz_context *ctx, fz_text_page *page, fz_text_line *line)
+lookup_block_for_line(fz_context *ctx, fz_text_page *page, fz_text_line *line)
{
float size = line->len > 0 && line->spans[0].len > 0 ? line->spans[0].style->size : 1;
int i;
@@ -210,7 +210,7 @@ find_block_for_line(fz_context *ctx, fz_text_page *page, fz_text_line *line)
static void
insert_line(fz_context *ctx, fz_text_page *page, fz_text_line *line)
{
- append_line(ctx, find_block_for_line(ctx, page, line), line);
+ append_line(ctx, lookup_block_for_line(ctx, page, line), line);
}
static fz_rect
@@ -447,7 +447,7 @@ fz_text_fill_text(fz_device *dev, fz_text *text, fz_matrix ctm,
{
fz_text_device *tdev = dev->user;
fz_text_style *style;
- style = fz_find_text_style(dev->ctx, tdev->sheet, text, &ctm, colorspace, color, alpha, NULL);
+ style = fz_lookup_text_style(dev->ctx, tdev->sheet, text, &ctm, colorspace, color, alpha, NULL);
fz_text_extract(dev->ctx, tdev, text, ctm, style);
}
@@ -457,7 +457,7 @@ fz_text_stroke_text(fz_device *dev, fz_text *text, fz_stroke_state *stroke, fz_m
{
fz_text_device *tdev = dev->user;
fz_text_style *style;
- style = fz_find_text_style(dev->ctx, tdev->sheet, text, &ctm, colorspace, color, alpha, stroke);
+ style = fz_lookup_text_style(dev->ctx, tdev->sheet, text, &ctm, colorspace, color, alpha, stroke);
fz_text_extract(dev->ctx, tdev, text, ctm, style);
}
@@ -466,7 +466,7 @@ fz_text_clip_text(fz_device *dev, fz_text *text, fz_matrix ctm, int accumulate)
{
fz_text_device *tdev = dev->user;
fz_text_style *style;
- style = fz_find_text_style(dev->ctx, tdev->sheet, text, &ctm, NULL, NULL, 0, NULL);
+ style = fz_lookup_text_style(dev->ctx, tdev->sheet, text, &ctm, NULL, NULL, 0, NULL);
fz_text_extract(dev->ctx, tdev, text, ctm, style);
}
@@ -475,7 +475,7 @@ fz_text_clip_stroke_text(fz_device *dev, fz_text *text, fz_stroke_state *stroke,
{
fz_text_device *tdev = dev->user;
fz_text_style *style;
- style = fz_find_text_style(dev->ctx, tdev->sheet, text, &ctm, NULL, NULL, 0, stroke);
+ style = fz_lookup_text_style(dev->ctx, tdev->sheet, text, &ctm, NULL, NULL, 0, stroke);
fz_text_extract(dev->ctx, tdev, text, ctm, style);
}
@@ -484,7 +484,7 @@ fz_text_ignore_text(fz_device *dev, fz_text *text, fz_matrix ctm)
{
fz_text_device *tdev = dev->user;
fz_text_style *style;
- style = fz_find_text_style(dev->ctx, tdev->sheet, text, &ctm, NULL, NULL, 0, NULL);
+ style = fz_lookup_text_style(dev->ctx, tdev->sheet, text, &ctm, NULL, NULL, 0, NULL);
fz_text_extract(dev->ctx, tdev, text, ctm, style);
}
diff --git a/fitz/dev_trace.c b/fitz/dev_trace.c
index f75f19d5..33406130 100644
--- a/fitz/dev_trace.c
+++ b/fitz/dev_trace.c
@@ -145,7 +145,7 @@ fz_trace_fill_text(fz_device *dev, fz_text *text, fz_matrix ctm,
fz_trace_matrix(ctm);
fz_trace_trm(text->trm);
printf(">\n");
- fz_debug_text(dev->ctx, text, 0);
+ fz_print_text(dev->ctx, text, 0);
printf("</fill_text>\n");
}
@@ -158,7 +158,7 @@ fz_trace_stroke_text(fz_device *dev, fz_text *text, fz_stroke_state *stroke, fz_
fz_trace_matrix(ctm);
fz_trace_trm(text->trm);
printf(">\n");
- fz_debug_text(dev->ctx, text, 0);
+ fz_print_text(dev->ctx, text, 0);
printf("</stroke_text>\n");
}
@@ -170,7 +170,7 @@ fz_trace_clip_text(fz_device *dev, fz_text *text, fz_matrix ctm, int accumulate)
fz_trace_matrix(ctm);
fz_trace_trm(text->trm);
printf(">\n");
- fz_debug_text(dev->ctx, text, 0);
+ fz_print_text(dev->ctx, text, 0);
printf("</clip_text>\n");
}
@@ -181,7 +181,7 @@ fz_trace_clip_stroke_text(fz_device *dev, fz_text *text, fz_stroke_state *stroke
fz_trace_matrix(ctm);
fz_trace_trm(text->trm);
printf(">\n");
- fz_debug_text(dev->ctx, text, 0);
+ fz_print_text(dev->ctx, text, 0);
printf("</clip_stroke_text>\n");
}
@@ -192,7 +192,7 @@ fz_trace_ignore_text(fz_device *dev, fz_text *text, fz_matrix ctm)
fz_trace_matrix(ctm);
fz_trace_trm(text->trm);
printf(">\n");
- fz_debug_text(dev->ctx, text, 0);
+ fz_print_text(dev->ctx, text, 0);
printf("</ignore_text>\n");
}
diff --git a/fitz/doc_outline.c b/fitz/doc_outline.c
index 4847b919..023abd23 100644
--- a/fitz/doc_outline.c
+++ b/fitz/doc_outline.c
@@ -35,7 +35,7 @@ do_debug_outline_xml(fz_outline *outline, int level)
}
void
-fz_debug_outline_xml(fz_context *ctx, fz_outline *outline)
+fz_print_outline_xml(fz_context *ctx, fz_outline *outline)
{
do_debug_outline_xml(outline, 0);
}
@@ -56,7 +56,7 @@ do_debug_outline(fz_outline *outline, int level)
}
void
-fz_debug_outline(fz_context *ctx, fz_outline *outline)
+fz_print_outline(fz_context *ctx, fz_outline *outline)
{
do_debug_outline(outline, 0);
}
diff --git a/fitz/fitz-internal.h b/fitz/fitz-internal.h
index 16b65ccd..6d4b292b 100644
--- a/fitz/fitz-internal.h
+++ b/fitz/fitz-internal.h
@@ -87,7 +87,7 @@ float fz_atof(const char *s);
typedef struct fz_hash_table_s fz_hash_table;
fz_hash_table *fz_new_hash_table(fz_context *ctx, int initialsize, int keylen, int lock);
-void fz_debug_hash(fz_context *ctx, fz_hash_table *table);
+void fz_print_hash(fz_context *ctx, fz_hash_table *table);
void fz_empty_hash(fz_context *ctx, fz_hash_table *table);
void fz_free_hash(fz_context *ctx, fz_hash_table *table);
@@ -308,9 +308,9 @@ void fz_drop_store_context(fz_context *ctx);
fz_store *fz_keep_store_context(fz_context *ctx);
/*
- fz_debug_store: Dump the contents of the store for debugging.
+ fz_print_store: Dump the contents of the store for debugging.
*/
-void fz_debug_store(fz_context *ctx);
+void fz_print_store(fz_context *ctx);
/*
fz_store_item: Add an item to the store.
@@ -558,7 +558,7 @@ fz_stream *fz_open_jbig2d(fz_stream *chain, fz_buffer *global);
enum { FZ_MAX_COLORS = 32 };
-int fz_find_blendmode(char *name);
+int fz_lookup_blendmode(char *name);
char *fz_blendmode_name(int blendmode);
struct fz_bitmap_s
@@ -603,7 +603,7 @@ void fz_clear_bitmap(fz_context *ctx, fz_bitmap *bit);
in scanline order. Subsequent scanlines follow on with no padding.
free_samples: Is zero when an application has provided its own
- buffer for pixel data through fz_new_pixmap_with_rect_and_data.
+ buffer for pixel data through fz_new_pixmap_with_bbox_and_data.
If not zero the buffer will be freed when fz_drop_pixmap is
called for the pixmap.
*/
@@ -620,7 +620,7 @@ struct fz_pixmap_s
fz_pixmap *fz_new_pixmap_with_data(fz_context *ctx, fz_colorspace *colorspace, int w, int h, unsigned char *samples);
-fz_pixmap *fz_new_pixmap_with_rect_and_data(fz_context *ctx, fz_colorspace *colorspace, fz_bbox bbox, unsigned char *samples);
+fz_pixmap *fz_new_pixmap_with_bbox_and_data(fz_context *ctx, fz_colorspace *colorspace, fz_bbox bbox, unsigned char *samples);
void fz_free_pixmap_imp(fz_context *ctx, fz_storable *pix);
@@ -654,7 +654,7 @@ struct fz_halftone_s
};
fz_halftone *fz_new_halftone(fz_context *ctx, int num_comps);
-fz_halftone *fz_get_default_halftone(fz_context *ctx, int num_comps);
+fz_halftone *fz_default_halftone(fz_context *ctx, int num_comps);
void fz_drop_halftone(fz_context *ctx, fz_halftone *half);
fz_halftone *fz_keep_halftone(fz_context *ctx, fz_halftone *half);
@@ -734,7 +734,7 @@ fz_font *fz_new_font_from_file(fz_context *ctx, char *path, int index, int use_g
fz_font *fz_keep_font(fz_context *ctx, fz_font *font);
void fz_drop_font(fz_context *ctx, fz_font *font);
-void fz_debug_font(fz_context *ctx, fz_font *font);
+void fz_print_font(fz_context *ctx, fz_font *font);
void fz_set_font_bbox(fz_context *ctx, fz_font *font, float xmin, float ymin, float xmax, float ymax);
fz_rect fz_bound_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm);
@@ -816,7 +816,7 @@ void fz_transform_path(fz_context *ctx, fz_path *path, fz_matrix transform);
fz_path *fz_clone_path(fz_context *ctx, fz_path *old);
fz_rect fz_bound_path(fz_context *ctx, fz_path *path, fz_stroke_state *stroke, fz_matrix ctm);
-void fz_debug_path(fz_context *ctx, fz_path *, int indent);
+void fz_print_path(fz_context *ctx, fz_path *, int indent);
/*
* Glyph cache
@@ -870,7 +870,7 @@ void fz_add_text(fz_context *ctx, fz_text *text, int gid, int ucs, float x, floa
void fz_free_text(fz_context *ctx, fz_text *text);
fz_rect fz_bound_text(fz_context *ctx, fz_text *text, fz_matrix ctm);
fz_text *fz_clone_text(fz_context *ctx, fz_text *old);
-void fz_debug_text(fz_context *ctx, fz_text*, int indent);
+void fz_print_text(fz_context *ctx, fz_text*, int indent);
/*
* The shading code uses gouraud shaded triangle meshes.
@@ -910,7 +910,7 @@ struct fz_shade_s
fz_shade *fz_keep_shade(fz_context *ctx, fz_shade *shade);
void fz_drop_shade(fz_context *ctx, fz_shade *shade);
void fz_free_shade_imp(fz_context *ctx, fz_storable *shade);
-void fz_debug_shade(fz_context *ctx, fz_shade *shade);
+void fz_print_shade(fz_context *ctx, fz_shade *shade);
fz_rect fz_bound_shade(fz_context *ctx, fz_shade *shade, fz_matrix ctm);
void fz_paint_shade(fz_context *ctx, fz_shade *shade, fz_matrix ctm, fz_pixmap *dest, fz_bbox bbox);
diff --git a/fitz/fitz.h b/fitz/fitz.h
index 85e1feea..33379df7 100644
--- a/fitz/fitz.h
+++ b/fitz/fitz.h
@@ -274,10 +274,10 @@ fz_context *fz_clone_context(fz_context *ctx);
void fz_free_context(fz_context *ctx);
/*
- fz_get_aa_level: Get the number of bits of antialiasing we are
+ fz_aa_level: Get the number of bits of antialiasing we are
using. Between 0 and 8.
*/
-int fz_get_aa_level(fz_context *ctx);
+int fz_aa_level(fz_context *ctx);
/*
fz_set_aa_level: Set the number of bits of antialiasing we should use.
@@ -1151,7 +1151,7 @@ int fz_pixmap_height(fz_context *ctx, fz_pixmap *pix);
fz_pixmap *fz_new_pixmap(fz_context *ctx, fz_colorspace *cs, int w, int h);
/*
- fz_new_pixmap_with_rect: Create a pixmap of a given size,
+ fz_new_pixmap_with_bbox: Create a pixmap of a given size,
location and pixel format.
The bounding box specifies the size of the created pixmap and
@@ -1164,7 +1164,7 @@ fz_pixmap *fz_new_pixmap(fz_context *ctx, fz_colorspace *cs, int w, int h);
bbox: Bounding box specifying location/size of created pixmap.
*/
-fz_pixmap *fz_new_pixmap_with_rect(fz_context *ctx, fz_colorspace *colorspace, fz_bbox bbox);
+fz_pixmap *fz_new_pixmap_with_bbox(fz_context *ctx, fz_colorspace *colorspace, fz_bbox bbox);
/*
fz_keep_pixmap: Take a reference to a pixmap.
@@ -1200,11 +1200,11 @@ fz_colorspace *fz_pixmap_colorspace(fz_context *ctx, fz_pixmap *pix);
int fz_pixmap_components(fz_context *ctx, fz_pixmap *pix);
/*
- fz_pixmap_pixels: Returns a pointer to the pixel data of a pixmap.
+ fz_pixmap_samples: Returns a pointer to the pixel data of a pixmap.
Returns the pointer. Does not throw exceptions.
*/
-unsigned char *fz_pixmap_pixels(fz_context *ctx, fz_pixmap *pix);
+unsigned char *fz_pixmap_samples(fz_context *ctx, fz_pixmap *pix);
/*
fz_clear_pixmap_with_value: Clears a pixmap with the given value.
@@ -1275,7 +1275,7 @@ void fz_unmultiply_pixmap(fz_context *ctx, fz_pixmap *pix);
void fz_convert_pixmap(fz_context *ctx, fz_pixmap *dst, fz_pixmap *src);
/*
- fz_save_pixmap: Save a pixmap out.
+ fz_write_pixmap: Save a pixmap out.
name: The prefix for the name of the pixmap. The pixmap will be saved
as "name.png" if the pixmap is RGB or Greyscale, "name.pam" otherwise.
@@ -1283,7 +1283,7 @@ void fz_convert_pixmap(fz_context *ctx, fz_pixmap *dst, fz_pixmap *src);
rgb: If non zero, the pixmap is converted to rgb (if possible) before
saving.
*/
-void fz_save_pixmap(fz_context *ctx, fz_pixmap *img, char *name, int rgb);
+void fz_write_pixmap(fz_context *ctx, fz_pixmap *img, char *name, int rgb);
/*
fz_write_pnm: Save a pixmap as a pnm
@@ -1815,15 +1815,15 @@ struct fz_outline_s
};
/*
- fz_debug_outline_xml: Dump the given outlines to stdout as (pseudo)
+ fz_print_outline_xml: Dump the given outlines to stdout as (pseudo)
XML.
*/
-void fz_debug_outline_xml(fz_context *ctx, fz_outline *outline);
+void fz_print_outline_xml(fz_context *ctx, fz_outline *outline);
/*
- fz_debug_outline: Dump the given outlines to stdout as text.
+ fz_print_outline: Dump the given outlines to stdout as text.
*/
-void fz_debug_outline(fz_context *ctx, fz_outline *outline);
+void fz_print_outline(fz_context *ctx, fz_outline *outline);
/*
fz_free_outline: Free hierarchical outline.
diff --git a/fitz/image_save.c b/fitz/image_save.c
index 29d3e8fc..614d18ce 100644
--- a/fitz/image_save.c
+++ b/fitz/image_save.c
@@ -1,6 +1,6 @@
#include "fitz-internal.h"
-void fz_save_pixmap(fz_context *ctx, fz_pixmap *img, char *file, int rgb)
+void fz_write_pixmap(fz_context *ctx, fz_pixmap *img, char *file, int rgb)
{
char name[1024];
fz_pixmap *converted = NULL;
@@ -10,7 +10,7 @@ void fz_save_pixmap(fz_context *ctx, fz_pixmap *img, char *file, int rgb)
if (rgb && img->colorspace && img->colorspace != fz_device_rgb)
{
- converted = fz_new_pixmap_with_rect(ctx, fz_device_rgb, fz_bound_pixmap(img));
+ converted = fz_new_pixmap_with_bbox(ctx, fz_device_rgb, fz_bound_pixmap(img));
fz_convert_pixmap(ctx, converted, img);
img = converted;
}
diff --git a/fitz/res_bitmap.c b/fitz/res_bitmap.c
index 25e88187..1bd2827d 100644
--- a/fitz/res_bitmap.c
+++ b/fitz/res_bitmap.c
@@ -89,7 +89,7 @@ int fz_pixmap_components(fz_context *ctx, fz_pixmap *pix)
return pix->n;
}
-unsigned char *fz_pixmap_pixels(fz_context *ctx, fz_pixmap *pix)
+unsigned char *fz_pixmap_samples(fz_context *ctx, fz_pixmap *pix)
{
if (!pix)
return NULL;
diff --git a/fitz/res_font.c b/fitz/res_font.c
index dd4e68da..438d5ba7 100644
--- a/fitz/res_font.c
+++ b/fitz/res_font.c
@@ -471,7 +471,7 @@ fz_render_ft_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm, int a
FT_Outline_Translate(&face->glyph->outline, -strength * 32, -strength * 32);
}
- fterr = FT_Render_Glyph(face->glyph, fz_get_aa_level(ctx) > 0 ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO);
+ fterr = FT_Render_Glyph(face->glyph, fz_aa_level(ctx) > 0 ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO);
if (fterr)
{
fz_warn(ctx, "freetype render glyph (gid %d): %s", gid, ft_error_string(fterr));
@@ -575,7 +575,7 @@ fz_render_ft_stroked_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix tr
FT_Stroker_Done(stroker);
- fterr = FT_Glyph_To_Bitmap(&glyph, fz_get_aa_level(ctx) > 0 ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO, 0, 1);
+ fterr = FT_Glyph_To_Bitmap(&glyph, fz_aa_level(ctx) > 0 ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO, 0, 1);
if (fterr)
{
fz_warn(ctx, "FT_Glyph_To_Bitmap: %s", ft_error_string(fterr));
@@ -756,7 +756,7 @@ fz_render_t3_glyph(fz_context *ctx, fz_font *font, int gid, fz_matrix trm, fz_co
bbox.x1++;
bbox.y1++;
- glyph = fz_new_pixmap_with_rect(ctx, model ? model : fz_device_gray, bbox);
+ glyph = fz_new_pixmap_with_bbox(ctx, model ? model : fz_device_gray, bbox);
fz_clear_pixmap(ctx, glyph);
ctm = fz_concat(font->t3matrix, trm);
@@ -808,7 +808,7 @@ fz_render_t3_glyph_direct(fz_context *ctx, fz_device *dev, fz_font *font, int gi
}
void
-fz_debug_font(fz_context *ctx, fz_font *font)
+fz_print_font(fz_context *ctx, fz_font *font)
{
printf("font '%s' {\n", font->name);
diff --git a/fitz/res_halftone.c b/fitz/res_halftone.c
index ec26571e..daad6e37 100644
--- a/fitz/res_halftone.c
+++ b/fitz/res_halftone.c
@@ -56,7 +56,7 @@ static unsigned char mono_ht[] =
0xF2, 0x72, 0xD2, 0x52, 0xFA, 0x7A, 0xDA, 0x5A, 0xF0, 0x70, 0xD0, 0x50, 0xF8, 0x78, 0xD8, 0x58
};
-fz_halftone *fz_get_default_halftone(fz_context *ctx, int num_comps)
+fz_halftone *fz_default_halftone(fz_context *ctx, int num_comps)
{
fz_halftone *ht = fz_new_halftone(ctx, num_comps);
assert(num_comps == 1); /* Only support 1 component for now */
@@ -172,7 +172,7 @@ fz_bitmap *fz_halftone_pixmap(fz_context *ctx, fz_pixmap *pix, fz_halftone *ht)
n = pix->n-1; /* Remove alpha */
if (ht == NULL)
{
- ht = fz_get_default_halftone(ctx, n);
+ ht = fz_default_halftone(ctx, n);
}
ht_line = fz_malloc(ctx, pix->w * n);
out = fz_new_bitmap(ctx, pix->w, pix->h, n);
diff --git a/fitz/res_path.c b/fitz/res_path.c
index 4964a09e..9c2072c1 100644
--- a/fitz/res_path.c
+++ b/fitz/res_path.c
@@ -316,7 +316,7 @@ fz_transform_path(fz_context *ctx, fz_path *path, fz_matrix ctm)
}
void
-fz_debug_path(fz_context *ctx, fz_path *path, int indent)
+fz_print_path(fz_context *ctx, fz_path *path, int indent)
{
float x, y;
int i = 0;
diff --git a/fitz/res_pixmap.c b/fitz/res_pixmap.c
index 7aaf8ce0..11875ad1 100644
--- a/fitz/res_pixmap.c
+++ b/fitz/res_pixmap.c
@@ -80,7 +80,7 @@ fz_new_pixmap(fz_context *ctx, fz_colorspace *colorspace, int w, int h)
}
fz_pixmap *
-fz_new_pixmap_with_rect(fz_context *ctx, fz_colorspace *colorspace, fz_bbox r)
+fz_new_pixmap_with_bbox(fz_context *ctx, fz_colorspace *colorspace, fz_bbox r)
{
fz_pixmap *pixmap;
pixmap = fz_new_pixmap(ctx, colorspace, r.x1 - r.x0, r.y1 - r.y0);
@@ -90,7 +90,7 @@ fz_new_pixmap_with_rect(fz_context *ctx, fz_colorspace *colorspace, fz_bbox r)
}
fz_pixmap *
-fz_new_pixmap_with_rect_and_data(fz_context *ctx, fz_colorspace *colorspace, fz_bbox r, unsigned char *samples)
+fz_new_pixmap_with_bbox_and_data(fz_context *ctx, fz_colorspace *colorspace, fz_bbox r, unsigned char *samples)
{
fz_pixmap *pixmap;
pixmap = fz_new_pixmap_with_data(ctx, colorspace, r.x1 - r.x0, r.y1 - r.y0, samples);
@@ -261,7 +261,7 @@ fz_alpha_from_gray(fz_context *ctx, fz_pixmap *gray, int luminosity)
assert(gray->n == 2);
- alpha = fz_new_pixmap_with_rect(ctx, NULL, fz_bound_pixmap(gray));
+ alpha = fz_new_pixmap_with_bbox(ctx, NULL, fz_bound_pixmap(gray));
dp = alpha->samples;
sp = gray->samples;
if (!luminosity)
diff --git a/fitz/res_shade.c b/fitz/res_shade.c
index f8f11a81..59e3887e 100644
--- a/fitz/res_shade.c
+++ b/fitz/res_shade.c
@@ -68,7 +68,7 @@ fz_bound_shade(fz_context *ctx, fz_shade *shade, fz_matrix ctm)
}
void
-fz_debug_shade(fz_context *ctx, fz_shade *shade)
+fz_print_shade(fz_context *ctx, fz_shade *shade)
{
int i, j, n;
float *vertex;
diff --git a/fitz/res_store.c b/fitz/res_store.c
index e85aead9..1de4f240 100644
--- a/fitz/res_store.c
+++ b/fitz/res_store.c
@@ -453,7 +453,7 @@ fz_drop_store_context(fz_context *ctx)
}
void
-fz_debug_store(fz_context *ctx)
+fz_print_store(fz_context *ctx)
{
fz_item *item, *next;
fz_store *store = ctx->store;
@@ -521,7 +521,7 @@ int fz_store_scavenge(fz_context *ctx, unsigned int size, int *phase)
#ifdef DEBUG_SCAVENGING
printf("Scavenging: store=%d size=%d phase=%d\n", store->size, size, *phase);
- fz_debug_store(ctx);
+ fz_print_store(ctx);
Memento_stats();
#endif
do
@@ -549,7 +549,7 @@ int fz_store_scavenge(fz_context *ctx, unsigned int size, int *phase)
{
#ifdef DEBUG_SCAVENGING
printf("scavenged: store=%d\n", store->size);
- fz_debug_store(ctx);
+ fz_print_store(ctx);
Memento_stats();
#endif
return 1;
@@ -559,7 +559,7 @@ int fz_store_scavenge(fz_context *ctx, unsigned int size, int *phase)
#ifdef DEBUG_SCAVENGING
printf("scavenging failed\n");
- fz_debug_store(ctx);
+ fz_print_store(ctx);
Memento_listBlocks();
#endif
return 0;
diff --git a/fitz/res_text.c b/fitz/res_text.c
index 433ff8f9..43b4471a 100644
--- a/fitz/res_text.c
+++ b/fitz/res_text.c
@@ -123,7 +123,7 @@ static int isxmlmeta(int c)
return c < 32 || c >= 128 || c == '&' || c == '<' || c == '>' || c == '\'' || c == '"';
}
-void fz_debug_text(fz_context *ctx, fz_text *text, int indent)
+void fz_print_text(fz_context *ctx, fz_text *text, int indent)
{
int i, n;
for (i = 0; i < text->len; i++)
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-19 19:15:51 +0000