From 82b666579e02a4d35b3087b79353373c355d107f Mon Sep 17 00:00:00 2001
From: Robin Watts <robin.watts@artifex.com>
Date: Thu, 29 Nov 2012 13:47:38 +0000
Subject: 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.
---
 fitz/dev_text.c  | 2 +-
 fitz/dev_trace.c | 2 +-
 fitz/fitz.h      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'fitz')

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);
 }
-- 
cgit v1.2.3