Use fz_quad type in structured text and selection/highlighting.

3 files changed, 9 insertions, 9 deletions

diff --git a/include/mupdf/fitz/structured-text.h b/include/mupdf/fitz/structured-text.h
index 0ad6cd3c..44219f4d 100644
--- a/include/mupdf/fitz/structured-text.h
+++ b/include/mupdf/fitz/structured-text.h
@@ -95,7 +95,7 @@ struct fz_stext_char_s
 {
 	int c;
 	fz_point origin;
-	fz_rect bbox;
+	fz_quad quad;
 	float size;
 	fz_font *font;
 	fz_stext_char *next;
@@ -141,16 +141,16 @@ void fz_print_stext_page_as_text(fz_context *ctx, fz_output *out, fz_stext_page
 /*
 	fz_search_stext_page: Search for occurrence of 'needle' in text page.
 
-	Return the number of hits and store hit bboxes in the passed in array.
+	Return the number of hits and store hit quads in the passed in array.
 
 	NOTE: This is an experimental interface and subject to change without notice.
 */
-int fz_search_stext_page(fz_context *ctx, fz_stext_page *text, const char *needle, fz_rect *hit_bbox, int hit_max);
+int fz_search_stext_page(fz_context *ctx, fz_stext_page *text, const char *needle, fz_quad *quads, int max_quads);
 
 /*
-	fz_highlight_selection: Return a list of rectangles to highlight lines inside the selection points.
+	fz_highlight_selection: Return a list of quads to highlight lines inside the selection points.
 */
-int fz_highlight_selection(fz_context *ctx, fz_stext_page *page, fz_point a, fz_point b, fz_rect *hit_bbox, int hit_max);
+int fz_highlight_selection(fz_context *ctx, fz_stext_page *page, fz_point a, fz_point b, fz_quad *quads, int max_quads);
 
 /*
 	fz_copy_selection: Return a newly allocated UTF-8 string with the text for a given selection.
diff --git a/include/mupdf/fitz/util.h b/include/mupdf/fitz/util.h
index 49409cbb..05119fd5 100644
--- a/include/mupdf/fitz/util.h
+++ b/include/mupdf/fitz/util.h
@@ -55,9 +55,9 @@ fz_buffer *fz_new_buffer_from_display_list(fz_context *ctx, fz_display_list *lis
 	Record the hits in the hit_bbox array and return the number of hits.
 	Will stop looking once it has filled hit_max rectangles.
 */
-int fz_search_page(fz_context *ctx, fz_page *page, const char *needle, fz_rect *hit_bbox, int hit_max);
-int fz_search_page_number(fz_context *ctx, fz_document *doc, int number, const char *needle, fz_rect *hit_bbox, int hit_max);
-int fz_search_display_list(fz_context *ctx, fz_display_list *list, const char *needle, fz_rect *hit_bbox, int hit_max);
+int fz_search_page(fz_context *ctx, fz_page *page, const char *needle, fz_quad *hit_bbox, int hit_max);
+int fz_search_page_number(fz_context *ctx, fz_document *doc, int number, const char *needle, fz_quad *hit_bbox, int hit_max);
+int fz_search_display_list(fz_context *ctx, fz_display_list *list, const char *needle, fz_quad *hit_bbox, int hit_max);
 
 /*
 	Parse an SVG document into a display-list.
diff --git a/include/mupdf/pdf/annot.h b/include/mupdf/pdf/annot.h
index d616436c..869678c0 100644
--- a/include/mupdf/pdf/annot.h
+++ b/include/mupdf/pdf/annot.h
@@ -184,7 +184,7 @@ void pdf_set_annot_quadding(fz_context *ctx, pdf_annot *annot, int q);
 
 void pdf_set_annot_quad_points(fz_context *ctx, pdf_annot *annot, int n, const float *v);
 void pdf_clear_annot_quad_points(fz_context *ctx, pdf_annot *annot);
-void pdf_add_annot_quad_point(fz_context *ctx, pdf_annot *annot, fz_rect bbox);
+void pdf_add_annot_quad_point(fz_context *ctx, pdf_annot *annot, fz_quad quad);
 
 void pdf_set_annot_ink_list(fz_context *ctx, pdf_annot *annot, int n, const int *count, const fz_point *v);
 void pdf_clear_annot_ink_list(fz_context *ctx, pdf_annot *annot);