Merge branch '8.14'

kleisauke · kleisauke · commit d59e8b93c140 · 2023-08-14T20:28:52.000+02:00
diff --git a/ChangeLog b/ChangeLog
@@ -26,6 +26,8 @@
 TBD 8.14.4
 
 - fix null-pointer dereference during svgload [kleisauke]
+- heif{load,save}: guard against NULL strings [kleisauke]
+- pdfiumload: fix rendering of pages with different sizes [DarthSim]
 
 20/7/23 8.14.3
 
diff --git a/libvips/foreign/heifload.c b/libvips/foreign/heifload.c
@@ -215,8 +215,9 @@ void
 vips__heif_error(struct heif_error *error)
 {
 	if (error->code)
-		vips_error("heif", "%s (%d.%d)", error->message, error->code,
-			error->subcode);
+		vips_error("heif", "%s (%d.%d)",
+			error->message ? error->message : "(null)",
+			error->code, error->subcode);
 }
 
 typedef struct _VipsForeignLoadHeifClass {
diff --git a/libvips/foreign/heifsave.c b/libvips/foreign/heifsave.c
@@ -427,9 +427,11 @@ vips_foreign_save_heif_write(struct heif_context *ctx,
 
 	struct heif_error error;
 
-	error.code = 0;
-	if (vips_target_write(heif->target, data, length))
-		error.code = -1;
+	error.code = heif_error_Ok;
+	if (vips_target_write(heif->target, data, length)) {
+		error.code = heif_error_Encoding_error;
+		error.subcode = heif_suberror_Cannot_write_output_data;
+	}
 
 	return error;
 }
diff --git a/libvips/foreign/pdfiumload.c b/libvips/foreign/pdfiumload.c
@@ -111,6 +111,8 @@ EOF
 #include <fpdf_edit.h>
 #include <fpdf_formfill.h>
 
+#define TILE_SIZE (4000)
+
 typedef struct _VipsForeignLoadPdf {
 	VipsForeignLoad parent_object;
 
@@ -331,8 +333,7 @@ vips_foreign_load_pdf_build(VipsObject *object)
 static VipsForeignFlags
 vips_foreign_load_pdf_get_flags_filename(const char *filename)
 {
-	/* We can't render any part of the page on demand, but we can render
-	 * separate pages. Might as well call ourselves partial.
+	/* We can render any part of the page on demand.
 	 */
 	return VIPS_FOREIGN_PARTIAL;
 }
@@ -401,9 +402,9 @@ vips_foreign_load_pdf_set_image(VipsForeignLoadPdf *pdf, VipsImage *out)
 	printf("vips_foreign_load_pdf_set_image: %p\n", pdf);
 #endif /*DEBUG*/
 
-	/* We render to a linecache, so fat strips work well.
+	/* We render to a tilecache, so it has to be SMALLTILE.
 	 */
-	if (vips_image_pipelinev(out, VIPS_DEMAND_STYLE_FATSTRIP, NULL))
+	if (vips_image_pipelinev(out, VIPS_DEMAND_STYLE_SMALLTILE, NULL))
 		return -1;
 
 	/* Extract and attach metadata. Set the old name too for compat.
@@ -579,6 +580,11 @@ vips_foreign_load_pdf_generate(VipsRegion *out_region,
 		if (VIPS_RECT_BOTTOM(&pdf->pages[i]) > r->top)
 			break;
 
+	/* Reset out region. Otherwise there might be parts of previous pages
+	 * left.
+	 */
+	vips_region_black(or);
+
 	top = r->top;
 	while (top < VIPS_RECT_BOTTOM(r)) {
 		VipsRect rect;
@@ -607,7 +613,9 @@ vips_foreign_load_pdf_generate(VipsRegion *out_region,
 		}
 
 		FPDF_RenderPageBitmap(bitmap, pdf->page,
-			0, 0, rect.width, rect.height,
+			pdf->pages[i].left - rect.left,
+			pdf->pages[i].top - rect.top,
+			pdf->pages[i].width, pdf->pages[i].height,
 			0, 0);
 
 		FPDF_FFLDraw(pdf->form, bitmap, pdf->page,
@@ -653,20 +661,15 @@ vips_foreign_load_pdf_load(VipsForeignLoad *load)
 		G_CALLBACK(vips_foreign_load_pdf_minimise), pdf);
 
 	vips_foreign_load_pdf_set_image(pdf, t[0]);
-	if (vips_image_generate(t[0],
-			NULL, vips_foreign_load_pdf_generate, NULL, pdf, NULL))
-		return -1;
 
-	/* PDFium does not like rendering parts of pages :-( always render
-	 * complete pages.
-	 */
-	if (vips_tilecache(t[0], &t[1],
-			"tile_width", pdf->pages[0].width,
-			"tile_height", pdf->pages[0].height,
-			"max_tiles", 1,
-			NULL))
-		return -1;
-	if (vips_image_write(t[1], load->real))
+	if (vips_image_generate(t[0],
+			NULL, vips_foreign_load_pdf_generate, NULL, pdf, NULL) ||
+		vips_tilecache(t[0], &t[1],
+			"tile_width", TILE_SIZE,
+			"tile_height", TILE_SIZE,
+			"max_tiles", 2 * (1 + t[0]->Xsize / TILE_SIZE),
+			NULL) ||
+		vips_image_write(t[1], load->real))
 		return -1;
 
 	return 0;
@@ -676,7 +679,7 @@ static void *
 vips_foreign_load_pdf_once_init(void *client)
 {
 	/* We must make the mutex on class init (not _build) since we
-	 * can lock ebven if build is not called.
+	 * can lock even if build is not called.
 	 */
 	vips_pdfium_mutex = vips_g_mutex_new();
 

Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,9 @@ void`
`215`	`215`	`vips__heif_error(struct heif_error *error)`
`216`	`216`	`{`
`217`	`217`	`if (error->code)`
`218`		`- vips_error("heif", "%s (%d.%d)", error->message, error->code,`
`219`		`- error->subcode);`
	`218`	`+ vips_error("heif", "%s (%d.%d)",`
	`219`	`+ error->message ? error->message : "(null)",`
	`220`	`+ error->code, error->subcode);`
`220`	`221`	`}`
`221`	`222`
`222`	`223`	`typedef struct _VipsForeignLoadHeifClass {`