diff options
| author | Robin Watts <robin.watts@artifex.com> | 2012-11-29 13:47:38 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2012-11-29 14:41:33 +0000 |
| commit | 82b666579e02a4d35b3087b79353373c355d107f (patch) | |
| tree | 8a9a6b93ecbe16a663a015f233e824017e02ad50 /fitz | |
| parent | c3fa0d45ff96eefe6effaeffc45516c6f85587bd (diff) | |
| download | mupdf-82b666579e02a4d35b3087b79353373c355d107f.tar.xz | |
Bug 693463: Various small fixes.
Thanks to zeniko for these.
Use otf as extension for opentype fonts.
fz_clampi should take ints, not floats!
Fix typo in prototype.
Squash unwanted warning.
Remove magic number in favour of #define.
Reset generation numbers when renumbering.
Diffstat (limited to 'fitz')
| -rw-r--r-- | fitz/dev_text.c | 2 | ||||
| -rw-r--r-- | fitz/dev_trace.c | 2 | ||||
| -rw-r--r-- | fitz/fitz.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fitz/dev_text.c b/fitz/dev_text.c index 280d1b55..a5d765eb 100644 --- a/fitz/dev_text.c +++ b/fitz/dev_text.c @@ -714,7 +714,7 @@ fz_print_text_page_xml(fz_context *ctx, FILE *out, fz_text_page *page) break; } fprintf(out, "\"/>\n"); - } + } fprintf(out, "</span>\n"); } fprintf(out, "</line>\n"); diff --git a/fitz/dev_trace.c b/fitz/dev_trace.c index 514ee780..a56cc67b 100644 --- a/fitz/dev_trace.c +++ b/fitz/dev_trace.c @@ -114,7 +114,7 @@ fz_trace_stroke_path(fz_device *dev, fz_path *path, fz_stroke_state *stroke, fz_ static void fz_trace_clip_path(fz_device *dev, fz_path *path, fz_rect *rect, int even_odd, fz_matrix ctm) { - printf("<clip_path "); + printf("<clip_path"); if (even_odd) printf(" winding=\"eofill\""); else diff --git a/fitz/fitz.h b/fitz/fitz.h index 0ea3cb2c..314fadd6 100644 --- a/fitz/fitz.h +++ b/fitz/fitz.h @@ -166,7 +166,7 @@ static inline float fz_clamp(float f, float min, float max) return (f > min ? (f < max ? f : max) : min); } -static inline int fz_clampi(int i, float min, float max) +static inline int fz_clampi(int i, int min, int max) { return (i > min ? (i < max ? i : max) : min); } |