Remove ImageInfo struct

Only `bounds` were being used, so I only keeped that.

Author: Rodrigodd

library/src/main/cpp/image-decoder/decoder_vips.cpp

@@ -25,8 +25,7 @@ VipsDecoder* try_vips_decoder(std::shared_ptr<Stream>& stream, bool cropBorders,
 
 VipsDecoder::VipsDecoder(std::shared_ptr<Stream>&& stream, bool cropBorders,
                          cmsHPROFILE targetProfile)
-    : stream(std::move(stream)), cropBorders(cropBorders),
-      targetProfile(targetProfile) {
+    : stream(std::move(stream)), targetProfile(targetProfile) {
 
   if (VIPS_INIT("VipsDecoder")) {
     LOGE("Failed to initialize libvips.");
@@ -40,7 +39,19 @@ VipsDecoder::VipsDecoder(std::shared_ptr<Stream>&& stream, bool cropBorders,
       // random.
       VImage::option()->set("access", VIPS_ACCESS_RANDOM));
 
-  this->info = parseInfo();
+  this->bounds = {.x = 0,
+                  .y = 0,
+                  .width = (uint32_t)image.width(),
+                  .height = (uint32_t)image.height()};
+
+  // Crop the image if `cropBorders` is enabled
+  if (cropBorders) {
+    // convert image to gray
+    VImage gray_image =
+        image.colourspace(VIPS_INTERPRETATION_B_W).cast(VIPS_FORMAT_UCHAR);
+    this->bounds =
+        findBorders((uint8_t*)gray_image.data(), image.width(), image.height());
+  }
 }
 
 void VipsDecoder::decode(uint8_t* outPixels, const Rect outRect,
@@ -74,24 +85,3 @@ void VipsDecoder::decode(uint8_t* outPixels, const Rect outRect,
   // ensure we didn't write past the end of the buffer
   assert(outline <= outPixelsEnd);
 }
-
-ImageInfo VipsDecoder::parseInfo() {
-  uint32_t imageWidth = this->image.width();
-  uint32_t imageHeight = this->image.height();
-
-  Rect bounds = {.x = 0, .y = 0, .width = imageWidth, .height = imageHeight};
-
-  // Crop the image if `cropBorders` is enabled
-  if (this->cropBorders) {
-    // convert image to gray
-    VImage gray_image = image.colourspace(VIPS_INTERPRETATION_B_W);
-    bounds = findBorders((uint8_t*)gray_image.data(), imageWidth, imageHeight);
-  }
-
-  return ImageInfo{
-      .imageWidth = imageWidth,
-      .imageHeight = imageHeight,
-      .isAnimated = false,
-      .bounds = bounds,
-  };
-}

library/src/main/cpp/image-decoder/decoder_vips.h

@@ -13,14 +13,6 @@
 
 #include <vips/vips8>
 
-struct ImageInfo {
-  uint32_t imageWidth;
-  uint32_t imageHeight;
-  bool isAnimated;
-  // Bound of the image, excluding the borders if `cropBorders` is true.
-  Rect bounds;
-};
-
 class VipsDecoder {
 public:
   /**
@@ -53,8 +45,9 @@ class VipsDecoder {
    */
   void decode(uint8_t* outPixels, Rect outRect, uint32_t sampleSize);
 
-  // Metadata about the image being decoded.
-  ImageInfo info;
+  // The bounds of the image. If `cropBorders` is true, the bounds exclude
+  // borders around the image.
+  Rect bounds;
 
 private:
   // The input stream for reading image data.
@@ -64,15 +57,9 @@ class VipsDecoder {
   // TODO: currently unused, keeping until color management is implemented.
   cmsHPROFILE targetProfile;
 
-  // Indicates whether to crop borders around the image.
-  bool cropBorders;
-
   // The VImage object. Have a reference to `stream`, so it must be declared
   // after it, to ensure it is destroyed first.
   vips::VImage image;
-
-  // Parse the image metadata.
-  ImageInfo parseInfo();
 };
 
 VipsDecoder* try_vips_decoder(std::shared_ptr<Stream>& stream, bool cropBorders,

library/src/main/cpp/image-decoder/java_wrapper.cpp

@@ -57,7 +57,7 @@ Java_dev_mihon_image_decoder_ImageDecoder_nativeNewInstance(
     return nullptr;
   }
 
-  Rect bounds = decoder->info.bounds;
+  Rect bounds = decoder->bounds;
   return create_image_decoder(env, (jlong)decoder, bounds.width, bounds.height);
 }
 
@@ -71,7 +71,7 @@ Java_dev_mihon_image_decoder_ImageDecoder_nativeDecode(JNIEnv* env, jobject,
 
   // Bounds of the image when crop borders is enabled, otherwise it matches the
   // entire image.
-  Rect bounds = decoder->info.bounds;
+  Rect bounds = decoder->bounds;
 
   // Translated requested bounds to the original image.
   Rect inRect = {x + bounds.x, y + bounds.y, (uint32_t)width, (uint32_t)height};