Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish

2024-09-04 00:06:43 +02:00 · 2024-09-04 00:06:43 +02:00 · 2536e6d112
commit 2536e6d112
parent c9d1638ee6 40dccc3fcf
11 changed files with 1679 additions and 1594 deletions
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@ -18,20 +18,25 @@ jobs:
  build:
    runs-on: macos-12
    steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with: 
+          fetch-tags: '0'
+          fetch-depth: '0'
      - name: Install dependencies
        run: |
           date -u
           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 llvm shared-mime-info exiv2 jpeg-xl libomp automake libtool | tee -a depslog
+           brew install imagemagick create-dmg libtiff gtk+3 gtkmm3 gtk-mac-integration adwaita-icon-theme libsigc++@2 little-cms2 libiptcdata fftw lensfun expat pkgconfig llvm shared-mime-info exiv2 jpeg-xl libomp automake libtool | tee -a depslog
           date -u
           echo "----====Pourage====----"
           cat depslog | grep Pouring
-           zsh -c 'echo "Completed installation of dependencies in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"'
+           zsh -c 'echo "Completed installation of dependencies in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
      - name: Configure build system
        env:
+          IDENT: '-'
          CMAKE_CXX_STANDARD: 11
          PKG_CONFIG_PATH: /usr/local/opt/libtiff/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig
          C_FLAGS: >
@ -47,12 +52,12 @@ jobs:
          cmake \
            -DCMAKE_BUILD_TYPE="Release" \
            -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-            -DCMAKE_EXE_LINKER_FLAGS="-L. -L/usr/local/lib -Wl,-rpath -Wl,/usr/local/lib -L/usr/local/opt/gdk-pixbuf/lib -L/usr/local/opt/libiconv/lib -L/usr/local/opt/libomp/lib -L/usr/local/opt/libffi/lib -L/usr/local/opt/libffi/lib -L/usr/local/opt/libxml2/lib -L/usr/local/opt/expat/lib" \
+            -DCMAKE_EXE_LINKER_FLAGS="-L. -L/usr/local/lib -Wl,-rpath -Wl,/usr/local/lib -L/usr/local/opt/gdk-pixbuf/lib -L/usr/local/opt/libomp/lib -L/usr/local/opt/expat/lib" \
            -DCACHE_NAME_SUFFIX="${RAW_THERAPEE_VERSION}-${REF}" \
            -DPROC_TARGET_NUMBER="1" \
            -DPROC_LABEL="generic processor" \
            -DCMAKE_OSX_ARCHITECTURES=$(uname -m) \
-            -DWITH_LTO="OFF" \
+            -DWITH_LTO="ON" \
            -DLENSFUNDBDIR="/Applications/RawTherapee.app/Contents/Resources/share/lensfun" \
            -DCMAKE_C_COMPILER=clang \
            -DCMAKE_CXX_COMPILER=clang++ \
@ -67,28 +72,30 @@ jobs:
            -DCMAKE_RANLIB=/usr/bin/ranlib \
            -DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 \
            -DCONTINUOUS=ON \
-            -DCODESIGNID:STRING="-" \
+            -DCODESIGNID:STRING="$IDENT" \
+            -DFANCY_DMG="ON" \
            ..
