diff options
Diffstat (limited to 'src/pdf_bridge.c')
| -rw-r--r-- | src/pdf_bridge.c | 103 |
1 files changed, 36 insertions, 67 deletions
diff --git a/src/pdf_bridge.c b/src/pdf_bridge.c index a35dfa71..383e56fb 100644 --- a/src/pdf_bridge.c +++ b/src/pdf_bridge.c @@ -588,16 +588,21 @@ pardes_pdf_get_page_size( return PARDES_PDF_OK; } +/* Every size in range; zero minimums and display sizes are none. */ +static int +pardes_pdf_request_ok(const pardes_pdf_request *request) +{ + return request != NULL && request->dpi >= 1 && + request->minimum_width >= 0 && request->minimum_height >= 0 && + request->max_dimension >= 1 && + request->display_width >= 0 && request->display_height >= 0; +} + static void pardes_pdf_render_geometry( pardes_pdf_document *document, int page_number, - int dpi, - int minimum_width, - int minimum_height, - int max_dimension, - int display_width, - int display_height, + const pardes_pdf_request *request, fz_matrix *ctm_out, fz_irect *bbox_out) { @@ -614,11 +619,11 @@ pardes_pdf_render_geometry( page_height = bounds.y1 - bounds.y0; if (!(page_width > 0.0f) || !(page_height > 0.0f)) fz_throw(document->ctx, FZ_ERROR_FORMAT, "PDF page has empty bounds"); - scale = (float)dpi / 72.0f; - if (minimum_width > 0) - scale = fmaxf(scale, (float)minimum_width / page_width); - if (minimum_height > 0) - scale = fmaxf(scale, (float)minimum_height / page_height); + scale = (float)request->dpi / 72.0f; + if (request->minimum_width > 0) + scale = fmaxf(scale, (float)request->minimum_width / page_width); + if (request->minimum_height > 0) + scale = fmaxf(scale, (float)request->minimum_height / page_height); /* * A row of the raster is never longer than max_dimension: every band of * the page carries whole rows. The height is held to it too, as the @@ -627,14 +632,14 @@ pardes_pdf_render_geometry( * drawn in bands at the display's own resolution (pdf_view.zig) instead * of being squeezed into max_dimension rows and blown up again, blurred. */ - if (page_width * scale > (float)max_dimension) - scale = (float)max_dimension / page_width; - if (display_width > 0) - shown = fmaxf(shown, (float)display_width / page_width); - if (display_height > 0) - shown = fmaxf(shown, (float)display_height / page_height); - if (page_height * scale > (float)max_dimension) - scale = fminf(scale, fmaxf((float)max_dimension / page_height, shown)); + if (page_width * scale > (float)request->max_dimension) + scale = (float)request->max_dimension / page_width; + if (request->display_width > 0) + shown = fmaxf(shown, (float)request->display_width / page_width); + if (request->display_height > 0) + shown = fmaxf(shown, (float)request->display_height / page_height); + if (page_height * scale > (float)request->max_dimension) + scale = fminf(scale, fmaxf((float)request->max_dimension / page_height, shown)); if (page_height * scale > (float)PARDES_PDF_MAX_RASTER_ROWS) scale = (float)PARDES_PDF_MAX_RASTER_ROWS / page_height; @@ -654,12 +659,7 @@ int pardes_pdf_measure_render( pardes_pdf_document *document, int page_number, - int dpi, - int minimum_width, - int minimum_height, - int max_dimension, - int display_width, - int display_height, + const pardes_pdf_request *request, pardes_pdf_raster_layout *out) { fz_context *ctx; @@ -674,17 +674,13 @@ pardes_pdf_measure_render( return PARDES_PDF_ERROR; memset(out, 0, sizeof(*out)); if (document == NULL || page_number < 0 || - page_number >= document->page_count || dpi < 1 || - minimum_width < 0 || minimum_height < 0 || max_dimension < 1 || - display_width < 0 || display_height < 0) + page_number >= document->page_count || !pardes_pdf_request_ok(request)) return PARDES_PDF_ERROR; ctx = document->ctx; fz_try(ctx) { - pardes_pdf_render_geometry(document, page_number, dpi, - minimum_width, minimum_height, max_dimension, - display_width, display_height, &ctm, &bbox); + pardes_pdf_render_geometry(document, page_number, request, &ctm, &bbox); width = fz_irect_width(bbox); height = fz_irect_height(bbox); if (width > INT_MAX / 4) @@ -761,12 +757,7 @@ int pardes_pdf_render_into( pardes_pdf_document *document, int page_number, - int dpi, - int minimum_width, - int minimum_height, - int max_dimension, - int display_width, - int display_height, + const pardes_pdf_request *request, const pardes_pdf_highlight *highlights, size_t highlight_count, unsigned char *samples, @@ -785,9 +776,7 @@ pardes_pdf_render_into( fz_irect bbox; if (document == NULL || page_number < 0 || - page_number >= document->page_count || dpi < 1 || - minimum_width < 0 || minimum_height < 0 || max_dimension < 1 || - display_width < 0 || display_height < 0 || + page_number >= document->page_count || !pardes_pdf_request_ok(request) || (highlight_count != 0 && highlights == NULL) || highlight_count > PARDES_PDF_MAX_RESULT_QUADS || samples == NULL || width < 1 || height < 1 || stride < 1 || width > INT_MAX / 4 || @@ -802,9 +791,7 @@ pardes_pdf_render_into( fz_var(device); fz_try(ctx) { - pardes_pdf_render_geometry(document, page_number, dpi, - minimum_width, minimum_height, max_dimension, - display_width, display_height, &ctm, &bbox); + pardes_pdf_render_geometry(document, page_number, request, &ctm, &bbox); if (fz_irect_width(bbox) != width || fz_irect_height(bbox) != height) fz_throw(ctx, FZ_ERROR_ARGUMENT, @@ -921,12 +908,7 @@ int pardes_pdf_paint_highlights( pardes_pdf_document *document, int page_number, - int dpi, - int minimum_width, - int minimum_height, - int max_dimension, - int display_width, - int display_height, + const pardes_pdf_request *request, const pardes_pdf_highlight *highlights, size_t highlight_count, unsigned char *samples, @@ -944,9 +926,7 @@ pardes_pdf_paint_highlights( fz_irect bbox; if (document == NULL || page_number < 0 || - page_number >= document->page_count || dpi < 1 || - minimum_width < 0 || minimum_height < 0 || max_dimension < 1 || - display_width < 0 || display_height < 0 || + page_number >= document->page_count || !pardes_pdf_request_ok(request) || (highlight_count != 0 && highlights == NULL) || highlight_count > PARDES_PDF_MAX_RESULT_QUADS || samples == NULL || width < 1 || height < 1 || width > INT_MAX / 4 || stride != width * 4 || @@ -962,9 +942,7 @@ pardes_pdf_paint_highlights( fz_var(device); fz_try(ctx) { - pardes_pdf_render_geometry(document, page_number, dpi, - minimum_width, minimum_height, max_dimension, - display_width, display_height, &ctm, &bbox); + pardes_pdf_render_geometry(document, page_number, request, &ctm, &bbox); if (fz_irect_width(bbox) != width || fz_irect_height(bbox) != height) fz_throw(ctx, FZ_ERROR_ARGUMENT, "PDF raster layout changed between measure and paint"); @@ -993,12 +971,7 @@ int pardes_pdf_highlight_rows( pardes_pdf_document *document, int page_number, - int dpi, - int minimum_width, - int minimum_height, - int max_dimension, - int display_width, - int display_height, + const pardes_pdf_request *request, const pardes_pdf_highlight *highlights, size_t highlight_count, int *row_start, @@ -1015,18 +988,14 @@ pardes_pdf_highlight_rows( return PARDES_PDF_ERROR; *row_start = *row_end = 0; if (document == NULL || page_number < 0 || - page_number >= document->page_count || dpi < 1 || - minimum_width < 0 || minimum_height < 0 || max_dimension < 1 || - display_width < 0 || display_height < 0 || + page_number >= document->page_count || !pardes_pdf_request_ok(request) || (highlight_count != 0 && highlights == NULL)) return PARDES_PDF_ERROR; ctx = document->ctx; fz_try(ctx) { - pardes_pdf_render_geometry(document, page_number, dpi, - minimum_width, minimum_height, max_dimension, - display_width, display_height, &ctm, &bbox); + pardes_pdf_render_geometry(document, page_number, request, &ctm, &bbox); for (i = 0; i < highlight_count; ++i) { fz_rect r; if (highlights[i].rgba[3] == 0 || |
