Merge pull request #7258 from Lawrence37/raw-dehaze-crash-fix

Multi-frame image crash fix
Beep6581 · Dec 14, 2024 · 9fbdc25 · 9fbdc25
2 parents 31e90af + 2a6b79f
commit 9fbdc25
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
@@ -2690,9 +2690,9 @@ void RawImageSource::copyOriginalPixels(const RAWParams &raw, RawImage *src, con
 */
 
         if (ri->getSensorType() == ST_BAYER) {
-            getMinValsBayer(ri->zeroIsBad());
+            getMinValsBayer(rawData, ri->zeroIsBad());
         } else {
-            getMinValsXtrans();
+            getMinValsXtrans(rawData);
         }
         //
         reddeha = minVals[0];
@@ -8384,7 +8384,7 @@ void RawImageSource::getRawValues(int x, int y, int rotate, int &R, int &G, int
 /*
     Copyright (c) Ingo Weyrich  2020 (heckflosse67@gmx.de)
 */
-void RawImageSource::getMinValsXtrans() {
+void RawImageSource::getMinValsXtrans(const array2D<float> &rawData) {
 #ifdef _OPENMP
     #pragma omp parallel for reduction (min:minVals)
 #endif
@@ -8530,7 +8530,7 @@ void RawImageSource::applyDngGainMap(const float black[4], const std::vector<Gai
 /*
     Copyright (c) Ingo Weyrich  2020 (heckflosse67@gmx.de)
 */
-void RawImageSource::getMinValsBayer(bool zeroIsBad) {
+void RawImageSource::getMinValsBayer(const array2D<float> &rawData, bool zeroIsBad) {
 BENCHFUN
     if (!zeroIsBad) {
 #ifdef _OPENMP

diff --git a/rtengine/rawimagesource.h b/rtengine/rawimagesource.h
@@ -310,8 +310,8 @@ class RawImageSource final : public ImageSource
     void    vflip       (Imagefloat* im);
     void getRawValues(int x, int y, int rotate, int &R, int &G, int &B) override;
     void captureSharpening(const procparams::CaptureSharpeningParams &sharpeningParams, bool showMask, double &conrastThreshold, double &radius) override;
-    void getMinValsXtrans();
-    void getMinValsBayer(bool zeroIsBad);
+    void getMinValsXtrans(const array2D<float> &rawData);
+    void getMinValsBayer(const array2D<float> &rawData, bool zeroIsBad);
     void applyDngGainMap(const float black[4], const std::vector<GainMap> &gainMaps);
 public:
     void wbMul2Camera(double &rm, double &gm, double &bm) override;