Merge branch 'dev' into release-5.9

Beep6581 · Nov 27, 2022 · 3717e6e · 3717e6e
2 parents 3182af1 + 2978a2a
commit 3717e6e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
@@ -1,8 +1,9 @@
-name: Build AppImage
+name: AppImage Build
 on:
   push:
     branches:
       - dev
+      - releases
     tags:
       - '[0-9]+.*'
   pull_request:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,17 +4,17 @@ on:
     branches:
       - dev
       - patch**
-      - newlocallab
+      - releases
   pull_request:
     branches:
       - dev
-      - newlocallab
   release:
     types:
       - created
+  workflow_dispatch:
 jobs:
   build:
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
@@ -23,7 +23,7 @@ jobs:
            mkdir build
            date +%s > build/stamp
            brew uninstall --ignore-dependencies libtiff
-           brew install libtiff gtk+3 gtkmm3 gtk-mac-integration adwaita-icon-theme libsigc++@2 little-cms2 libiptcdata fftw lensfun expat pkgconfig libomp shared-mime-info | tee -a depslog
+           brew install libtiff gtk+3 gtkmm3 gtk-mac-integration adwaita-icon-theme libsigc++@2 little-cms2 libiptcdata fftw lensfun expat pkgconfig llvm shared-mime-info | tee -a depslog
            date -u
            echo "----====Pourage====----"
            cat depslog | grep Pouring
@@ -65,6 +65,7 @@ jobs:
             -DCMAKE_RANLIB=/usr/bin/ranlib \
             -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
             ..
+            curl -L https://github.com/Homebrew/homebrew-core/raw/679923b4eb48a8dc7ecc1f05d06063cd79b3fc00/Formula/libomp.rb -o libomp.rb && brew install libomp.rb
             zsh -c 'echo "Configured in $(printf "%0.2f" $(($[$(date +%s)-$(cat configstamp)]/$((60.))))) minutes"'
       - name: Compile RawTherapee
         run: |

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - dev
+      - releases
     tags:
       - '[0-9]+.*'
   pull_request:

diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
@@ -731,6 +731,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
         // Remove transformation if unneeded
         bool needstransform = ipf.needsTransform(fw, fh, imgsrc->getRotateDegree(), imgsrc->getMetaData());
 
+
         if ((needstransform || ((todo & (M_TRANSFORM | M_RGBCURVE))  && params->dirpyrequalizer.cbdlMethod == "bef" && params->dirpyrequalizer.enabled && !params->colorappearance.enabled))) {
             // Forking the image
             assert(oprevi);
@@ -745,6 +746,14 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
             }
         }
 
+        for (int sp = 0; sp < (int)params->locallab.spots.size(); sp++) {
+			if(params->locallab.spots.at(sp).expsharp  && params->dirpyrequalizer.cbdlMethod == "bef") {
+				if(params->locallab.spots.at(sp).shardamping < 1) {
+					params->locallab.spots.at(sp).shardamping = 1;
+				}				
+			}
+		}
+
         if ((todo & (M_TRANSFORM | M_RGBCURVE))  && params->dirpyrequalizer.cbdlMethod == "bef" && params->dirpyrequalizer.enabled && !params->colorappearance.enabled) {
             const int W = oprevi->getWidth();
             const int H = oprevi->getHeight();

diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
@@ -924,6 +924,14 @@ class ImageProcessor
         //ImProcFunctions ipf (&params, true);
         ImProcFunctions &ipf = * (ipf_p.get());
 
+        for (int sp = 0; sp < (int)params.locallab.spots.size(); sp++) {
+			if(params.locallab.spots.at(sp).expsharp  && params.dirpyrequalizer.cbdlMethod == "bef") {
+				if(params.locallab.spots.at(sp).shardamping < 1) {
+					params.locallab.spots.at(sp).shardamping = 1;
+				}				
+			}
+		}
+
         if (params.dirpyrequalizer.cbdlMethod == "bef" && params.dirpyrequalizer.enabled && !params.colorappearance.enabled) {
             const int W = baseImg->getWidth();
             const int H = baseImg->getHeight();