handle case where color conversion pipeline has no ops

strukturag · Aug 23, 2024 · f49905f · f49905f
1 parent 315a3bc
commit f49905f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/libheif/color-conversion/colorconversion.cc b/libheif/color-conversion/colorconversion.cc
@@ -427,10 +427,10 @@ std::string ColorConversionPipeline::debug_dump_pipeline() const
 }
 
 
-std::shared_ptr<HeifPixelImage> ColorConversionPipeline::convert_image(const std::shared_ptr<const HeifPixelImage>& input)
+std::shared_ptr<HeifPixelImage> ColorConversionPipeline::convert_image(const std::shared_ptr<HeifPixelImage>& input)
 {
- std::shared_ptr<const HeifPixelImage> in = input;
- std::shared_ptr<HeifPixelImage> out;
+ std::shared_ptr<HeifPixelImage> in = input;
+ std::shared_ptr<HeifPixelImage> out = in;
 
  for (const auto& step : m_conversion_steps) {
 

diff --git a/libheif/color-conversion/colorconversion.h b/libheif/color-conversion/colorconversion.h
@@ -102,7 +102,7 @@ class ColorConversionPipeline
  const ColorState& target_state,
  const heif_color_conversion_options& options);
 
- std::shared_ptr<HeifPixelImage> convert_image(const std::shared_ptr<const HeifPixelImage>& input);
+ std::shared_ptr<HeifPixelImage> convert_image(const std::shared_ptr<HeifPixelImage>& input);
 
  std::string debug_dump_pipeline() const;
 

diff --git a/tests/conversion.cc b/tests/conversion.cc
@@ -283,8 +283,8 @@ void TestConversion(const std::string& test_name, const ColorState& input_state,
  int height = 8;
  REQUIRE(MakeTestImage(input_state, width, height, in_image.get()));
 
- std::shared_ptr<HeifPixelImage> out_image =
-   pipeline.convert_image(in_image);
+ std::shared_ptr<HeifPixelImage> out_image;
+ out_image = pipeline.convert_image(in_image);
 
  REQUIRE(out_image != nullptr);
  CHECK(out_image->get_colorspace() == target_state.colorspace);