Commit 643c0ce6 for libheif

commit 643c0ce69ecc580279784756c6015fc21f37b75d
Author: Dirk Farin <dirk.farin@gmail.com>
Date:   Thu Mar 12 10:44:33 2026 +0100

    unci: remove encode_static() and encode_full_image(), replace with encode()

diff --git a/libheif/api/libheif/heif_uncompressed.h b/libheif/api/libheif/heif_uncompressed.h
index 2166aabd..fcc0cfb8 100644
--- a/libheif/api/libheif/heif_uncompressed.h
+++ b/libheif/api/libheif/heif_uncompressed.h
@@ -142,7 +142,7 @@ heif_error heif_image_add_sensor_bad_pixels_map(heif_image*,
                                                  uint32_t num_bad_columns,
                                                  const uint32_t* bad_columns,
                                                  uint32_t num_bad_pixels,
-                                                 const struct heif_bad_pixel* bad_pixels);
+                                                 const heif_bad_pixel* bad_pixels);

 // Returns the number of sensor bad pixels maps on this image (0 if none).
 LIBHEIF_API
diff --git a/libheif/codecs/uncompressed/unc_enc.cc b/libheif/codecs/uncompressed/unc_enc.cc
index 6a71121e..cde3a597 100644
--- a/libheif/codecs/uncompressed/unc_enc.cc
+++ b/libheif/codecs/uncompressed/unc_enc.cc
@@ -36,14 +36,17 @@ Result<Encoder::CodedImageData> Encoder_uncompressed::encode(const std::shared_p
                                                              const struct heif_encoding_options& options,
                                                              enum heif_image_input_class input_class)
 {
-  Encoder::CodedImageData codedImage;
+  auto uncEncoder = unc_encoder_factory::get_unc_encoder(image, options);
+  if (uncEncoder.error()) {
+    return uncEncoder.error();
+  }

-  Result<Encoder::CodedImageData> codingResult = unc_encoder::encode_full_image(image, options);
+  auto codingResult = (*uncEncoder)->encode(image, options);
   if (!codingResult) {
     return codingResult.error();
   }

-  codedImage = *codingResult;
+  Encoder::CodedImageData codedImage = *codingResult;

   // codedImage.bitstream = std::move(vec);

diff --git a/libheif/codecs/uncompressed/unc_encoder.cc b/libheif/codecs/uncompressed/unc_encoder.cc
index bd450f91..b37ad91c 100644
--- a/libheif/codecs/uncompressed/unc_encoder.cc
+++ b/libheif/codecs/uncompressed/unc_encoder.cc
@@ -120,19 +120,7 @@ heif_uncompressed_component_format to_unc_component_format(const std::shared_ptr
 }


-Result<Encoder::CodedImageData> unc_encoder::encode_full_image(const std::shared_ptr<const HeifPixelImage>& src_image,
-                                                               const heif_encoding_options& options)
-{
-  auto uncEncoder = unc_encoder_factory::get_unc_encoder(src_image, options);
-  if (uncEncoder.error()) {
-    return uncEncoder.error();
-  }
-
-  return (*uncEncoder)->encode_static(src_image, options);
-}
-
-
-Result<Encoder::CodedImageData> unc_encoder::encode_static(const std::shared_ptr<const HeifPixelImage>& src_image,
+Result<Encoder::CodedImageData> unc_encoder::encode(const std::shared_ptr<const HeifPixelImage>& src_image,
                                                            const heif_encoding_options& in_options) const
 {
   auto parameters = std::unique_ptr<heif_unci_image_parameters,
diff --git a/libheif/codecs/uncompressed/unc_encoder.h b/libheif/codecs/uncompressed/unc_encoder.h
index 0922839c..9b70a725 100644
--- a/libheif/codecs/uncompressed/unc_encoder.h
+++ b/libheif/codecs/uncompressed/unc_encoder.h
@@ -63,11 +63,8 @@ public:

   [[nodiscard]] virtual std::vector<uint8_t> encode_tile(const std::shared_ptr<const HeifPixelImage>& image) const = 0;

-  Result<Encoder::CodedImageData> encode_static(const std::shared_ptr<const HeifPixelImage>& src_image,
-                                                const heif_encoding_options& options) const;
-
-  static Result<Encoder::CodedImageData> encode_full_image(const std::shared_ptr<const HeifPixelImage>& src_image,
-                                                           const heif_encoding_options& options);
+  Result<Encoder::CodedImageData> encode(const std::shared_ptr<const HeifPixelImage>& src_image,
+                                         const heif_encoding_options& options) const;

 protected:
   std::shared_ptr<Box_cmpd> m_cmpd;
diff --git a/libheif/image-items/unc_image.cc b/libheif/image-items/unc_image.cc
index 760c49ce..9fed8a47 100644
--- a/libheif/image-items/unc_image.cc
+++ b/libheif/image-items/unc_image.cc
@@ -97,7 +97,7 @@ Result<Encoder::CodedImageData> ImageItem_uncompressed::encode(const std::shared
     return {uncEncoder.error()};
   }

-  return (*uncEncoder)->encode_static(src_image, options);
+  return (*uncEncoder)->encode(src_image, options);
 }