- try conditional instead

davidbyttow · Nov 22, 2021 · b8a88cd · b8a88cd
1 parent d700ea7
commit b8a88cd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/vips/foreign.c b/vips/foreign.c
@@ -68,9 +68,13 @@ int load_image_buffer(LoadParams *params, void *buf, size_t len,
     code = vips_heifload_buffer(buf, len, out, "page", params->page, "n",
                                 params->n, "thumbnail", params->heifThumbnail,
                                 "autorotate", params->autorotate, NULL);
-  } else if (imageType == JP2K) {
+
+  }
+  #if (VIPS_MAJOR_VERSION >= 8) && (VIPS_MINOR_VERSION >= 11)
+  else if (imageType == JP2K) {
        code = vips_jp2kload_buffer(buf, len, out, "page", params->page, NULL);
   }
+  #endif
 
   return code;
 }

diff --git a/vips/govips.go b/vips/govips.go
@@ -76,8 +76,8 @@ func Startup(config *Config) {
 		panic("govips requires libvips version 8.10+")
 	}
 
-	if C.VIPS_MAJOR_VERSION == 8 && C.VIPS_MINOR_VERSION < 11 {
-		panic("govips requires libvips version 8.11+")
+	if C.VIPS_MAJOR_VERSION == 8 && C.VIPS_MINOR_VERSION < 10 {
+		panic("govips requires libvips version 8.10+")
 	}
 
 	cName := C.CString("govips")

diff --git a/vips/image_test.go b/vips/image_test.go
@@ -925,6 +925,9 @@ func TestImageRef_AVIF(t *testing.T) {
 }
 
 func TestImageRef_JP2K(t *testing.T) {
+	if MajorVersion == 8 && MinorVersion < 11 {
+		t.Skip("JPEG2000 is only supported in vips 8.11+")
+	}
 	Startup(nil)
 
 	raw, err := ioutil.ReadFile(resources + "jp2k-orientation-6.jp2")