From 5e08ea8f3021c5666b75fd1269049998d978cc01 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 9 Mar 2010 01:26:54 +0100 Subject: Resolve conflicts. --- fitz/fitz_base.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'fitz/fitz_base.h') diff --git a/fitz/fitz_base.h b/fitz/fitz_base.h index 8c683114..edecefd1 100644 --- a/fitz/fitz_base.h +++ b/fitz/fitz_base.h @@ -323,8 +323,5 @@ void fz_freepixmap(fz_pixmap *map); fz_pixmap * fz_scalepixmap(fz_pixmap *src, int xdenom, int ydenom); -/* needed for tiled rendering */ -fz_error fz_newscaledpixmap(fz_pixmap **dstp, int w, int h, int n, int xdenom, int ydenom); -fz_error fz_scalepixmaptile(fz_pixmap *dstp, int xoffs, int yoffs, - fz_pixmap *tile, int xdenom, int ydenom); +#endif -- cgit v1.2.3