Merge pull request #6833 from LoKolbasz/segfault_with_fuji_cropped_raw_issue#6312

Segfault fixed when opening Fuji cropped raw. Fixes #6312
2024-02-04 15:47:28 -08:00
parent e438e0e604 d0b34a3234
commit f65e428e7f
3 changed files with 48 additions and 3 deletions
--- a/rtengine/dcraw.h
+++ b/rtengine/dcraw.h
@@ -76,6 +76,20 @@ public:
    }

 protected:
+    enum class CropMode : std::uint_fast16_t {                                   // RT
+        NA = 0,                                                                  // RT
+        FullFrameOnGfx = 1,                                                      // RT
+        SportsFinderMode = 2,                                                    // RT
+        ElectronicShutter1_25xCrop = 4                                           // RT
+    };                                                                           // RT
+    // stores the cropdata read from the file                                       RT
+    struct CropData {                                                            // RT
+        std::uint_fast16_t  width,                                               // RT
+                            height,                                              // RT
+                            top_margin,                                          // RT
+                            left_margin;                                         // RT
+        CropMode crop_mode = CropMode::NA;                                       // RT
+    } read_crop;                                                                 // RT
    int exif_base, ciff_base, ciff_len;
    rtengine::IMFILE *ifp;
    FILE *ofp;