diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pdf.zig | 62 | ||||
| -rw-r--r-- | src/pdf_bridge.c | 103 | ||||
| -rw-r--r-- | src/pdf_bridge.h | 43 |
3 files changed, 65 insertions, 143 deletions
diff --git a/src/pdf.zig b/src/pdf.zig index 30828f92..a68bf48a 100644 --- a/src/pdf.zig +++ b/src/pdf.zig @@ -893,12 +893,7 @@ pub const Document = struct { if (c.pardes_pdf_measure_render( document.handle, @intCast(page), - bounded.dpi, - bounded.minimum_width, - bounded.minimum_height, - bounded.max_dimension, - bounded.display_width, - bounded.display_height, + &bounded, &raw_layout, ) != c.PARDES_PDF_OK) return error.RenderFailed; // The page's shape, not an allocation: a page taller than @@ -932,12 +927,7 @@ pub const Document = struct { const status = c.pardes_pdf_render_into( document.handle, @intCast(page), - bounded.dpi, - bounded.minimum_width, - bounded.minimum_height, - bounded.max_dimension, - bounded.display_width, - bounded.display_height, + &bounded, highlight_ptr, highlights.len, rgba.ptr, @@ -975,12 +965,7 @@ pub const Document = struct { if (c.pardes_pdf_paint_highlights( document.handle, @intCast(page), - bounded.dpi, - bounded.minimum_width, - bounded.minimum_height, - bounded.max_dimension, - bounded.display_width, - bounded.display_height, + &bounded, if (highlights.len == 0) null else @ptrCast(highlights.ptr), highlights.len, rgba.ptr, @@ -1010,12 +995,7 @@ pub const Document = struct { if (c.pardes_pdf_highlight_rows( document.handle, @intCast(page), - bounded.dpi, - bounded.minimum_width, - bounded.minimum_height, - bounded.max_dimension, - bounded.display_width, - bounded.display_height, + &bounded, if (highlights.len == 0) null else @ptrCast(highlights.ptr), highlights.len, &row_start, @@ -1024,20 +1004,13 @@ pub const Document = struct { return .{ .start = @intCast(row_start), .end = @intCast(row_end) }; } - const BoundedRequest = struct { - dpi: c_int, - minimum_width: c_int, - minimum_height: c_int, - max_dimension: c_int, - display_width: c_int, - display_height: c_int, - }; - + /// `request` as the bridge takes it, refused when the page or a size is + /// out of range. fn boundedRequest( document: *Document, page: usize, request: RenderRequest, - ) !BoundedRequest { + ) !c.pardes_pdf_request { _ = try document.checkedPage(page); if (request.dpi == 0 or request.max_dimension == 0 or request.max_dimension > absolute_max_render_dimension) @@ -1794,19 +1767,9 @@ test "RGBA allocation and buffer-validation failures leave the document renderab document.render(failing.allocator(), 0, .{}, &.{}), ); - const request: RenderRequest = .{}; + const request = try document.boundedRequest(0, .{}); var raw_layout: c.pardes_pdf_raster_layout = std.mem.zeroes(c.pardes_pdf_raster_layout); - try std.testing.expectEqual(c.PARDES_PDF_OK, c.pardes_pdf_measure_render( - document.handle, - 0, - request.dpi, - request.minimum_width, - request.minimum_height, - request.max_dimension, - 0, - 0, - &raw_layout, - )); + try std.testing.expectEqual(c.PARDES_PDF_OK, c.pardes_pdf_measure_render(document.handle, 0, &request, &raw_layout)); const layout = try checkedRasterLayout(raw_layout); { const scratch = try std.testing.allocator.alloc(u8, layout.len); @@ -1815,12 +1778,7 @@ test "RGBA allocation and buffer-validation failures leave the document renderab try std.testing.expectEqual(c.PARDES_PDF_ERROR, c.pardes_pdf_render_into( document.handle, 0, - request.dpi, - request.minimum_width, - request.minimum_height, - request.max_dimension, - 0, - 0, + &request, null, 0, scratch.ptr, 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 || diff --git a/src/pdf_bridge.h b/src/pdf_bridge.h index 3ab87376..69678556 100644 --- a/src/pdf_bridge.h +++ b/src/pdf_bridge.h @@ -42,6 +42,21 @@ typedef struct pardes_pdf_raster_layout { size_t samples_len; } pardes_pdf_raster_layout; +/* + * One raster request (pdf.zig's RenderRequest, bounded): every function + * that rasterizes a page, paints over it or measures it takes the same one + * and computes the same raster from it (see pardes_pdf_measure_render). + * Zero minimum or display sizes are none. + */ +typedef struct pardes_pdf_request { + int dpi; + int minimum_width; + int minimum_height; + int max_dimension; + int display_width; + int display_height; +} pardes_pdf_request; + typedef struct pardes_pdf_page_size { float width; float height; @@ -241,12 +256,7 @@ int pardes_pdf_get_page_size( int pardes_pdf_measure_render( pardes_pdf_document *document, int page, - 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 ); @@ -266,12 +276,7 @@ int pardes_pdf_measure_render( int pardes_pdf_render_into( pardes_pdf_document *document, int page, - 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, @@ -292,12 +297,7 @@ int pardes_pdf_render_into( int pardes_pdf_paint_highlights( pardes_pdf_document *document, int page, - 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, @@ -317,12 +317,7 @@ int pardes_pdf_paint_highlights( int pardes_pdf_highlight_rows( pardes_pdf_document *document, int page, - 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, |
