@img/sharp-libvips-dev-wasm32 1.3.0-rc.1 → 1.3.0-rc.10

package/include/libheif/heif_encoding.h

@@ -34,10 +34,17 @@ extern "C" {
 #include <libheif/heif_brands.h>
 #include <libheif/heif_color.h>
 
+// Forward declaration. The full definition lives in heif_uncompressed.h.
+// heif_encoding_options only stores a pointer, so a forward typedef is enough here
+// and avoids a circular include (heif_uncompressed.h pulls in heif.h, which pulls in this header).
+typedef struct heif_unci_image_parameters heif_unci_image_parameters;
+
 
 // ----- encoder -----
 
-// The encoder used for actually encoding an image.
+/**
+ * Opaque object that represents the encoder used to code the images.
+ */
 typedef struct heif_encoder heif_encoder;
 
 // A description of the encoder's capabilities and name.
@@ -53,7 +60,7 @@ typedef struct heif_encoder_parameter heif_encoder_parameter;
 // Note that the encoder may be limited to a certain subset of features (e.g. only 8 bit, only lossy).
 // You will have to query the specific capabilities further.
 LIBHEIF_API
-int heif_have_encoder_for_format(enum heif_compression_format format);
+int heif_have_encoder_for_format(heif_compression_format format);
 
 // Get a list of available encoders. You can filter the encoders by compression format and name.
 // Use format_filter==heif_compression_undefined and name_filter==NULL as wildcards.
@@ -62,7 +69,7 @@ int heif_have_encoder_for_format(enum heif_compression_format format);
 // By setting out_encoders==nullptr, you can query the number of encoders, 'count' is ignored.
 // Note: to get the actual encoder from the descriptors returned here, use heif_context_get_encoder().
 LIBHEIF_API
-int heif_get_encoder_descriptors(enum heif_compression_format format_filter,
+int heif_get_encoder_descriptors(heif_compression_format format_filter,
                                  const char* name_filter,
                                  const heif_encoder_descriptor** out_encoders,
                                  int count);
@@ -77,7 +84,7 @@ LIBHEIF_API
 const char* heif_encoder_descriptor_get_id_name(const heif_encoder_descriptor*);
 
 LIBHEIF_API
-enum heif_compression_format
+heif_compression_format
 heif_encoder_descriptor_get_compression_format(const heif_encoder_descriptor*);
 
 LIBHEIF_API
@@ -97,10 +104,12 @@ heif_error heif_context_get_encoder(heif_context* context,
 // for this format, the encoder with the highest plugin priority will be returned.
 LIBHEIF_API
 heif_error heif_context_get_encoder_for_format(heif_context* context,
-                                               enum heif_compression_format format,
+                                               heif_compression_format format,
                                                heif_encoder**);
 
-// You have to release the encoder after use.
+/**
+ * Release the encoder object after use.
+ */
 LIBHEIF_API
 void heif_encoder_release(heif_encoder*);
 
@@ -142,12 +151,12 @@ LIBHEIF_API
 const char* heif_encoder_parameter_get_name(const heif_encoder_parameter*);
 
 
-enum heif_encoder_parameter_type
+typedef enum heif_encoder_parameter_type
 {
   heif_encoder_parameter_type_integer = 1,
   heif_encoder_parameter_type_boolean = 2,
   heif_encoder_parameter_type_string = 3
-};
+} heif_encoder_parameter_type;
 
 // Return the parameter type.
 LIBHEIF_API
@@ -252,7 +261,7 @@ int heif_encoder_has_default(heif_encoder*,
 
 
 // The orientation values are defined equal to the EXIF Orientation tag.
-enum heif_orientation
+typedef enum heif_orientation
 {
   heif_orientation_normal = 1,
   heif_orientation_flip_horizontally = 2,
@@ -262,7 +271,11 @@ enum heif_orientation
   heif_orientation_rotate_90_cw = 6,
   heif_orientation_rotate_90_cw_then_flip_vertically = 7,
   heif_orientation_rotate_270_cw = 8
-};
+} heif_orientation;
+
+
+LIBHEIF_API
+heif_orientation heif_orientation_concat(heif_orientation first, heif_orientation second);
 
 
 typedef struct heif_encoding_options
@@ -293,7 +306,7 @@ typedef struct heif_encoding_options
   // version 5 options
 
   // libheif will generate irot/imir boxes to match these orientations
-  enum heif_orientation image_orientation;
+  heif_orientation image_orientation;
 
   // version 6 options
 
@@ -304,6 +317,14 @@ typedef struct heif_encoding_options
   // Set this to true to use compressed form of uncC where possible.
   uint8_t prefer_uncC_short_form;
 
+  // version 8 options
+
+  // Optional 'unci'-specific encoding parameters (compression method, and future fields
+  // such as interleave type and padding).
+  //
+  // Default: nullptr
+  const heif_unci_image_parameters* unci_parameters;
+
   // TODO: we should add a flag to force MIAF compatible outputs. E.g. this will put restrictions on grid tile sizes and
   //       might add a clap box when the grid output size does not match the color subsampling factors.
   //       Since some of these constraints have to be known before actually encoding the image, "forcing MIAF compatibility"
@@ -360,6 +381,19 @@ LIBHEIF_API
 void heif_context_add_compatible_brand(heif_context* ctx,
                                        heif_brand2 compatible_brand);
 
+/**
+ * Enable the unified ID namespace ('unif' brand).
+ *
+ * When enabled, item IDs, track IDs, and entity group IDs share a single
+ * global counter so no ID value is reused across categories. The 'unif'
+ * compatible brand is automatically added to the output file.
+ *
+ * @param ctx the encoding context
+ * @param flag non-zero to enable, zero to disable
+ */
+LIBHEIF_API
+void heif_context_set_unif(heif_context* ctx, int flag);
+
 // --- deprecated functions ---
 
 // DEPRECATED, typo in function name
@@ -379,7 +413,7 @@ int heif_encoder_descriptor_supportes_lossless_compression(const heif_encoder_de
 // Note: to get the actual encoder from the descriptors returned here, use heif_context_get_encoder().
 LIBHEIF_API
 int heif_context_get_encoder_descriptors(heif_context*, // TODO: why do we need this parameter?
-                                         enum heif_compression_format format_filter,
+                                         heif_compression_format format_filter,
                                          const char* name_filter,
                                          const heif_encoder_descriptor** out_encoders,
                                          int count);

package/include/libheif/heif_error.h

@@ -28,8 +28,10 @@ extern "C" {
 #include <stddef.h>
 #include <stdint.h>
 
+#include <libheif/heif_export.h>
 
-enum heif_error_code
+
+typedef enum heif_error_code
 {
   // Everything ok, no error occurred.
   heif_error_Ok = 0,
@@ -71,10 +73,10 @@ enum heif_error_code
   heif_error_Canceled = 12,
 
   heif_error_End_of_sequence = 13
-};
+} heif_error_code;
 
 
-enum heif_suberror_code
+typedef enum heif_suberror_code
 {
   // no further information available
   heif_suberror_Unspecified = 0,
@@ -191,6 +193,11 @@ enum heif_suberror_code
 
   heif_suberror_No_moov_box = 151,
 
+  // The colr (NCLX) box and the codec bitstream VUI/color signalling disagree.
+  // Per ISO/IEC 14496-12 and ISO/IEC 23000-22 (MIAF) the colr box takes precedence,
+  // but the conflict is reported as a warning.
+  heif_suberror_NCLX_colr_VUI_mismatch = 152,
+
   // --- Memory_allocation_error ---
 
   // A security limit preventing unreasonable memory allocations was exceeded by the input file.
@@ -254,6 +261,8 @@ enum heif_suberror_code
 
   heif_suberror_Unsupported_essential_property = 3007,
 
+  heif_suberror_Unsupported_track_type = 3008,
+
   // --- Encoder_plugin_error ---
 
   heif_suberror_Unsupported_bit_depth = 4000,
@@ -276,16 +285,16 @@ enum heif_suberror_code
   heif_suberror_Plugin_is_not_loaded = 6001,         // trying to remove a plugin that is not loaded
   heif_suberror_Cannot_read_plugin_directory = 6002, // error while scanning the directory for plugins
   heif_suberror_No_matching_decoder_installed = 6003 // no decoder found for that compression format
-};
+} heif_suberror_code;
 
 
 typedef struct heif_error
 {
   // main error category
-  enum heif_error_code code;
+  heif_error_code code;
 
   // more detailed error code
-  enum heif_suberror_code subcode;
+  heif_suberror_code subcode;
 
   // textual error message (is always defined, you do not have to check for NULL)
   const char* message;

package/include/libheif/heif_export.h

@@ -0,0 +1,48 @@
+/*
+ * HEIF codec.
+ * Copyright (c) 2017-2026 Dirk Farin <dirk.farin@gmail.com>
+ *
+ * This file is part of libheif.
+ *
+ * libheif is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * libheif is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libheif.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBHEIF_HEIF_EXPORT_H
+#define LIBHEIF_HEIF_EXPORT_H
+
+// LIBHEIF_API marks the symbols that are exported from the shared library.
+//
+// This macro lives in its own tiny, dependency-free header so that every
+// public header can pull it in without creating include cycles. In particular,
+// heif_library.h and heif_error.h are mutually dependent (heif_library.h needs
+// the heif_error type while heif_error.h needs LIBHEIF_API), so the macro
+// cannot live in either of them if both are to compile standalone.
+
+#if (defined(_WIN32) || defined __CYGWIN__) && !defined(LIBHEIF_STATIC_BUILD)
+#ifdef LIBHEIF_EXPORTS
+#define LIBHEIF_API __declspec(dllexport)
+#else
+#define LIBHEIF_API __declspec(dllimport)
+#endif
+#elif defined(HAVE_VISIBILITY) && HAVE_VISIBILITY
+#ifdef LIBHEIF_EXPORTS
+#define LIBHEIF_API __attribute__((__visibility__("default")))
+#else
+#define LIBHEIF_API
+#endif
+#else
+#define LIBHEIF_API
+#endif
+
+#endif  // LIBHEIF_HEIF_EXPORT_H

package/include/libheif/heif_image.h

@@ -31,10 +31,29 @@ extern "C" {
 #include <stdint.h>
 
 
-enum heif_chroma
+// The heif_chroma enum describes pixel layout (planar vs interleaved, and any
+// YUV chroma subsampling). It does NOT describe pixel semantics; the semantic
+// interpretation of the planes comes from heif_colorspace.
+//
+// heif_chroma_planar covers "one or more planar components, no subsampling".
+// It is used for:
+//   - heif_colorspace_monochrome (single luma plane)
+//   - heif_colorspace_filter_array (single CFA mosaic plane)
+//   - heif_colorspace_custom (any number of planar components)
+// For heif_colorspace_RGB the historical name heif_chroma_444 is the
+// canonical form for planar RGB. heif_chroma_planar is accepted as a
+// synonym at the C API boundary and is internally canonicalized to
+// heif_chroma_444 so existing callers and internal code paths keep seeing
+// heif_chroma_444 on read-back. Callers should also accept a returned
+// heif_chroma_planar as a synonym. We might switch to this as the
+// canonical name in the future.
+//
+// The YUV subsampling names (heif_chroma_420 / _422 / _444) are kept for
+// heif_colorspace_YCbCr.
+typedef enum heif_chroma
 {
   heif_chroma_undefined = 99,
-  heif_chroma_monochrome = 0,
+  heif_chroma_planar = 0,
   heif_chroma_420 = 1,
   heif_chroma_422 = 2,
   heif_chroma_444 = 3,
@@ -44,14 +63,19 @@ enum heif_chroma
   heif_chroma_interleaved_RRGGBBAA_BE = 13, // HDR, big endian.
   heif_chroma_interleaved_RRGGBB_LE = 14,   // HDR, little endian.
   heif_chroma_interleaved_RRGGBBAA_LE = 15  // HDR, little endian.
-};
+} heif_chroma;
 
 // DEPRECATED ENUM NAMES
 #define heif_chroma_interleaved_24bit  heif_chroma_interleaved_RGB
 #define heif_chroma_interleaved_32bit  heif_chroma_interleaved_RGBA
 
+// Legacy alias for heif_chroma_planar. The name "monochrome" was misleading
+// for non-grayscale planar layouts (filter_array, custom); use
+// heif_chroma_planar in new code.
+#define heif_chroma_monochrome heif_chroma_planar
 
-enum heif_colorspace
+
+typedef enum heif_colorspace
 {
   heif_colorspace_undefined = 99,
 
@@ -63,6 +87,8 @@ enum heif_colorspace
 
   // heif_colorspace_RGB should be used with one of these heif_chroma values:
   // * heif_chroma_444 (for planar RGB)
+  // * heif_chroma_planar is accepted as a synonym and is internally canonicalized to heif_chroma_444.
+  //                      It is the preferred, future-proof value.
   // * heif_chroma_interleaved_RGB
   // * heif_chroma_interleaved_RGBA
   // * heif_chroma_interleaved_RRGGBB_BE
@@ -71,14 +97,22 @@ enum heif_colorspace
   // * heif_chroma_interleaved_RRGGBBAA_LE
   heif_colorspace_RGB = 1,
 
-  // heif_colorspace_monochrome should only be used with heif_chroma = heif_chroma_monochrome
+  // heif_colorspace_monochrome should only be used with heif_chroma = heif_chroma_planar.
   heif_colorspace_monochrome = 2,
 
-  // Indicates that this image has no visual channels.
-  heif_colorspace_nonvisual = 3
-};
+  // Indicates that this image has a special, custom arrangement of components.
+  // For example, it can have several monochrome channels or just a depth component with no color image.
+  // Images of this type are always planar and use heif_chroma_planar.
+  heif_colorspace_custom = 3,
+
+  // Images of this type are filter-array (CFA / Bayer) mosaics. The single
+  // mosaicked plane is described as heif_chroma_planar.
+  heif_colorspace_filter_array = 4
+} heif_colorspace;
+
+#define heif_colorspace_nonvisual heif_colorspace_custom
 
-enum heif_channel
+typedef enum heif_channel
 {
   heif_channel_Y = 0,
   heif_channel_Cb = 1,
@@ -90,9 +124,9 @@ enum heif_channel
   heif_channel_interleaved = 10,
   heif_channel_filter_array = 11,
   heif_channel_depth = 12,
-  heif_channel_disparity = 13
-};
-
+  heif_channel_disparity = 13,
+  heif_channel_unknown = 65535
+} heif_channel;
 
 // An heif_image contains a decoded pixel image in various colorspaces, chroma formats,
 // and bit depths.
@@ -102,6 +136,9 @@ enum heif_channel
 // containing the interleaved R,G,B values.
 
 // Planar RGB images are specified as heif_colorspace_RGB / heif_chroma_444.
+// heif_chroma_planar is accepted as a synonym and is internally canonicalized
+// to heif_chroma_444 so heif_image_get_chroma_format() always returns
+// heif_chroma_444 for planar RGB.
 
 typedef struct heif_image heif_image;
 typedef struct heif_image_handle heif_image_handle;
@@ -110,11 +147,11 @@ typedef struct heif_security_limits heif_security_limits;
 
 // Get the colorspace format of the image.
 LIBHEIF_API
-enum heif_colorspace heif_image_get_colorspace(const heif_image*);
+heif_colorspace heif_image_get_colorspace(const heif_image*);
 
 // Get the chroma format of the image.
 LIBHEIF_API
-enum heif_chroma heif_image_get_chroma_format(const heif_image*);
+heif_chroma heif_image_get_chroma_format(const heif_image*);
 
 /**
  * Get the width of a specified image channel.
@@ -124,7 +161,7 @@ enum heif_chroma heif_image_get_chroma_format(const heif_image*);
  * @return the width of the channel in pixels, or -1 the channel does not exist in the image
  */
 LIBHEIF_API
-int heif_image_get_width(const heif_image* img, enum heif_channel channel);
+int heif_image_get_width(const heif_image* img, heif_channel channel);
 
 /**
  * Get the height of a specified image channel.
@@ -134,12 +171,13 @@ int heif_image_get_width(const heif_image* img, enum heif_channel channel);
  * @return the height of the channel in pixels, or -1 the channel does not exist in the image
  */
 LIBHEIF_API
-int heif_image_get_height(const heif_image* img, enum heif_channel channel);
+int heif_image_get_height(const heif_image* img, heif_channel channel);
 
 /**
- * Get the width of the main channel.
+ * Get the logical width of the image.
  *
- * This is the Y channel in YCbCr or mono, or any in RGB.
+ * For well-formed images this equals the size of the main channel (the Y channel
+ * in YCbCr or mono, or the RGB channels). Subsampled chroma channels may be smaller.
  *
  * @param img the image to get the primary width for
  * @return the width in pixels
@@ -148,9 +186,10 @@ LIBHEIF_API
 int heif_image_get_primary_width(const heif_image* img);
 
 /**
- * Get the height of the main channel.
+ * Get the logical height of the image.
  *
- * This is the Y channel in YCbCr or mono, or any in RGB.
+ * For well-formed images this equals the size of the main channel (the Y channel
+ * in YCbCr or mono, or the RGB channels). Subsampled chroma channels may be smaller.
  *
  * @param img the image to get the primary height for
  * @return the height in pixels
@@ -158,6 +197,27 @@ int heif_image_get_primary_width(const heif_image* img);
 LIBHEIF_API
 int heif_image_get_primary_height(const heif_image* img);
 
+/**
+ * Crop the image in place by removing margins from each edge.
+ *
+ * The four parameters specify the number of pixels to remove from each side,
+ * not absolute pixel coordinates. For example, to crop a 100x100 image down
+ * to its central 80x80 region, pass `left=10, right=10, top=10, bottom=10`.
+ * Passing all zeros leaves the image unchanged.
+ *
+ * The resulting image has dimensions `(w - left - right) x (h - top - bottom)`,
+ * which must be at least 1x1. All four values must be non-negative and the
+ * sums `left + right` and `top + bottom` must each be strictly less than the
+ * corresponding image dimension; otherwise `heif_error_Usage_error` /
+ * `heif_suberror_Invalid_parameter_value` is returned and the image is left
+ * unchanged.
+ *
+ * @param img    the image to crop (modified in place on success)
+ * @param left   number of pixels to remove from the left edge
+ * @param right  number of pixels to remove from the right edge
+ * @param top    number of pixels to remove from the top edge
+ * @param bottom number of pixels to remove from the bottom edge
+ */
 LIBHEIF_API
 heif_error heif_image_crop(heif_image* img,
                            int left, int right, int top, int bottom);
@@ -175,7 +235,7 @@ heif_error heif_image_extract_area(const heif_image*,
 // Especially for HDR images, this is probably not what you want. Have a look at
 // heif_image_get_bits_per_pixel_range() instead.
 LIBHEIF_API
-int heif_image_get_bits_per_pixel(const heif_image*, enum heif_channel channel);
+int heif_image_get_bits_per_pixel(const heif_image*, heif_channel channel);
 
 // Get the number of bits per pixel in the given image channel. This function returns
 // the number of bits used for representing the pixel value, which might be smaller
@@ -184,10 +244,10 @@ int heif_image_get_bits_per_pixel(const heif_image*, enum heif_channel channel);
 // are reserved for storage. For interleaved RGBA with 12 bit, this function also returns
 // '12', not '48' or '64' (heif_image_get_bits_per_pixel returns 64 in this case).
 LIBHEIF_API
-int heif_image_get_bits_per_pixel_range(const heif_image*, enum heif_channel channel);
+int heif_image_get_bits_per_pixel_range(const heif_image*, heif_channel channel);
 
 LIBHEIF_API
-int heif_image_has_channel(const heif_image*, enum heif_channel channel);
+int heif_image_has_channel(const heif_image*, heif_channel channel);
 
 // Get a pointer to the actual pixel data.
 // The 'out_stride' is returned as "bytes per line".
@@ -196,27 +256,27 @@ int heif_image_has_channel(const heif_image*, enum heif_channel channel);
 // Deprecated, use the safer version heif_image_get_plane_readonly2() instead.
 LIBHEIF_API
 const uint8_t* heif_image_get_plane_readonly(const heif_image*,
-                                             enum heif_channel channel,
+                                             heif_channel channel,
                                              int* out_stride);
 
 // Deprecated, use the safer version heif_image_get_plane2() instead.
 LIBHEIF_API
 uint8_t* heif_image_get_plane(heif_image*,
-                              enum heif_channel channel,
+                              heif_channel channel,
                               int* out_stride);
 
 // These are safer variants of the two functions above.
 // The 'stride' parameter is often multiplied by the image height in the client application.
 // For very large images, this can lead to integer overflows and, consequently, illegal memory accesses.
-// The changed 'stride' parameter types eliminates this common error.
+// The changed 'stride' parameter type eliminates this common error.
 LIBHEIF_API
 const uint8_t* heif_image_get_plane_readonly2(const heif_image*,
-                                              enum heif_channel channel,
+                                              heif_channel channel,
                                               size_t* out_stride);
 
 LIBHEIF_API
 uint8_t* heif_image_get_plane2(heif_image*,
-                               enum heif_channel channel,
+                               heif_channel channel,
                                size_t* out_stride);
 
 
@@ -262,6 +322,8 @@ void heif_image_get_pixel_aspect_ratio(const heif_image*, uint32_t* aspect_h, ui
 LIBHEIF_API
 void heif_image_set_pixel_aspect_ratio(heif_image*, uint32_t aspect_h, uint32_t aspect_v);
 
+LIBHEIF_API
+void heif_image_handle_set_pixel_aspect_ratio(heif_image_handle*, uint32_t aspect_h, uint32_t aspect_v);
 
 // --- heif_image allocation
 
@@ -280,8 +342,8 @@ void heif_image_set_pixel_aspect_ratio(heif_image*, uint32_t aspect_h, uint32_t
 */
 LIBHEIF_API
 heif_error heif_image_create(int width, int height,
-                             enum heif_colorspace colorspace,
-                             enum heif_chroma chroma,
+                             heif_colorspace colorspace,
+                             heif_chroma chroma,
                              heif_image** out_image);
 
 /**
@@ -314,7 +376,7 @@ heif_error heif_image_create(int width, int height,
  */
 LIBHEIF_API
 heif_error heif_image_add_plane(heif_image* image,
-                                enum heif_channel channel,
+                                heif_channel channel,
                                 int width, int height, int bit_depth);
 
 /*
@@ -323,7 +385,7 @@ heif_error heif_image_add_plane(heif_image* image,
  */
 LIBHEIF_API
 heif_error heif_image_add_plane_safe(heif_image* image,
-                                     enum heif_channel channel,
+                                     heif_channel channel,
                                      int width, int height, int bit_depth,
                                      const heif_security_limits* limits);
 

package/include/libheif/heif_image_handle.h

@@ -53,10 +53,17 @@ int heif_image_handle_is_primary_image(const heif_image_handle* handle);
 LIBHEIF_API
 heif_item_id heif_image_handle_get_item_id(const heif_image_handle* handle);
 
-// Get the resolution of an image.
+/** Get the image width.
+ *
+ * If 'handle' is invalid (NULL) or if the image size exceeds the range of `int`, 0 is returned.
+ */
 LIBHEIF_API
 int heif_image_handle_get_width(const heif_image_handle* handle);
 
+/** Get the image height.
+ *
+ * If 'handle' is invalid (NULL) or if the image size exceeds the range of `int`, 0 is returned.
+ */
 LIBHEIF_API
 int heif_image_handle_get_height(const heif_image_handle* handle);
 
@@ -84,8 +91,8 @@ int heif_image_handle_get_chroma_bits_per_pixel(const heif_image_handle*);
 // You can still request the output in your preferred colorspace, but this may involve an internal conversion.
 LIBHEIF_API
 heif_error heif_image_handle_get_preferred_decoding_colorspace(const heif_image_handle* image_handle,
-                                                               enum heif_colorspace* out_colorspace,
-                                                               enum heif_chroma* out_chroma);
+                                                               heif_colorspace* out_colorspace,
+                                                               heif_chroma* out_chroma);
 
 // Get the image width from the 'ispe' box. This is the original image size without
 // any transformations applied to it. Do not use this unless you know exactly what
@@ -112,6 +119,50 @@ int heif_image_handle_get_pixel_aspect_ratio(const heif_image_handle*, uint32_t*
 LIBHEIF_API
 heif_context* heif_image_handle_get_context(const heif_image_handle* handle);
 
+LIBHEIF_API
+const char* heif_image_handle_get_gimi_content_id(const heif_image_handle* handle);
+
+LIBHEIF_API
+void heif_image_handle_set_gimi_content_id(heif_image_handle* handle, const char* content_id);
+
+
+// --- cmpd component queries
+
+// Returns the number of components in the cmpd box, or 0 if no cmpd property exists.
+LIBHEIF_API
+uint32_t heif_image_handle_get_number_of_cmpd_components(const heif_image_handle*);
+
+// Returns the component_type for the given cmpd component index.
+// Returns 0 if out of range or no cmpd property.
+LIBHEIF_API
+uint16_t heif_image_handle_get_cmpd_component_type(const heif_image_handle*, uint32_t component_idx);
+
+// Returns the component_type_uri for the given cmpd component index (component_type >= 0x8000).
+// Returns NULL if the component does not have a URI.
+// The returned string must be freed with heif_string_release().
+LIBHEIF_API
+const char* heif_image_handle_get_cmpd_component_type_uri(const heif_image_handle*, uint32_t component_idx);
+
+
+// --- GIMI component content IDs (handle-level)
+
+// Returns non-zero (count of content IDs) if an ItemComponentContentIDProperty is set, 0 otherwise.
+LIBHEIF_API
+int heif_image_handle_has_gimi_component_content_ids(const heif_image_handle*);
+
+// Returns the GIMI component content ID for the given component index.
+// Returns NULL if no ItemComponentContentIDProperty is set or index is out of range.
+// The returned string must be freed with heif_string_release().
+LIBHEIF_API
+const char* heif_image_handle_get_gimi_component_content_id(const heif_image_handle*, uint32_t component_idx);
+
+// Set a GIMI component content ID for a single component.
+// If an ItemComponentContentIDProperty does not yet exist, one will be created.
+// The content IDs array is resized as needed (new entries default to empty).
+LIBHEIF_API
+void heif_image_handle_set_gimi_component_content_id(heif_image_handle*,
+                                                     uint32_t component_idx,
+                                                     const char* content_id);
 
 #ifdef __cplusplus
 }

package/include/libheif/heif_items.h

@@ -21,7 +21,9 @@
 #ifndef LIBHEIF_HEIF_ITEMS_H
 #define LIBHEIF_HEIF_ITEMS_H
 
-#include "libheif/heif.h"
+#include "heif_library.h"
+#include "heif_error.h"
+#include "heif_metadata.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -59,7 +61,7 @@ int heif_context_get_list_of_item_IDs(const heif_context* ctx,
  * Gets the item type.
  *
  * Usually, this is a four character code (e.g. `mime` or `uri `), but it can theoretically be
- * any 4-byte number. Thus, the type is returned as an integer. You can use {@link heif_fourcc} to map
+ * any 4-byte number. Thus, the type is returned as an integer. You can use #heif_fourcc to map
  * between the two representations.
  *
  * @param ctx the file context
@@ -167,6 +169,27 @@ LIBHEIF_API
 void heif_release_item_data(const heif_context* ctx, uint8_t** item_data);
 
 
+// ------------------------- item language -------------------------
+
+/**
+ * Get the extended language associated with the item.
+ * The item is usually a text item.
+ *
+ * @param context the heif file context containg the item.
+ * @param itemId the identifier for the item
+ * @param out_language output parameter with the item's language. Free with heif_string_release().
+ * @return heif_error_ok on success, or an error value indicating the problem
+ */
+LIBHEIF_API
+heif_error heif_item_get_property_extended_language(const heif_context* context,
+                                                    heif_item_id itemId,
+                                                    char** out_language);
+
+LIBHEIF_API
+heif_error heif_item_set_property_extended_language(heif_context* context,
+                                                    heif_item_id item_id,
+                                                    const char* language, heif_property_id* out_optional_propertyId);
+
 // ------------------------- item references -------------------------
 
 /**