@ohos-ports/sharp 0.34.5-beta.8 → 0.35.5-beta.1

package/src/binding.gyp

@@ -1,87 +1,11 @@
 # Copyright 2013 Lovell Fuller and others.
 # SPDX-License-Identifier: Apache-2.0
-
+# HarmonyOS (openharmony) migration: minimal binding.gyp linking against the
+# HarmonyOS-built libvips-cpp 8.18.7 (vips-full prefix, all formats) instead of
+# the glibc prebuilt package / Round-1 cmd-pkgs 8.18.3.
 {
-  'variables': {
-    'vips_version': '<!(node -p "require(\'../lib/libvips\').minimumLibvipsVersion")',
-    'platform_and_arch': '<!(node -p "require(\'../lib/libvips\').buildPlatformArch()")',
-    'sharp_libvips_version': '<!(node -p "require(\'../package.json\').optionalDependencies[\'@img/sharp-libvips-<(platform_and_arch)\']")',
-    'sharp_libvips_yarn_locator': '<!(node -p "require(\'../lib/libvips\').yarnLocator()")',
-    'sharp_libvips_include_dir': '<!(node -p "require(\'../lib/libvips\').buildSharpLibvipsIncludeDir()")',
-    'sharp_libvips_cplusplus_dir': '<!(node -p "require(\'../lib/libvips\').buildSharpLibvipsCPlusPlusDir()")',
-    'sharp_libvips_lib_dir': '<!(node -p "require(\'../lib/libvips\').buildSharpLibvipsLibDir()")'
-  },
   'targets': [{
-    'target_name': 'libvips-cpp-<(vips_version)',
-    'conditions': [
-      ['OS == "win"', {
-        # Build libvips C++ binding for Windows due to MSVC std library ABI changes
-        'type': 'shared_library',
-        'defines': [
-          '_VIPS_PUBLIC=__declspec(dllexport)',
-          '_ALLOW_KEYWORD_MACROS',
-          'G_DISABLE_ASSERT',
-          'G_DISABLE_CAST_CHECKS',
-          'G_DISABLE_CHECKS'
-        ],
-        'sources': [
-          '<(sharp_libvips_cplusplus_dir)/VConnection.cpp',
-          '<(sharp_libvips_cplusplus_dir)/VError.cpp',
-          '<(sharp_libvips_cplusplus_dir)/VImage.cpp',
-          '<(sharp_libvips_cplusplus_dir)/VInterpolate.cpp',
-          '<(sharp_libvips_cplusplus_dir)/VRegion.cpp'
-        ],
-        'include_dirs': [
-          '<(sharp_libvips_include_dir)',
-          '<(sharp_libvips_include_dir)/glib-2.0',
-          '<(sharp_libvips_lib_dir)/glib-2.0/include'
-        ],
-        'link_settings': {
-          'library_dirs': [
-            '<(sharp_libvips_lib_dir)'
-          ],
-          'libraries': [
-            'libvips.lib'
-          ],
-        },
-        'configurations': {
-          'Release': {
-            'msvs_settings': {
-              'VCCLCompilerTool': {
-                "AdditionalOptions": [
-                  "/std:c++17"
-                ],
-                'ExceptionHandling': 1,
-                'Optimization': 1,
-                'WholeProgramOptimization': 'true'
-              },
-              'VCLibrarianTool': {
-                'AdditionalOptions': [
-                  '/LTCG:INCREMENTAL'
-                ]
-              },
-              'VCLinkerTool': {
-                'ImageHasSafeExceptionHandlers': 'false',
-                'OptimizeReferences': 2,
-                'EnableCOMDATFolding': 2,
-                'LinkIncremental': 1,
-                'AdditionalOptions': [
-                  '/LTCG:INCREMENTAL'
-                ]
-              }
-            },
-            'msvs_disabled_warnings': [
-              4275
-            ]
-          }
-        }
-      }, {
-        # Ignore this target for non-Windows
-        'type': 'none'
-      }]
-    ]
-  }, {
-    'target_name': 'sharp-<(platform_and_arch)',
+    'target_name': 'sharp-linux-arm64-0.35.5',
     'defines': [
       'G_DISABLE_ASSERT',
       'G_DISABLE_CAST_CHECKS',
@@ -91,208 +15,36 @@
       'NODE_API_SWALLOW_UNTHROWABLE_EXCEPTIONS'
     ],
     'dependencies': [
-      '<!(node -p "require(\'node-addon-api\').gyp")',
-      'libvips-cpp-<(vips_version)'
+      '<!(node -p "require(\'node-addon-api\').gyp")'
+    ],
+    'include_dirs': [
+      '<!(node -p "require(\'node-addon-api\').include_dir")',
+      '/storage/Users/currentUser/workspace/node_result/packages/@img+sharp-linux-arm64@0.35.5/vips-full/prefix/include',
+      '/storage/Users/currentUser/.harmonybrew/include/glib-2.0',
+      '/storage/Users/currentUser/.harmonybrew/lib/glib-2.0/include',
+      '/storage/Users/currentUser/usr/local/include'
     ],
-    'variables': {
-      'conditions': [
-        ['OS != "win"', {
-          'pkg_config_path': '<!(node -p "require(\'../lib/libvips\').pkgConfigPath()")',
-          'use_global_libvips': '<!(node -p "Boolean(require(\'../lib/libvips\').useGlobalLibvips()).toString()")'
-        }, {
-          'pkg_config_path': '',
-          'use_global_libvips': ''
-        }]
-      ]
-    },
     'sources': [
       'common.cc',
       'metadata.cc',
-      'stats.cc',
       'operations.cc',
       'pipeline.cc',
-      'utilities.cc',
-      'sharp.cc'
-    ],
-    'include_dirs': [
-      '<!(node -p "require(\'node-addon-api\').include_dir")',
-    ],
-    'conditions': [
-      ['use_global_libvips == "true"', {
-        # Use pkg-config for include and lib
-        'include_dirs': ['<!@(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --cflags-only-I vips-cpp vips glib-2.0 | sed s\/-I//g)'],
-        'libraries': ['<!@(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --libs vips-cpp)'],
-        'defines': [
-          'SHARP_USE_GLOBAL_LIBVIPS'
-        ],
-        'conditions': [
-          ['OS == "linux"', {
-            'defines': [
-              # Inspect libvips-cpp.so to determine which C++11 ABI version was used and set _GLIBCXX_USE_CXX11_ABI accordingly. This is quite horrible.
-              '_GLIBCXX_USE_CXX11_ABI=<!(if readelf -Ws "$(PKG_CONFIG_PATH="<(pkg_config_path)" pkg-config --variable libdir vips-cpp)/libvips-cpp.so" | c++filt | grep -qF __cxx11;then echo "1";else echo "0";fi)'
-            ]
-          }]
-        ]
-      }, {
-        # Use pre-built libvips stored locally within node_modules
-        'include_dirs': [
-          '<(sharp_libvips_include_dir)',
-          '<(sharp_libvips_include_dir)/glib-2.0',
-          '<(sharp_libvips_lib_dir)/glib-2.0/include'
-        ],
-        'library_dirs': [
-          '<(sharp_libvips_lib_dir)'
-        ],
-        'conditions': [
-          ['OS == "win"', {
-            'defines': [
-              '_ALLOW_KEYWORD_MACROS',
-              '_FILE_OFFSET_BITS=64'
-            ],
-            'link_settings': {
-              'libraries': [
-                'libvips.lib'
-              ]
-            }
-          }],
-          ['OS == "mac"', {
-            'link_settings': {
-              'libraries': [
-                'libvips-cpp.<(vips_version).dylib'
-              ]
-            },
-            'xcode_settings': {
-              'OTHER_LDFLAGS': [
-                '-Wl,-s',
-                '-Wl,-dead_strip',
-                # Ensure runtime linking is relative to sharp.node
-                '-Wl,-rpath,\'@loader_path/../../sharp-libvips-<(platform_and_arch)/lib\'',
-                '-Wl,-rpath,\'@loader_path/../../../sharp-libvips-<(platform_and_arch)/<(sharp_libvips_version)/lib\'',
-                '-Wl,-rpath,\'@loader_path/../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
-                '-Wl,-rpath,\'@loader_path/../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
-                '-Wl,-rpath,\'@loader_path/../../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
-                '-Wl,-rpath,\'@loader_path/../../../../../@img-sharp-libvips-<(platform_and_arch)-npm-<(sharp_libvips_version)-<(sharp_libvips_yarn_locator)/node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\''
-              ]
-            }
-          }],
-          ['OS == "linux"', {
-            'defines': [
-              '_GLIBCXX_USE_CXX11_ABI=1'
-            ],
-            'cflags_cc': [
-              '<!(node -p "require(\'detect-libc\').isNonGlibcLinuxSync() ? \'\' : \'-flto=auto\'")'
-            ],
-            'link_settings': {
-              'libraries': [
-                '-l:libvips-cpp.so.<(vips_version)'
-              ],
-              'ldflags': [
-                '-lstdc++fs',
-                '-Wl,-s',
-                '-Wl,--disable-new-dtags',
-                '-Wl,-z,nodelete',
-                '-Wl,-Bsymbolic-functions',
-                '-Wl,-rpath=\'$$ORIGIN/../../sharp-libvips-<(platform_and_arch)/lib\'',
-                '-Wl,-rpath=\'$$ORIGIN/../../../sharp-libvips-<(platform_and_arch)/<(sharp_libvips_version)/lib\'',
-                '-Wl,-rpath=\'$$ORIGIN/../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
-                '-Wl,-rpath=\'$$ORIGIN/../../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
-                '-Wl,-rpath,\'$$ORIGIN/../../../../../@img-sharp-libvips-<(platform_and_arch)-npm-<(sharp_libvips_version)-<(sharp_libvips_yarn_locator)/node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\''
-              ]
-            }
-          }],
-          ['OS == "emscripten"', {
-            'product_extension': 'node.js',
-            'link_settings': {
-              'ldflags': [
-                '-fexceptions',
-                '--pre-js=<!(node -p "require.resolve(\'./emscripten/pre.js\')")',
-                '-Oz',
-                '-sALLOW_MEMORY_GROWTH',
-                '-sENVIRONMENT=node',
-                '-sEXPORTED_FUNCTIONS=emnapiInit,_vips_shutdown,_uv_library_shutdown',
-                '-sNODERAWFS',
-                '-sWASM_ASYNC_COMPILATION=0'
-              ],
-              'libraries': [
-                '<!@(PKG_CONFIG_PATH="<!(node -p "require(\'@img/sharp-libvips-dev-wasm32/lib\')")/pkgconfig" pkg-config --static --libs vips-cpp)'
-              ],
-            }
-          }]
-        ]
-      }]
+      'sharp.cc',
+      'stats.cc',
+      'utilities.cc'
     ],
     'cflags_cc': [
       '-std=c++17',
       '-fexceptions',
-      '-Wall',
       '-Os'
     ],
-    'xcode_settings': {
-      'CLANG_CXX_LANGUAGE_STANDARD': 'c++17',
-      'MACOSX_DEPLOYMENT_TARGET': '10.15',
-      'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
-      'GCC_ENABLE_CPP_RTTI': 'YES',
-      'OTHER_CPLUSPLUSFLAGS': [
-        '-fexceptions',
-        '-Wall',
-        '-Oz'
-      ]
-    },
-    'configurations': {
-      'Release': {
-        'conditions': [
-          ['target_arch == "arm"', {
-            'cflags_cc': [
-              '-Wno-psabi'
-            ]
-          }],
-          ['OS == "win"', {
-            'msvs_settings': {
-              'VCCLCompilerTool': {
-                "AdditionalOptions": [
-                  "/std:c++17"
-                ],
-                'ExceptionHandling': 1,
-                'Optimization': 1,
-                'WholeProgramOptimization': 'true'
-              },
-              'VCLibrarianTool': {
-                'AdditionalOptions': [
-                  '/LTCG:INCREMENTAL'
-                ]
-              },
-              'VCLinkerTool': {
-                'ImageHasSafeExceptionHandlers': 'false',
-                'OptimizeReferences': 2,
-                'EnableCOMDATFolding': 2,
-                'LinkIncremental': 1,
-                'AdditionalOptions': [
-                  '/LTCG:INCREMENTAL'
-                ]
-              }
-            },
-            'msvs_disabled_warnings': [
-              4275
-            ]
-          }]
-        ]
-      }
-    },
-  }, {
-    'target_name': 'copy-dll',
-    'type': 'none',
-    'dependencies': [
-      'sharp-<(platform_and_arch)'
+    'ldflags': [
+      '-Wl,-rpath=$$ORIGIN'
     ],
-    'conditions': [
-      ['OS == "win"', {
-        'copies': [{
-          'destination': 'build/Release',
-          'files': [
-            '<(sharp_libvips_lib_dir)/libvips-42.dll'
-          ]
-        }]
-      }]
+    'libraries': [
+      '-L/storage/Users/currentUser/workspace/node_result/packages/@img+sharp-linux-arm64@0.35.5/vips-full/prefix/lib',
+      '-L/storage/Users/currentUser/.harmonybrew/lib',
+      '-lvips-cpp'
     ]
   }]
 }

package/src/common.cc

@@ -118,7 +118,7 @@ namespace sharp {
       descriptor->openSlideLevel = AttrAsUint32(input, "openSlideLevel");
     }
     // subIFD (OME-TIFF)
-    if (HasAttr(input, "subifd")) {
+    if (HasAttr(input, "tiffSubifd")) {
       descriptor->tiffSubifd = AttrAsInt32(input, "tiffSubifd");
     }
     // // PDF background color
@@ -196,8 +196,8 @@ namespace sharp {
     if (HasAttr(input, "joinValign")) {
       descriptor->joinValign = AttrAsEnum<VipsAlign>(input, "joinValign", VIPS_TYPE_ALIGN);
     }
-    // Limit input images to a given number of pixels, where pixels = width * height
     descriptor->limitInputPixels = static_cast<uint64_t>(AttrAsInt64(input, "limitInputPixels"));
+    descriptor->limitInputChannels = static_cast<uint64_t>(AttrAsInt64(input, "limitInputChannels"));
     if (HasAttr(input, "access")) {
       descriptor->access = AttrAsBool(input, "sequentialRead") ? VIPS_ACCESS_SEQUENTIAL : VIPS_ACCESS_RANDOM;
     }
@@ -289,6 +289,7 @@ namespace sharp {
       case ImageType::JXL: id = "jxl"; break;
       case ImageType::RAD: id = "rad"; break;
       case ImageType::DCRAW: id = "dcraw"; break;
+      case ImageType::UHDR: id = "uhdr"; break;
       case ImageType::VIPS: id = "vips"; break;
       case ImageType::RAW: id = "raw"; break;
       case ImageType::UNKNOWN: id = "unknown"; break;
@@ -339,6 +340,9 @@ namespace sharp {
     { "VipsForeignLoadRadBuffer", ImageType::RAD },
     { "VipsForeignLoadDcRawFile", ImageType::DCRAW },
     { "VipsForeignLoadDcRawBuffer", ImageType::DCRAW },
+    { "VipsForeignLoadUhdr", ImageType::UHDR },
+    { "VipsForeignLoadUhdrFile", ImageType::UHDR },
+    { "VipsForeignLoadUhdrBuffer", ImageType::UHDR },
     { "VipsForeignLoadVips", ImageType::VIPS },
     { "VipsForeignLoadVipsFile", ImageType::VIPS },
     { "VipsForeignLoadRaw", ImageType::RAW }
@@ -356,6 +360,9 @@ namespace sharp {
         imageType = it->second;
       }
     }
+    if (imageType == ImageType::UHDR) {
+      imageType = ImageType::JPEG;
+    }
     return imageType;
   }
 
@@ -375,6 +382,9 @@ namespace sharp {
         imageType = ImageType::MISSING;
       }
     }
+    if (imageType == ImageType::UHDR) {
+      imageType = ImageType::JPEG;
+    }
     return imageType;
   }
 
@@ -416,7 +426,7 @@ namespace sharp {
     }
     if (ImageTypeSupportsPage(imageType)) {
       option->set("n", descriptor->pages);
-      option->set("page", descriptor->page);
+      option->set("page", std::max(0, descriptor->page));
     }
     switch (imageType) {
       case ImageType::SVG:
@@ -446,6 +456,22 @@ namespace sharp {
     return option;
   }
 
+  /*
+    Should HEIF image be re-opened using the primary item?
+  */
+  static bool HeifPrimaryPageReopen(VImage image, InputDescriptor *descriptor) {
+    if (image.get_typeof(VIPS_META_N_PAGES) == G_TYPE_INT && image.get_typeof("heif-primary") == G_TYPE_INT) {
+      if (image.get_int(VIPS_META_N_PAGES) > 1 && descriptor->pages == 1 && descriptor->page == -1) {
+        int const pagePrimary = image.get_int("heif-primary");
+        if (pagePrimary != 0) {
+          descriptor->page = pagePrimary;
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
   /*
     Open an image from the given InputDescriptor (filesystem, compressed buffer, raw pixel data)
   */
@@ -480,12 +506,15 @@ namespace sharp {
             image = VImage::new_from_buffer(descriptor->buffer, descriptor->bufferLength, nullptr, option);
             if (imageType == ImageType::SVG || imageType == ImageType::PDF || imageType == ImageType::MAGICK) {
               image = SetDensity(image, descriptor->density);
+            } else if (imageType == ImageType::HEIF && HeifPrimaryPageReopen(image, descriptor)) {
+              option = GetOptionsForImageType(imageType, descriptor);
+              image = VImage::new_from_buffer(descriptor->buffer, descriptor->bufferLength, nullptr, option);
             }
-          } catch (vips::VError const &err) {
-            throw vips::VError(std::string("Input buffer has corrupt header: ") + err.what());
+          } catch (std::runtime_error const &err) {
+            throw std::runtime_error(std::string("Input buffer has corrupt header: ") + err.what());
           }
         } else {
-          throw vips::VError("Input buffer contains unsupported image format");
+          throw std::runtime_error("Input buffer contains unsupported image format");
         }
       }
     } else {
@@ -511,10 +540,10 @@ namespace sharp {
           if (channels == 4) {
             background.push_back(descriptor->createBackground[3]);
           }
-          image = VImage::new_matrix(descriptor->createWidth, descriptor->createHeight)
-            .copy(VImage::option()->set("interpretation",
-              channels < 3 ? VIPS_INTERPRETATION_B_W : VIPS_INTERPRETATION_sRGB))
-            .new_from_image(background);
+          image = VImage::black(descriptor->createWidth, descriptor->createHeight,
+            VImage::option()->set("bands", channels))
+            .copy(VImage::option()->set("interpretation", VIPS_INTERPRETATION_sRGB))
+            .linear(std::vector<double>(channels, 0.0), background, VImage::option()->set("uchar", true));
         }
         if (descriptor->createPageHeight > 0) {
           image.set(VIPS_META_PAGE_HEIGHT, descriptor->createPageHeight);
@@ -556,10 +585,10 @@ namespace sharp {
         imageType = DetermineImageType(descriptor->file.data());
         if (imageType == ImageType::MISSING) {
           if (descriptor->file.find("<svg") != std::string::npos) {
-            throw vips::VError("Input file is missing, did you mean "
+            throw std::runtime_error("Input file is missing, did you mean "
               "sharp(Buffer.from('" + descriptor->file.substr(0, 8) + "...')?");
           }
-          throw vips::VError("Input file is missing: " + descriptor->file);
+          throw std::runtime_error("Input file is missing: " + descriptor->file);
         }
         if (imageType != ImageType::UNKNOWN) {
           try {
@@ -567,12 +596,15 @@ namespace sharp {
             image = VImage::new_from_file(descriptor->file.data(), option);
             if (imageType == ImageType::SVG || imageType == ImageType::PDF || imageType == ImageType::MAGICK) {
               image = SetDensity(image, descriptor->density);
+            } else if (imageType == ImageType::HEIF && HeifPrimaryPageReopen(image, descriptor)) {
+              option = GetOptionsForImageType(imageType, descriptor);
+              image = VImage::new_from_file(descriptor->file.data(), option);
             }
-          } catch (vips::VError const &err) {
-            throw vips::VError(std::string("Input file has corrupt header: ") + err.what());
+          } catch (std::runtime_error const &err) {
+            throw std::runtime_error(std::string("Input file has corrupt header: ") + err.what());
           }
         } else {
-          throw vips::VError("Input file contains unsupported image format");
+          throw std::runtime_error("Input file contains unsupported image format");
         }
       }
     }
@@ -580,7 +612,10 @@ namespace sharp {
     // Limit input images to a given number of pixels, where pixels = width * height
     if (descriptor->limitInputPixels > 0 &&
       static_cast<uint64_t>(image.width()) * image.height() > descriptor->limitInputPixels) {
-      throw vips::VError("Input image exceeds pixel limit");
+      throw std::runtime_error("Input image exceeds pixel limit");
+    }
+    if (descriptor->limitInputChannels > 0 && static_cast<uint64_t>(image.bands()) > descriptor->limitInputChannels) {
+      throw std::runtime_error("Input image exceeds channel limit");
     }
     return std::make_tuple(image, imageType);
   }
@@ -600,7 +635,7 @@ namespace sharp {
     if (HasProfile(image)) {
       size_t length;
       const void *data = image.get_blob(VIPS_META_ICC_NAME, &length);
-      icc.first = static_cast<char*>(g_malloc(length));
+      icc.first = static_cast<char*>(vips_malloc(reinterpret_cast<VipsObject*>(image.get_image()), length));
       icc.second = length;
       memcpy(icc.first, data, length);
     }
@@ -613,7 +648,7 @@ namespace sharp {
   VImage SetProfile(VImage image, std::pair<char*, size_t> icc) {
     if (icc.first != nullptr) {
       image = image.copy();
-      image.set(VIPS_META_ICC_NAME, reinterpret_cast<VipsCallbackFn>(vips_area_free_cb), icc.first, icc.second);
+      image.set(VIPS_META_ICC_NAME, nullptr, icc.first, icc.second);
     }
     return image;
   }
@@ -676,9 +711,12 @@ namespace sharp {
     bool hasDelay = !delay.empty();
     VImage copy = image.copy();
 
-    // Only set page-height if we have more than one page, or this could
-    // accidentally turn into an animated image later.
-    if (nPages > 1) copy.set(VIPS_META_PAGE_HEIGHT, pageHeight);
+    // Only set page-height and n-pages if we have more than one page, or this
+    // could accidentally turn into an animated image later.
+    if (nPages > 1) {
+      copy.set(VIPS_META_PAGE_HEIGHT, pageHeight);
+      copy.set(VIPS_META_N_PAGES, nPages);
+    }
     if (hasDelay) {
       if (delay.size() == 1) {
         // We have just one delay, repeat that value for all frames.
@@ -756,19 +794,19 @@ namespace sharp {
       : image.height();
     if (imageType == ImageType::JPEG) {
       if (image.width() > 65535 || height > 65535) {
-        throw vips::VError("Processed image is too large for the JPEG format");
+        throw std::runtime_error("Processed image is too large for the JPEG format");
       }
     } else if (imageType == ImageType::WEBP) {
       if (image.width() > 16383 || height > 16383) {
-        throw vips::VError("Processed image is too large for the WebP format");
+        throw std::runtime_error("Processed image is too large for the WebP format");
       }
     } else if (imageType == ImageType::GIF) {
       if (image.width() > 65535 || height > 65535) {
-        throw vips::VError("Processed image is too large for the GIF format");
+        throw std::runtime_error("Processed image is too large for the GIF format");
       }
     } else if (imageType == ImageType::HEIF) {
       if (image.width() > 16384 || height > 16384) {
-        throw vips::VError("Processed image is too large for the HEIF format");
+        throw std::runtime_error("Processed image is too large for the HEIF format");
       }
     }
   }
@@ -1127,4 +1165,22 @@ namespace sharp {
     }
     return image;
   }
+
+  /*
+    Does this image have a gain map?
+  */
+  bool HasGainMap(VImage image) {
+    return image.get_typeof("gainmap") == VIPS_TYPE_BLOB ||
+      image.get_typeof("gainmap-data") == VIPS_TYPE_BLOB;
+  }
+
+  /*
+    Removes gain map, if any.
+  */
+  VImage RemoveGainMap(VImage image) {
+    VImage copy = image.copy();
+    copy.remove("gainmap");
+    copy.remove("gainmap-data");
+    return copy;
+  }
 }  // namespace sharp

package/src/common.h

@@ -18,9 +18,9 @@
 // Verify platform and compiler compatibility
 
 #if (VIPS_MAJOR_VERSION < 8) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 17) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 17 && VIPS_MICRO_VERSION < 3)
-#error "libvips version 8.17.3+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 18) || \
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 18 && VIPS_MICRO_VERSION < 7)
+#error "libvips version 8.18.7+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if defined(__has_include)
@@ -29,6 +29,12 @@
 #endif
 #endif
 
+#ifdef __EMSCRIPTEN__
+#define SHARP_CALLBACK_FN_NAME Call
+#else
+#define SHARP_CALLBACK_FN_NAME MakeCallback
+#endif
+
 using vips::VImage;
 
 namespace sharp {
@@ -40,6 +46,7 @@ namespace sharp {
     char *buffer;
     VipsFailOn failOn;
     uint64_t limitInputPixels;
+    uint64_t limitInputChannels;
     bool unlimited;
     VipsAccess access;
     size_t bufferLength;
@@ -92,6 +99,7 @@ namespace sharp {
       buffer(nullptr),
       failOn(VIPS_FAIL_ON_WARNING),
       limitInputPixels(0x3FFF * 0x3FFF),
+      limitInputChannels(5),
       unlimited(false),
       access(VIPS_ACCESS_SEQUENTIAL),
       bufferLength(0),
@@ -105,7 +113,7 @@ namespace sharp {
       rawPremultiplied(false),
       rawPageHeight(0),
       pages(1),
-      page(0),
+      page(-1),
       createChannels(0),
       createWidth(0),
       createHeight(0),
@@ -173,6 +181,7 @@ namespace sharp {
     JXL,
     RAD,
     DCRAW,
+    UHDR,
     VIPS,
     RAW,
     UNKNOWN,
@@ -397,6 +406,16 @@ namespace sharp {
   */
   VImage StaySequential(VImage image, bool condition = true);
 
+  /*
+    Does this image have a gain map?
+  */
+  bool HasGainMap(VImage image);
+
+  /*
+    Removes gain map, if any.
+  */
+  VImage RemoveGainMap(VImage image);
+
 }  // namespace sharp
 
 #endif  // SRC_COMMON_H_