From e14ae48a67fbfb574a551e8a88ee3362c73215ba Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Thu, 14 Mar 2019 13:33:11 +0000
Subject: [PATCH] fix heifsave on ubuntu 18.04

---
 configure.ac                    | 26 +++++++++++++++++++++++++-
 libvips/foreign/heifsave.c      | 13 ++++++++++++-
 test/test-suite/test_foreign.py | 17 ++++++++++-------
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index d0cac8b5..f0f6962a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -927,7 +927,31 @@ if test x"$with_heif" != x"no"; then
   )
 fi
 
-# exif/xmp profile support added in 1.2
+# heif_context_set_primary_image not in 1.1
+if test x"$with_heif" = x"yes"; then
+  save_LIBS="$LIBS"
+  LIBS="$LIBS $HEIF_LIBS"
+  AC_CHECK_FUNCS(heif_context_set_primary_image,[
+     AC_DEFINE(HAVE_HEIF_CONTEXT_SET_PRIMARY_IMAGE,1,
+	       [define if you have heif_context_set_primary_image.])
+   ],[]
+  )
+  LIBS="$save_LIBS"
+fi
+
+# heif_encoding_options_alloc not in 1.1
+if test x"$with_heif" = x"yes"; then
+  save_LIBS="$LIBS"
+  LIBS="$LIBS $HEIF_LIBS"
+  AC_CHECK_FUNCS(heif_encoding_options_alloc,[
+     AC_DEFINE(HAVE_HEIF_ENCODING_OPTIONS_ALLOC,1,
+	       [define if you have heif_encoding_options_alloc.])
+   ],[]
+  )
+  LIBS="$save_LIBS"
+fi
+
+# exif/xmp profile support not in 1.1
 if test x"$with_heif" = x"yes"; then
   save_LIBS="$LIBS"
   LIBS="$LIBS $HEIF_LIBS"
diff --git a/libvips/foreign/heifsave.c b/libvips/foreign/heifsave.c
index 8187a467..ad03cfb6 100644
--- a/libvips/foreign/heifsave.c
+++ b/libvips/foreign/heifsave.c
@@ -191,22 +191,32 @@ vips_foreign_save_heif_write_page( VipsForeignSaveHeif *heif, int page )
 	}
 #endif /*HAVE_HEIF_COLOR_PROFILE*/
 
+#ifdef HAVE_HEIF_ENCODING_OPTIONS_ALLOC
 	options = heif_encoding_options_alloc();
 	/* FIXME .. should be an option, though I don't know of any way to
 	 * test it
 	 */
 	options->save_alpha_channel = 1;
+#else /*!HAVE_HEIF_ENCODING_OPTIONS_ALLOC*/
+	options = NULL;
+#endif /*HAVE_HEIF_ENCODING_OPTIONS_ALLOC*/
+
 #ifdef DEBUG
 	printf( "encoding ..\n" ); 
 #endif /*DEBUG*/
 	error = heif_context_encode_image( heif->ctx, 
-		heif->img, heif->encoder, NULL, &heif->handle );
+		heif->img, heif->encoder, options, &heif->handle );
+
+#ifdef HAVE_HEIF_ENCODING_OPTIONS_ALLOC
 	heif_encoding_options_free( options );
+#endif /*HAVE_HEIF_ENCODING_OPTIONS_ALLOC*/
+
 	if( error.code ) {
 		vips__heif_error( &error );
 		return( -1 );
 	}
 
+#ifdef HAVE_HEIF_CONTEXT_SET_PRIMARY_IMAGE
 	if( vips_image_get_typeof( save->ready, "heif-primary" ) ) { 
 		int primary;
 
@@ -223,6 +233,7 @@ vips_foreign_save_heif_write_page( VipsForeignSaveHeif *heif, int page )
 			}
 		}
 	}
+#endif /*HAVE_HEIF_CONTEXT_SET_PRIMARY_IMAGE*/
 
 	if( !save->strip &&
 		vips_foreign_save_heif_write_metadata( heif ) )
diff --git a/test/test-suite/test_foreign.py b/test/test-suite/test_foreign.py
index 39964ca5..9af31842 100644
--- a/test/test-suite/test_foreign.py
+++ b/test/test-suite/test_foreign.py
@@ -871,15 +871,18 @@ class TestForeign:
         # the exif test will need us to be able to walk the header,
         # we can't just check exif-data
 
+        # libheif 1.1 (on ubuntu 18.04, current LTS) does not support exif
+        # write, so this test is commented out
+
         # test that exif changes change the output of heifsave
         # first make sure we have exif support
-        z = pyvips.Image.new_from_file(JPEG_FILE)
-        if z.get_typeof("exif-ifd0-Orientation") != 0:
-            x = self.colour.copy()
-            x.set("exif-ifd0-Make", "banana")
-            buf = x.heifsave_buffer()
-            y = pyvips.Image.new_from_buffer(buf, "")
-            assert y.get("exif-ifd0-Make").split(" ")[0] == "banana"
+        #z = pyvips.Image.new_from_file(JPEG_FILE)
+        #if z.get_typeof("exif-ifd0-Orientation") != 0:
+        #    x = self.colour.copy()
+        #    x.set("exif-ifd0-Make", "banana")
+        #    buf = x.heifsave_buffer()
+        #    y = pyvips.Image.new_from_buffer(buf, "")
+        #    assert y.get("exif-ifd0-Make").split(" ")[0] == "banana"
 
 if __name__ == '__main__':
     pytest.main()