-            zsh -c 'echo "Configured in $(printf "%0.2f" $(($[$(date +%s)-$(cat configstamp)]/$((60.))))) minutes"'
+            zsh -c 'echo "Configured in $(printf "%0.2f" $(($[$(date +%s)-$(cat configstamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
      - name: Compile RawTherapee
        run: |
          date -u && date +%s > build/compilestamp
          cd build
          export REF=${GITHUB_REF##*/}
          make -j$(sysctl -a | grep machdep.cpu.thread_count | tail -c 2) install
-          zsh -c 'echo "Compiled in $(printf "%0.2f" $(($[$(date +%s)-$(cat compilestamp)]/$((60.))))) minutes"'
+          zsh -c 'echo "Compiled in $(printf "%0.2f" $(($[$(date +%s)-$(cat compilestamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
      - name: Create application bundle
        run: |
          zsh
          date +%s > build/bundlestamp && date -u && cd build
-          export REF=${GITHUB_REF##*/} && export LOCAL_PREFIX=/usr && sudo make macosx_bundle
+          echo "Automated Build! WARNING:\nNot intended for end-user testing." > message
+          export REF=${GITHUB_REF##*/} && sudo make macosx_bundle
          export ARTIFACT=(RawTherapee*${CMAKE_BUILD_TYPE}.zip)
          echo "=== artifact: ${ARTIFACT}"
          # defining environment variables for next step as per
          # https://github.com/actions/starter-workflows/issues/68
          echo "ARTIFACT_PATH=${GITHUB_WORKSPACE}/build/${ARTIFACT}" >> $GITHUB_ENV
          echo "ARTIFACT_FILE=${ARTIFACT}" >> $GITHUB_ENV
-          zsh -c 'echo "Bundled in $(printf "%0.2f" $(($[$(date +%s)-$(cat bundlestamp)]/$((60.))))) minutes"'
+          zsh -c 'echo "Bundled in $(printf "%0.2f" $(($[$(date +%s)-$(cat bundlestamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
          printf '%s\n' \
            "REF: ${REF}" \
            "ARTIFACT: ${ARTIFACT}" \
@ -103,15 +110,23 @@ jobs:
      - name: Finish build
        run: |
          date -u
-          zsh -c 'echo "Build completed in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"'
+          zsh -c 'echo "Build completed in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
+
      - name: Test-launch the app
        run: |
          cd build
          sudo cp -R RawTherapee.app /Applications
-          open -a RawTherapee
+          open -a /Applications/RawTherapee.app
          sleep 5
-          osascript -e 'tell application "Finder"' -e 'get the name of every process whose visible is true' -e 'end tell'
+          echo "Applications running: $(osascript -e 'tell application "Finder" to get the name of every process whose visible is true')" >> $GITHUB_STEP_SUMMARY
+          osascript -e 'if application "RawTherapee" is not running then do shell script "exit 1"'
          osascript -e 'tell application "RawTherapee" to if it is running then quit'
+
+      - name: Test the -cli
+        run: |
+          cd build
+          echo "$(RawTherapee*folder/rawtherapee-cli --version)" >> $GITHUB_STEP_SUMMARY
+
      - name: Publish artifacts
        uses: softprops/action-gh-release@v2
        if: ${{github.ref_type == 'tag' || github.ref_name == 'dev'}}
@ -119,24 +134,30 @@ jobs:
          tag_name: nightly-github-actions
          files: |
            ${{env.ARTIFACT_PATH}}
+            

  armbuild:
    runs-on: macos-14
    steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with: 
+          fetch-tags: '0'
+          fetch-depth: '0'
      - name: Install dependencies
        run: |
           date -u
           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 llvm shared-mime-info exiv2 jpeg-xl libomp automake libtool | tee -a depslog
+           brew install imagemagick create-dmg libtiff gtk+3 gtkmm3 gtk-mac-integration adwaita-icon-theme libsigc++@2 little-cms2 libiptcdata fftw lensfun expat pkgconfig llvm shared-mime-info exiv2 jpeg-xl libomp automake libtool | tee -a depslog
           date -u
           echo "----====Pourage====----"
           cat depslog | grep Pouring
-           zsh -c 'echo "Completed installation of dependencies in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"'
+           zsh -c 'echo "Completed installation of dependencies in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
      - name: Configure build system
        env:
+          IDENT: '-'
          CMAKE_CXX_STANDARD: 11
          PKG_CONFIG_PATH: /opt/homebrew/opt/libtiff/lib/pkgconfig:opt/homebrew/opt/libffi/lib/pkgconfig:/ope/homebrew/opt/expat/lib/pkgconfig
          C_FLAGS: >
@ -152,7 +173,7 @@ jobs:
          cmake \
            -DCMAKE_BUILD_TYPE="Release" \
            -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-            -DCMAKE_EXE_LINKER_FLAGS="-L. -L/opt/homebrew/lib -Wl,-rpath -Wl,/opt/homebrew/lib -L/opt/homebrew/opt/gdk-pixbuf/lib -L/opt/homebrew/opt/libiconv/lib -L/opt/homebrew/opt/libomp/lib -L/opt/homebrew/opt/libffi/lib -L/opt/homebrew/opt/libffi/lib -L/opt/homebrew/opt/libxml2/lib -L/opt/homebrew/opt/expat/lib" \
+            -DCMAKE_EXE_LINKER_FLAGS="-L. -L/opt/homebrew/lib -Wl,-rpath -Wl,/opt/homebrew/lib -L/opt/homebrew/opt/gdk-pixbuf/lib -L/opt/homebrew/opt/libomp/lib -L/opt/homebrew/opt/expat/lib" \
            -DCACHE_NAME_SUFFIX="${RAW_THERAPEE_VERSION}-${REF}" \
            -DCMAKE_OSX_ARCHITECTURES=arm64 \
            -DWITH_LTO="ON" \
@ -170,28 +191,31 @@ jobs:
            -DCMAKE_RANLIB=/usr/bin/ranlib \
            -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
            -DCONTINUOUS=ON \
-            -DCODESIGNID:STRING="-" \
+            -DCODESIGNID:STRING="$IDENT" \
+            -DLOCAL_PREFIX=/opt/homebrew \
+            -DFANCY_DMG="ON" \
            ..
-            zsh -c 'echo "Configured in $(printf "%0.2f" $(($[$(date +%s)-$(cat configstamp)]/$((60.))))) minutes"'
+            zsh -c 'echo "Configured in $(printf "%0.2f" $(($[$(date +%s)-$(cat configstamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
      - name: Compile RawTherapee
        run: |
          date -u && date +%s > build/compilestamp
          cd build
          export REF=${GITHUB_REF##*/}
          make -j$(sysctl -a | grep machdep.cpu.thread_count | tail -c 2) install
-          zsh -c 'echo "Compiled in $(printf "%0.2f" $(($[$(date +%s)-$(cat compilestamp)]/$((60.))))) minutes"'
+          zsh -c 'echo "Compiled in $(printf "%0.2f" $(($[$(date +%s)-$(cat compilestamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
      - name: Create application bundle
        run: |
          zsh
          date +%s > build/bundlestamp && date -u && cd build
-          export REF=${GITHUB_REF##*/} && export LOCAL_PREFIX=/usr && sudo make macosx_bundle
+          echo "Automated Build! WARNING:\nNot intended for end-user testing." > message
+          export REF=${GITHUB_REF##*/} && sudo make macosx_bundle
          export ARTIFACT=(RawTherapee*${CMAKE_BUILD_TYPE}.zip)
          echo "=== artifact: ${ARTIFACT}"
          # defining environment variables for next step as per
          # https://github.com/actions/starter-workflows/issues/68
          echo "ARTIFACT_PATH=${GITHUB_WORKSPACE}/build/${ARTIFACT}" >> $GITHUB_ENV
          echo "ARTIFACT_FILE=${ARTIFACT}" >> $GITHUB_ENV
-          zsh -c 'echo "Bundled in $(printf "%0.2f" $(($[$(date +%s)-$(cat bundlestamp)]/$((60.))))) minutes"'
+          zsh -c 'echo "Bundled in $(printf "%0.2f" $(($[$(date +%s)-$(cat bundlestamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
          printf '%s\n' \
            "REF: ${REF}" \
            "ARTIFACT: ${ARTIFACT}" \
@ -199,6 +223,7 @@ jobs:
            "ARTIFACT_FILE: ${ARTIFACT_FILE}" \
            "PUBLISH_NAME: ${PUBLISH_NAME}"
          exit
+
      - uses: actions/upload-artifact@v4
        with:
          name: ${{env.ARTIFACT_FILE}}
@ -206,12 +231,23 @@ jobs:
      - name: Finish build
        run: |
          date -u
-          zsh -c 'echo "Build completed in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"'
+          zsh -c 'echo "Build completed in $(printf "%0.2f" $(($[$(date +%s)-$(cat build/stamp)]/$((60.))))) minutes"' >> $GITHUB_STEP_SUMMARY
+
      - name: Test-launch the app
        run: |
-          cd build 
+          cd build
          sudo cp -R RawTherapee.app /Applications
-          time RawTherapee_*/rawtherapee-cli
+          open -a /Applications/RawTherapee.app
+          sleep 5
+          echo "Applications running: $(osascript -e 'tell application "Finder" to get the name of every process whose visible is true')" >> $GITHUB_STEP_SUMMARY
+          osascript -e 'if application "RawTherapee" is not running then do shell script "exit 1"'
+          osascript -e 'tell application "RawTherapee" to if it is running then quit'
+
+      - name: Test the -cli
+        run: |
+          cd build
+          echo "$(RawTherapee*folder/rawtherapee-cli --version)" >> $GITHUB_STEP_SUMMARY
+
      - name: Publish artifacts
        uses: softprops/action-gh-release@v2
        if: ${{github.ref_type == 'tag' || github.ref_name == 'dev'}}
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@ -1,4 +1,4 @@
-RAWTHERAPEE 5.10-dev RELEASE NOTES
+RAWTHERAPEE 5.11-dev RELEASE NOTES

 This is a development version of RawTherapee. We update the code almost daily. Every few months, once enough changes have accumulated and the code is stabilized, we make a new official release. Every code change between these releases is known as a "development" version, and this is one of them.

@ -22,7 +22,7 @@ In order to use RawTherapee efficiently you should know that:



-NEW FEATURES SINCE 5.10
+NEW FEATURES SINCE 5.11

 - TODO
 - Added or improved support for cameras, raw formats and color profiles:
@ -32,13 +32,15 @@ NEW FEATURES SINCE 5.10

 NEWS RELEVANT TO PACKAGE MAINTAINERS

-New since 5.10:
+New since 5.11:
 - TODO

 In general:
- To get the source code, either clone from git or use the tarball from https://rawtherapee.com/shared/source/ . Do not use the auto-generated GitHub release tarballs.
- Requires GTK+ version >=3.22.24 in Windows, else >=3.16 (though >=3.22.24 is recommended).
- GTK+ versions 3.24.2 - 3.24.6 have an issue where combobox menu scroll-arrows are missing when the combobox list does not fit vertically on the screen. As a result, users would not be able to scroll in the following comboboxes: Processing Profiles, Film Simulation, and the camera and lens profiles in Profiled Lens Correction.
+- To get the source code, either clone from git or use the tarball from https://rawtherapee.com/shared/source/. Do not use the auto-generated GitHub release tarballs.
+- Requires GTK+ version >= 3.24.3.
+- GTK+ versions 3.24.3 - 3.24.6 have an issue where combobox menu scroll-arrows are missing when the combobox list does not fit vertically on the screen. As a result, users would not be able to scroll in the following comboboxes: Processing Profiles, Film Simulation, and the camera and lens profiles in Profiled Lens Correction.
+- JPEG XL read support depends on libjxl. By default, RawTherapee builds with JPEG XL support if and only if libjxl is present. Use -DWITH_JXL="ON" or DWITH_JXL="OFF" to explicitly enable or disable, respectively, JPEG XL support.
+- RawTherapee builds with a custom version of LibRaw by default. To use the system LibRaw, use -DWITH_SYSTEM_LIBRAW="ON". Requires LibRaw >= 0.21.
 - RawTherapee 5 requires GCC-4.9 or higher, or Clang.
 - Do not use -ffast-math, it will not make RawTherapee faster but will introduce artifacts.
 - Use -O3, it will make RawTherapee faster with no known side-effects.
--- a/com.rawtherapee.RawTherapee.appdata.xml
+++ b/com.rawtherapee.RawTherapee.appdata.xml
@ -22,6 +22,7 @@
    <url type="translate">https://rawpedia.rawtherapee.com/Main_Page#Localization</url>
    <launchable type="desktop-id">rawtherapee.desktop</launchable>
    <releases>
+        <release version="5.11" date="2024-08-25" type="stable"></release>
        <release version="5.10" date="2024-02-16" type="stable"></release>
        <release version="5.9" date="2022-11-27" type="stable"></release>
        <release version="5.8" date="2020-02-04" type="stable"></release>
--- a/rtdata/images/splash.svg
+++ b/rtdata/images/splash.svg
@ -7,7 +7,7 @@
   viewBox="0 0 160 99.999999"
   version="1.1"
   id="svg783"
-   inkscape:version="1.3.1 (91b66b0783, 2023-11-16, custom)"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
   sodipodi:docname="splash.svg"
   inkscape:export-filename="/tmp/splash.png"
   inkscape:export-xdpi="96"
@ -26,15 +26,15 @@
  <defs
     id="defs777">
    <rect
-       x="-430.18853"
+       x="-430.18854"
       y="-11.775234"
-       width="560.50112"
-       height="438.03869"
+       width="560.5011"
+       height="438.0387"
       id="rect183260" />
    <rect
-       x="-457.66408"
+       x="-457.66409"
       y="-16.485327"
-       width="370.52735"
+       width="370.52734"
       height="390.15274"
       id="rect181038" />
    <linearGradient
@ -238,7 +238,7 @@
    <filter
       width="1.3101085"
       height="3.1717951"
-       y="-1.0858975"
+       y="-1.0858974"
       x="-0.15505423"
       inkscape:label="RawTherapee white"
       id="filter4749-3"
@ -907,7 +907,7 @@
    </filter>
    <filter
       width="1.2125351"
-       height="4.2627359"
+       height="4.2627358"
       y="-1.6313679"
       x="-0.10626753"
       inkscape:label="RawTherapee white"
@ -967,6 +967,37 @@
         in2="blur"
         id="feComposite4757-6-3" />
    </filter>
+    <filter
+       width="2.1437705"
+       height="2.5121801"
+       y="-0.75609007"
+       x="-0.57188526"
+       inkscape:label="RawTherapee white"
+       id="filter4749-6"
+       style="color-interpolation-filters:sRGB"
+       inkscape:auto-region="true">
+      <feFlood
+         result="flood"
+         flood-color="rgb(255,255,255)"
+         flood-opacity="0.24524714828897337"
+         id="feFlood4751-2" />
+      <feComposite
+         result="composite1"
+         operator="in"
+         in="flood"
+         in2="SourceGraphic"
+         id="feComposite4753-9" />
+      <feGaussianBlur
+         result="blur"
+         stdDeviation="2"
+         id="feGaussianBlur4755-1" />
+      <feComposite
+         result="composite2"
+         operator="over"
+         in="SourceGraphic"
+         in2="blur"
+         id="feComposite4757-2" />
+    </filter>
  </defs>
  <sodipodi:namedview
     id="base"
@ -976,10 +1007,10 @@
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="2"
-     inkscape:cx="305.75"
-     inkscape:cy="191.25"
+     inkscape:cx="319.75"
+     inkscape:cy="229.25"
     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="g1"
     showgrid="false"
     units="mm"
     inkscape:snap-bbox="true"
@ -1001,8 +1032,8 @@
     inkscape:object-nodes="false"
     inkscape:snap-nodes="true"
     inkscape:snap-global="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1042"
+     inkscape:window-width="1283"
+     inkscape:window-height="694"
     inkscape:window-x="0"
     inkscape:window-y="0"
     inkscape:window-maximized="1"
@ -1217,11 +1248,11 @@
         transform="matrix(1,0,0.05240778,1,-0.25547655,-0.02528481)"
         aria-label="5" />
      <path
-         style="font-weight:bold;font-size:11.9944px;line-height:1.25;font-family:'ITC Eras Std';-inkscape-font-specification:'ITC Eras Std Bold';letter-spacing:-2.11667px;fill:#ffffff;stroke-width:0.537916"
-         d="m 67.797281,246.87354 c -0.07197,1.95509 -0.179916,3.91017 -0.335843,5.85327 h 2.578796 c 0,-1.79916 0.275871,-6.69288 0.443792,-8.00027 h -2.542812 c -0.395816,0.38382 -0.911575,0.61172 -1.367362,0.89958 l -0.08396,2.12301 z m 6.951093,5.9972 c 2.902645,0 3.730259,-2.39888 3.730259,-4.54588 0,-2.15899 -0.947558,-3.74225 -3.29846,-3.74225 -2.350903,0 -3.658292,1.66722 -3.658292,4.67782 0,2.06303 1.019524,3.61031 3.226493,3.61031 z m 0.395816,-6.60891 c 0.887585,0 0.98354,1.36736 0.98354,2.03904 0,0.79163 -0.203904,2.89065 -1.259412,2.89065 -0.875591,0 -0.995535,-1.2714 -0.995535,-1.93109 0,-0.80363 0.143933,-2.9986 1.271407,-2.9986 z"
+         style="font-size:9.525px;line-height:1.25;font-family:'Eras Bold ITC';-inkscape-font-specification:'Eras Bold ITC';letter-spacing:-0.992188px;fill:#ffffff;stroke-width:0.537916;filter:url(#filter4749-6)"
+         d="m 66.972844,252.72681 q 0.06046,-0.72089 0.153479,-2.33009 0.09302,-1.60921 0.10697,-2.30219 -0.172082,0.10697 -0.334863,0.21394 -0.162781,0.10232 -0.706934,0.493 0.02791,-0.39533 0.05116,-0.92553 0.02325,-0.53485 0.02325,-0.786 0.237195,-0.13487 0.534851,-0.32091 0.302307,-0.18603 0.36742,-0.23254 0.06976,-0.0512 0.204638,-0.15813 0.413929,0.009 0.953431,0.009 0.511596,0 1.046447,-0.009 l -0.09302,1.03714 -0.199988,3.44165 -0.04651,1.26504 v 0.60462 q -0.395325,-0.009 -0.962732,-0.009 -0.660425,0 -1.097607,0.009 z m 5.212084,0 q 0.06046,-0.72089 0.153479,-2.33009 0.09302,-1.60921 0.10697,-2.30219 -0.172082,0.10697 -0.334863,0.21394 -0.162781,0.10232 -0.706933,0.493 0.02791,-0.39533 0.05116,-0.92553 0.02326,-0.53485 0.02326,-0.786 0.237194,-0.13487 0.534851,-0.32091 0.302307,-0.18603 0.367419,-0.23254 0.06976,-0.0512 0.204639,-0.15813 0.413928,0.009 0.95343,0.009 0.511596,0 1.046448,-0.009 l -0.09302,1.03714 -0.199988,3.44165 -0.04651,1.26504 v 0.60462 q -0.395324,-0.009 -0.962731,-0.009 -0.660425,0 -1.097608,0.009 z"
         id="text40750"
-         transform="matrix(1,0,0.05240778,1,-0.25547655,-0.02528481)"
-         aria-label="10" />
+         transform="matrix(1.2598254,0,0.06602465,1.2598254,-20.609477,-65.690131)"
+         aria-label="11" />
      <path
         style="font-weight:bold;font-size:11.9944px;line-height:1.25;font-family:'ITC Eras Std';-inkscape-font-specification:'ITC Eras Std Bold';fill:#ffffff;stroke-width:0.537916"
         d="m 64.443833,252.74211 0.10795,-2.08702 h -2.218964 l -0.08396,2.08702 z"
@ -1231,7 +1262,7 @@
    </g>
    <path
       style="font-weight:500;font-size:4.23333px;line-height:1.25;font-family:'ITC Eras Std';-inkscape-font-specification:'ITC Eras Std Medium';letter-spacing:0px;word-spacing:-0.132292px;fill:#ffffff;stroke-width:0.0495763px"
-       d="m 7.2937831,275.81534 h 0.6392328 l -0.0381,0.9652 c -0.2328331,0.0677 -0.4783662,0.10584 -0.719666,0.10584 -0.7069661,0 -1.1556991,-0.34714 -1.1556991,-1.09644 0,-0.68156 0.4444997,-1.25306 1.3207989,-1.25306 0.3047998,0 0.6011329,0.0677 0.8889993,0.16087 l -0.021167,-0.33444 c -0.2878664,-0.0677 -0.5841995,-0.11006 -0.8847659,-0.11006 -1.3673655,0 -1.6933319,0.9652 -1.6933319,1.54939 0,0.95674 0.6646328,1.36737 1.5493987,1.36737 0.3640664,0 0.7196661,-0.0635 1.0752658,-0.13547 0.016933,-0.69426 0.033867,-1.09643 0.0635,-1.49436 H 7.3064831 Z m 1.6552343,-1.51553 c -0.016933,0.94404 -0.0508,1.88383 -0.1227665,2.82363 h 0.372533 c 0.0127,-0.8001 0.0508,-1.59596 0.084667,-2.37913 h 0.00847 c 0.5122329,0.78317 1.0710329,1.56633 1.5790319,2.37913 h 0.4953 c 0.0254,-0.9398 0.05927,-1.88383 0.127,-2.82363 h -0.372533 c 0.0042,0.4953 -0.05503,1.61713 -0.08043,2.40877 h -0.0085 c -0.5207,-0.79587 -1.0794994,-1.5875 -1.5832657,-2.40877 z m 3.1707676,0 c -0.01693,0.6477 -0.08043,1.70603 -0.08043,1.9939 0,0.51647 0.3937,0.8763 1.172633,0.8763 0.990599,0 1.257299,-0.46143 1.274232,-1.03717 0.02117,-0.74083 0.06773,-1.28693 0.09737,-1.83303 h -0.4064 c -0.0042,0.4064 -0.0635,1.77377 -0.118533,2.04047 -0.08467,0.40216 -0.440267,0.5461 -0.8128,0.5461 -0.529166,0 -0.821266,-0.2159 -0.821266,-0.76624 0,-0.41063 0.05927,-1.21919 0.1016,-1.82033 z m 5.62927,1.51553 h 0.639233 l -0.0381,0.9652 c -0.232833,0.0677 -0.478367,0.10584 -0.719666,0.10584 -0.706966,0 -1.155699,-0.34714 -1.155699,-1.09644 0,-0.68156 0.444499,-1.25306 1.320798,-1.25306 0.3048,0 0.601133,0.0677 0.889,0.16087 l -0.02117,-0.33444 c -0.287866,-0.0677 -0.584199,-0.11006 -0.884766,-0.11006 -1.367365,0 -1.693332,0.9652 -1.693332,1.54939 0,0.95674 0.664633,1.36737 1.549399,1.36737 0.364066,0 0.719666,-0.0635 1.075266,-0.13547 0.01693,-0.69426 0.03387,-1.09643 0.0635,-1.49436 h -1.011766 z m 2.650066,-1.24036 c 0.198966,0 0.4445,0.0847 0.4445,0.42333 0,0.4191 -0.325967,0.5969 -0.702733,0.5969 -0.105833,0 -0.207433,-0.0127 -0.313267,-0.0296 l 0.07197,0.26246 c 0.110067,0.0169 0.220133,0.0296 0.3302,0.0296 0.537633,0 1.003299,-0.30057 1.003299,-0.88053 0,-0.24977 -0.131233,-0.67734 -0.7239,-0.67734 h -1.117599 c 0,0.3683 -0.02963,1.88807 -0.110066,2.82363 h 0.3937 c 0,-0.9779 0.04233,-1.76106 0.0762,-2.54846 z m 1.274229,-0.27517 c -0.0127,1.08797 -0.03387,1.8288 -0.122766,2.82363 h 1.756832 l 0.01693,-0.28786 c -0.08467,0.004 -0.334433,0.0127 -0.605366,0.0127 h -0.749299 c 0.0381,-1.0668 0.0762,-1.80763 0.118533,-2.54847 z m 3.357035,0.72814 -0.740833,1.78223 -0.592666,-1.78223 h -0.385233 l 0.757766,2.09549 h 0.4064 c 0.296333,-0.70696 0.618066,-1.40123 0.939799,-2.09549 z m 0.567268,2.03623 c 0.245533,0.0635 0.499533,0.10583 0.757766,0.10583 0.842432,0 1.142999,-0.4445 1.142999,-0.8509 0,-0.41063 -0.2667,-0.635 -0.630766,-0.65617 v -0.008 c 0.262466,-0.072 0.605366,-0.2413 0.605366,-0.7239 0,-0.5715 -0.5334,-0.67733 -0.994833,-0.67733 -0.215899,0 -0.431799,0.0296 -0.643466,0.0635 l -0.0508,0.2921 c 0.211667,-0.0635 0.4318,-0.0931 0.651933,-0.0931 0.3175,0 0.6223,0.0974 0.6223,0.46567 0,0.22437 -0.182034,0.54186 -0.757766,0.54186 -0.09313,0 -0.160867,-0.004 -0.2286,-0.0169 l -0.01693,0.2921 c 0.09737,-0.008 0.194734,-0.0127 0.2921,-0.0127 0.3429,0 0.762,0.0804 0.762,0.50377 0,0.42333 -0.3556,0.5969 -0.7747,0.5969 -0.270933,0 -0.524933,-0.0635 -0.766233,-0.15664 z"
+       d="m 7.2937831,275.81534 h 0.6392328 l -0.0381,0.9652 c -0.2328331,0.0677 -0.4783662,0.10584 -0.719666,0.10584 -0.7069661,0 -1.1556991,-0.34714 -1.1556991,-1.09644 0,-0.68156 0.4444997,-1.25306 1.3207989,-1.25306 0.3047998,0 0.6011329,0.0677 0.8889993,0.16087 l -0.021167,-0.33444 c -0.2878664,-0.0677 -0.5841995,-0.11006 -0.8847659,-0.11006 -1.3673655,0 -1.6933319,0.9652 -1.6933319,1.54939 0,0.95674 0.6646328,1.36737 1.5493987,1.36737 0.3640664,0 0.7196661,-0.0635 1.0752658,-0.13547 0.016933,-0.69426 0.033867,-1.09643 0.0635,-1.49436 H 7.3064831 Z m 1.6552343,-1.51553 c -0.016933,0.94404 -0.0508,1.88383 -0.1227665,2.82363 h 0.372533 c 0.0127,-0.8001 0.0508,-1.59596 0.084667,-2.37913 h 0.00847 c 0.5122329,0.78317 1.0710331,1.56633 1.5790321,2.37913 h 0.4953 c 0.0254,-0.9398 0.05927,-1.88383 0.127,-2.82363 H 11.12072 c 0.0042,0.4953 -0.05503,1.61713 -0.08043,2.40877 h -0.0085 c -0.5207,-0.79587 -1.0794996,-1.5875 -1.5832659,-2.40877 z m 3.1707676,0 c -0.01693,0.6477 -0.08043,1.70603 -0.08043,1.9939 0,0.51647 0.3937,0.8763 1.172633,0.8763 0.990599,0 1.257299,-0.46143 1.274232,-1.03717 0.02117,-0.74083 0.06773,-1.28693 0.09737,-1.83303 h -0.4064 c -0.0042,0.4064 -0.0635,1.77377 -0.118533,2.04047 -0.08467,0.40216 -0.440267,0.5461 -0.8128,0.5461 -0.529166,0 -0.821266,-0.2159 -0.821266,-0.76624 0,-0.41063 0.05927,-1.21919 0.1016,-1.82033 z m 5.62927,1.51553 h 0.639233 l -0.0381,0.9652 c -0.232833,0.0677 -0.478367,0.10584 -0.719666,0.10584 -0.706966,0 -1.155699,-0.34714 -1.155699,-1.09644 0,-0.68156 0.444499,-1.25306 1.320798,-1.25306 0.3048,0 0.601133,0.0677 0.889,0.16087 l -0.02117,-0.33444 c -0.287866,-0.0677 -0.584199,-0.11006 -0.884766,-0.11006 -1.367365,0 -1.693332,0.9652 -1.693332,1.54939 0,0.95674 0.664633,1.36737 1.549399,1.36737 0.364066,0 0.719666,-0.0635 1.075266,-0.13547 0.01693,-0.69426 0.03387,-1.09643 0.0635,-1.49436 h -1.011766 z m 2.650066,-1.24036 c 0.198966,0 0.4445,0.0847 0.4445,0.42333 0,0.4191 -0.325967,0.5969 -0.702733,0.5969 -0.105833,0 -0.207433,-0.0127 -0.313267,-0.0296 l 0.07197,0.26246 c 0.110067,0.0169 0.220133,0.0296 0.3302,0.0296 0.537633,0 1.003299,-0.30057 1.003299,-0.88053 0,-0.24977 -0.131233,-0.67734 -0.7239,-0.67734 h -1.117599 c 0,0.3683 -0.02963,1.88807 -0.110066,2.82363 h 0.3937 c 0,-0.9779 0.04233,-1.76106 0.0762,-2.54846 z m 1.274229,-0.27517 c -0.0127,1.08797 -0.03387,1.8288 -0.122766,2.82363 h 1.756832 l 0.01693,-0.28786 c -0.08467,0.004 -0.334433,0.0127 -0.605366,0.0127 h -0.749299 c 0.0381,-1.0668 0.0762,-1.80763 0.118533,-2.54847 z m 3.357035,0.72814 -0.740833,1.78223 -0.592666,-1.78223 h -0.385233 l 0.757766,2.09549 h 0.4064 c 0.296333,-0.70696 0.618066,-1.40123 0.939799,-2.09549 z m 0.567268,2.03623 c 0.245533,0.0635 0.499533,0.10583 0.757766,0.10583 0.842432,0 1.142999,-0.4445 1.142999,-0.8509 0,-0.41063 -0.2667,-0.635 -0.630766,-0.65617 v -0.008 c 0.262466,-0.072 0.605366,-0.2413 0.605366,-0.7239 0,-0.5715 -0.5334,-0.67733 -0.994833,-0.67733 -0.215899,0 -0.431799,0.0296 -0.643466,0.0635 l -0.0508,0.2921 c 0.211667,-0.0635 0.4318,-0.0931 0.651933,-0.0931 0.3175,0 0.6223,0.0974 0.6223,0.46567 0,0.22437 -0.182034,0.54186 -0.757766,0.54186 -0.09313,0 -0.160867,-0.004 -0.2286,-0.0169 l -0.01693,0.2921 c 0.09737,-0.008 0.194734,-0.0127 0.2921,-0.0127 0.3429,0 0.762,0.0804 0.762,0.50377 0,0.42333 -0.3556,0.5969 -0.7747,0.5969 -0.270933,0 -0.524933,-0.0635 -0.766233,-0.15664 z"
       id="text45159"
       aria-label="GNU GPLv3" />
    <text
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
--- a/rtdata/languages/Nederlands
+++ b/rtdata/languages/Nederlands
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@ -4778,13 +4778,22 @@ void ImProcFunctions::chromiLuminanceCurve(PipetteBuffer *pipetteBuffer, int pW,
                    histLCurve[Lprov1 * histLFactor]++;
                }

-                Chprov1 = sqrt(SQR(atmp) + SQR(btmp)) / 327.68f;

                // labCurve.bwtoning option allows to decouple modulation of a & b curves by saturation
                // with bwtoning enabled the net effect of a & b curves is visible
                if (bwToning) {
                    atmp -= lold->a[i][j];
                    btmp -= lold->b[i][j];
+                    Chprov1 = sqrt(SQR(atmp) + SQR(btmp)) / 327.68f;
+                    if (Chprov1 == 0.f) {
+                        sincosval.x = 0.f;
+                        sincosval.y = 1.f;
+                    } else {
+                        sincosval.x = btmp / (327.68f * Chprov1);
+                        sincosval.y = atmp / (327.68f * Chprov1);
+                    }
+                } else {
+                    Chprov1 = sqrt(SQR(atmp) + SQR(btmp)) / 327.68f;
                }

                lnew->L[i][j] = Lprov1 * 327.68f;
--- a/rtengine/ipwavelet.cc
+++ b/rtengine/ipwavelet.cc
@ -345,6 +345,7 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
            cp.BAmet = 2;
        }
    }
+    int minwinnoise = rtengine::min(imwidth, imheight);

    cp.sigm = params->wavelet.sigma;

@ -355,7 +356,7 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
    cp.resena = params->wavelet.expresid;
    cp.finena = params->wavelet.expfinal;
    cp.toningena = params->wavelet.exptoning;
-    cp.noiseena = params->wavelet.expnoise;
+    cp.noiseena = params->wavelet.expnoise && minwinnoise > 128;//128 limit for 6 levels wavelet denoise issue 7146
    cp.blena = params->wavelet.expbl;
    cp.chrwav = 0.01f * params->wavelet.chrwav;

--- a/tools/osx/Info.plist.in
+++ b/tools/osx/Info.plist.in
@ -150,7 +150,7 @@
        <key>CFBundleExecutable</key>
        <string>rawtherapee</string>
        <key>CFBundleGetInfoString</key>
-        <string>@version@, Copyright © 2004-2010 Gábor Horváth, 2010-2017 RawTherapee Development Team</string>
+        <string>@version@, Copyright © 2004-2010 Gábor Horváth, 2010-2024 RawTherapee Development Team</string>
        <key>CFBundleIconFile</key>
        <string>rawtherapee.icns</string>
        <key>CFBundleIdentifier</key>
@ -162,11 +162,11 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-        <string>@shortVersion@</string>
+        <string>@version@</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-        <string>@shortVersion@</string>
+        <string>@version@</string>
        <key>LSArchitecturePriority</key>
        <array>
            <string>arm64</string>
@ -175,7 +175,7 @@
        <key>NSHighResolutionCapable</key>
        <true />
        <key>NSHumanReadableCopyright</key>
-        <string>Copyright © 2004-2010 Gábor Horváth, 2010-2017 RawTherapee Development Team</string>
+        <string>Copyright © 2004-2010 Gábor Horváth, 2010-2024 RawTherapee Development Team</string>
        <key>UTExportedTypeDeclarations</key>
        <array>
            <dict>
@ -190,7 +190,7 @@
                <key>UTTypeIdentifier</key>
                <string>com.rawtherapee.pp3</string>
                <key>UTTypeReferenceURL</key>
-                <string>http://www.rawtherapee.com/</string>
+                <string>https://www.rawtherapee.com/</string>
                <key>UTTypeTagSpecification</key>
                <dict>
                    <key>com.apple.ostype</key>
--- a/tools/osx/macosx_bundle.sh
+++ b/tools/osx/macosx_bundle.sh
@ -394,6 +394,7 @@ if [[ -n $NOTARY ]]; then
    ditto -c -k --sequesterRsrc --keepParent "${APP}" "${APP}.zip"
    echo "Uploading..."
    sudo xcrun notarytool submit "${APP}.zip" ${NOTARY} --wait
+    sudo xcrun stapler staple "${APP}"
 fi

 function CreateDmg {
@ -401,7 +402,6 @@ function CreateDmg {

    msg "Preparing disk image sources at ${srcDir}:"
    cp -R "${APP}" "${srcDir}"
-    cp "${RESOURCES}"/LICENSE "${srcDir}"
    ln -s /Applications "${srcDir}"

    # Web bookmarks
@ -427,21 +427,23 @@ function CreateDmg {
    msg "Creating disk image:"
    if [[ $FANCY_DMG == "ON" ]]; then
        echo "Building Fancy .dmg"
+        MESSAGE="$(cat message)"
+        magick ${PROJECT_SOURCE_DATA_DIR}/rtdmg-bkgd.png -pointsize 80 -fill Black -draw "text 14,1307 '${PROJECT_FULL_VERSION}'" -fill Salmon -draw "text 10,1300 '${PROJECT_FULL_VERSION}'" ./rtdmg-bkgd.png
+        magick ./rtdmg-bkgd.png -pointsize 90 -fill Black -gravity center -font Menlo-Bold -draw "text 5,120 \"$MESSAGE\"" -fill Red -gravity center -font Menlo-Bold -draw "text 1,124 \"$MESSAGE\"" ./rtdmg-bkgd.png
        create-dmg \
-        --background ${PROJECT_SOURCE_DATA_DIR}/rtdmg-bkgd.png \
+        --background ./rtdmg-bkgd.png \
        --volname ${PROJECT_NAME}_${PROJECT_FULL_VERSION} \
        --volicon ${PROJECT_SOURCE_DATA_DIR}/rtdmg.icns \
        --window-pos 72 72 \
-        --window-size 1000 689 \
+        --window-size 1000 692 \
        --text-size 16 \
        --icon-size 80 \
-        --icon LICENSE 810 0 \
-        --icon RawTherapee.app 250 178 \
-        --icon Applications 700 178 \
-        --icon Website.webloc 300 423 \
-        --icon Forum.webloc 420 423 \
-        --icon Report\ Bug.webloc 540 423 \
-        --icon Documentation.webloc 680 423 \
+        --icon RawTherapee.app 250 238 \
+        --icon Applications 700 238 \
+        --icon Website.webloc 300 487 \
+        --icon Forum.webloc 420 487 \
+        --icon Report\ Bug.webloc 540 487 \
+        --icon Documentation.webloc 680 487 \
        --no-internet-enable \
        --eula ${PROJECT_SOURCE_DATA_DIR}/../../LICENSE \
        --hdiutil-verbose \
--- a/tools/osx/rtdmg-bkgd.png
+++ b/tools/osx/rtdmg-bkgd.png