diff options
| author | Tor Andersson <tor@ghostscript.com> | 2010-03-09 01:26:54 +0100 |
|---|---|---|
| committer | Tor Andersson <tor@ghostscript.com> | 2010-03-09 01:26:54 +0100 |
| commit | 5e08ea8f3021c5666b75fd1269049998d978cc01 (patch) | |
| tree | 6166b3eba1a9636c730ed3b2e6c77d10561f2f90 /fitz/fitz_base.h | |
| parent | 9737242baff66bed4937f9efede3befbaee8e792 (diff) | |
| download | mupdf-5e08ea8f3021c5666b75fd1269049998d978cc01.tar.xz | |
Resolve conflicts.
Diffstat (limited to 'fitz/fitz_base.h')
| -rw-r--r-- | fitz/fitz_base.h | 5 |
1 files changed, 1 insertions, 4 deletions
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 |