From 7a5a3a31fc0b3afe8899b497d7eba7f03e9ea1a9 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 15 Sep 2020 12:08:55 +0100
Subject: [PATCH 1/2] block doxy latex output too

---
 cplusplus/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cplusplus/.gitignore b/cplusplus/.gitignore
index 9a26521e..9b9b0470 100644
--- a/cplusplus/.gitignore
+++ b/cplusplus/.gitignore
@@ -1,4 +1,5 @@
 Doxyfile
 doxygen.stamp
 html/
+latex/
 

From dc88d6c1e1310ded1673360a86260b8e8e0fc37b Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Thu, 17 Sep 2020 17:07:08 +0100
Subject: [PATCH 2/2] fix dzsave iiif dimensions

dzsave in iiif mode could set info.json dimensions off by one

thanks Linden6

see https://github.com/libvips/libvips/issues/1818
---
 ChangeLog                | 1 +
 libvips/foreign/dzsave.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f087a885..2c00b499 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 - fix tiff thumbnail from buffer and source [vansante]
 - in jpegsave, don't set JFIF resolution if we set EXIF resolution
 - bump minimum libheif version to 1.3 [lovell]
+- dzsave in iiif mode could set info.json dimensions off by one [Linden6]
 
 9/8/20 started 8.10.1
 - fix markdown -> xml conversion in doc generation
diff --git a/libvips/foreign/dzsave.c b/libvips/foreign/dzsave.c
index c21b573b..9b85d622 100644
--- a/libvips/foreign/dzsave.c
+++ b/libvips/foreign/dzsave.c
@@ -1049,8 +1049,8 @@ write_json( VipsForeignSaveDz *dz )
 	gsf_output_printf( out, 
 		"  \"width\": %d,\n"
 		"  \"height\": %d\n", 
-			dz->layer->image->Xsize,
-			dz->layer->image->Ysize );
+			dz->layer->width,
+			dz->layer->height );
 
 	gsf_output_printf( out, 
 		"}\n" );