resolve initializing heif_encoding_options in ImageItem_Grid (#1523)

Author: farindk

libheif/image-items/grid.cc

@@ -146,18 +146,20 @@ std::string ImageGrid::dump() const
 ImageItem_Grid::ImageItem_Grid(HeifContext* ctx)
     : ImageItem(ctx)
 {
-  auto* options = heif_encoding_options_alloc();
-  heif_encoding_options_copy(&m_encoding_options, options);
-  heif_encoding_options_free(options);
+  m_encoding_options = heif_encoding_options_alloc();
 }
 
 
 ImageItem_Grid::ImageItem_Grid(HeifContext* ctx, heif_item_id id)
     : ImageItem(ctx, id)
 {
-  auto* options = heif_encoding_options_alloc();
-  heif_encoding_options_copy(&m_encoding_options, options);
-  heif_encoding_options_free(options);
+  m_encoding_options = heif_encoding_options_alloc();
+}
+
+
+ImageItem_Grid::~ImageItem_Grid()
+{
+  heif_encoding_options_free(m_encoding_options);
 }
 
 

libheif/image-items/grid.h

@@ -80,6 +80,8 @@ class ImageItem_Grid : public ImageItem
 
   ImageItem_Grid(HeifContext* ctx);
 
+  ~ImageItem_Grid() override;
+
   uint32_t get_infe_type() const override { return fourcc("grid"); }
 
   static Result<std::shared_ptr<ImageItem_Grid>> add_new_grid_item(HeifContext* ctx,
@@ -113,10 +115,10 @@ class ImageItem_Grid : public ImageItem
   int get_chroma_bits_per_pixel() const override;
 
   void set_encoding_options(const heif_encoding_options* options) {
-    m_encoding_options = *options;
+    heif_encoding_options_copy(m_encoding_options, options);
   }
 
-  const heif_encoding_options* get_encoding_options() const { return &m_encoding_options; }
+  const heif_encoding_options* get_encoding_options() const { return m_encoding_options; }
 
   Result<Encoder::CodedImageData> encode(const std::shared_ptr<HeifPixelImage>& image,
                                          struct heif_encoder* encoder,
@@ -155,7 +157,7 @@ class ImageItem_Grid : public ImageItem
   ImageGrid m_grid_spec;
   std::vector<heif_item_id> m_grid_tile_ids;
 
-  heif_encoding_options m_encoding_options;
+  heif_encoding_options* m_encoding_options = nullptr;
 
   Error read_grid_spec();