Commit Graph

11921 Commits

Author SHA1 Message Date
U-PCSPECIALIST01\jdesm
542946ef43 Restore windows.yml and appimage.yml 2024-02-01 08:20:12 +01:00
Desmis
e4087e2fa2 White balance auto temperature correlation - improve behavior with non raw files (#6903)
* Improve Itcwb with non-raw files

* Change pre-dev builds wbrefinement

* Change template in pre-dev

* Improvment improccordinator.cc

* Forgotten observer convert

* Reenable wbauto autogrey as 5.8

* Remove wrong code

* Missing getrgbloc references

* Fixed bug due to bias in queu with temperaure correlation issue 6911

* Simpleprocess queue compatibility tif-jpg

* Preserve AWB edits from 5.9

In 5.9 for non-raw files,
   1. RGB grey uses the unit multipliers with temperature bias applied.
   2. Temperature correlation uses the equivalent of temperature 5000,
      green 1, and red/blue equalizer 1.

* Refactor temperature correlation AWB code

* Fix inaccurate RGB grey WB preview after using ITC

The RGB grey automatic white balance algorithm caches the multipliers.
Temperature correlation automatic white balance also caches results to
the same location, but never uses it. This causes the RGB grey method to
produce incorrect results in the editor. Removing the temperature
correlation cache fixes the issue and does not have side-effects.

---------

Co-authored-by: Lawrence Lee <45837045+Lawrence37@users.noreply.github.com>
2024-02-01 07:48:07 +01:00
Lawrence37
ce80067380 Merge pull request #6936 from Benitoite/patch-33
bump macos CI workflow to macos-12
2024-01-28 11:46:11 -08:00
Lawrence37
ba065dc13f Merge pull request #6920 from sgilbertson/issue-6915-queue-template-improvements
Queue template improvements
2024-01-28 11:43:07 -08:00
Richard E Barber
7c781aa7b1 bump macos CI workflow to macos-12
macos-11 is obsolete to homebrew
2024-01-27 22:21:28 -08:00
Lawrence37
2c51b822a3 Merge pull request #6889 from Lawrence37/wprof-crash-fix
Fix for segfault due to wprof being null
2024-01-27 21:47:55 -08:00
Lawrence37
8f1f532fe6 Merge pull request #6878 from Lawrence37/switch-image-fix
Fix for crash when moving cursor over loading raw image
2024-01-27 21:47:15 -08:00
Lawrence37
4dd7517a55 Merge pull request #6873 from 0v3rt1r3d/0v3rt1r3d/fix-a-couple-of-warnings
Fix a couple of warnings
2024-01-27 21:46:14 -08:00
Lawrence37
9b7aef5d58 Merge pull request #6865 from CarVac/dev
Fix camconst.json white levels for 1DxII
2024-01-27 21:45:40 -08:00
Scott Gilbertson
11a0a0b697 Fixes per pull request comments: fix %p-1 missing slash, use static_cast, fix int/unsigned mismatches 2024-01-16 07:54:12 -05:00
Scott Gilbertson
6cbc448f63 Handle Samba-style UNC prefix '//' in %p and %P queue output template specifiers 2024-01-15 17:13:40 -05:00
Scott Gilbertson
1df9b4869e Make %p and %P queue output template specifiers limit invalid range rather than treating that as an error.
For example in a 4-element path "first 5 elements" and "last 5 elements" now return all four elements.
2024-01-15 16:39:38 -05:00
Scott Gilbertson
a39e6779e4 Fix: If %p or %P queue template term includes start of file path, prepend the leading /, \ or \\ from the file path 2024-01-15 15:27:09 -05:00
Scott Gilbertson
343b5ecc68 Left-justify the queue destination preview label and allow it to scroll horizontally 2024-01-15 14:40:56 -05:00
Scott Gilbertson
b3bbaa6421 Code formatting: move ampersands next to types 2024-01-10 18:55:52 -05:00
Scott Gilbertson
9e310b7454 Minor changes per feedback in issue #6915 (mostly code formatting) 2024-01-10 18:47:14 -05:00
Scott Gilbertson
c918de3178 Reversed %p and %P processing cases for location templates, which were opposite to what the help says. 2024-01-07 11:49:19 -05:00
Scott Gilbertson
0127b68bdb Minor comment clarification 2024-01-07 11:14:52 -05:00
Scott Gilbertson
df41028468 On Windows, use backslashes in template-generated paths
(but continue to accept either / or \ in input strings, on any platform)
Also deleted an unused helper function.
2024-01-07 11:10:05 -05:00
Scott Gilbertson
6df930b639 Minor tooltip change: shorter explanation of %f location template specifier 2024-01-07 11:09:24 -05:00
Scott Gilbertson
f92e07e5cf Make destination path preview label selectable, so its contents can be copied to the clipboard 2024-01-07 10:52:01 -05:00
Scott Gilbertson
d9511d9af8 Update QUEUE_LOCATION_TEMPLATE_TOOLTIP text to describe new specifiers
Describe %dN, %d-N, %pN, %p-N, %PN, %P-N and %f specifiers
Add examples using the new P specifier and -N terms
2024-01-07 10:42:44 -05:00
Scott Gilbertson
5accf1e9db Add myself to the list of authors 2024-01-07 10:31:05 -05:00
Scott Gilbertson
0f66d43272 Update destination preview whenever the save format changes. 2024-01-07 10:09:45 -05:00
Scott Gilbertson
21c53823ee Reimplemented %p template specifier to use new method, added %P specifier
The %P specifier includes directories from the start of the file path,
whereas the original %p specifier includes them from the end. In both
cases N is from the last directory in the path, and -N is from the
first directory in the path (N=1..9).
2024-01-06 18:21:59 -05:00
Scott Gilbertson
b8d3f90ca0 Reimplement template %dN specifier, making %d-N count from start of path, not end
Also made %pN selectively skip the next character only if it's a slash or backslash,
so for example %p2/a, %p2\a and %p2a produce the same result.
2024-01-06 18:01:56 -05:00
Scott Gilbertson
587e0c6782 Simplified BatchQueue::updateDestinationPathPreview after noticing that calcAutoFileNameBase handles all cases 2024-01-06 16:32:14 -05:00
Scott Gilbertson
380d964077 Add destination path preview label to batch queue panel.
Label initially says "Destination path for the first selected image appears here"
so the feature is discoverable. Select a file and it shows the destination path
that would be used if it is the first file to be processed and the file does
not already exist. Label is updated as the template is edited, so you can see the
effect of the edits. If "Save to folder" is selected, the previewed path uses
that folder.
2024-01-06 16:00:19 -05:00
Lawrence37
255a0c7086 Merge pull request #6906 from Lawrence37/fix-odd-raw-crop-raw-ca
Fix for wrong colors when the demosaic border is odd (dev)
2023-12-23 11:18:31 -08:00
Lawrence37
85746a8093 Fix bad colors when demosaic border is odd
Colors are incorrect if the demosaic border is odd and raw chromatic
aberration is enabled.
2023-12-21 22:09:32 -08:00
Desmis
31bf942d92 Local adjustments - Show additional settings - link with complexity (#6899)
* Change hishow -additional seeting - with complexity

* Modify windows.yml and appimage.yml

* Fixed bug in duplicate spot

* Remove pre-dev builds
2023-12-17 08:37:20 +01:00
Lawrence37
1839db448d Merge pull request #6793 from Lawrence37/nr-gain
Option for disabling noise reduction gain
2023-12-16 11:11:24 -08:00
Beep6581
bdb5a72400 Merge pull request #6895 from Christian-Kr/dev
Exclude cmake-build directory from git.
2023-12-10 23:01:25 +01:00
Christian Kr
92b3c46ba3 Exclude cmake-build directory from git. 2023-12-04 13:09:14 +01:00
Lawrence Lee
478e04e307 Remove pre-dev publish branches 2023-12-02 12:00:47 -08:00
Desmis
32aca270ec LA exposure hide show sliders when expcomp different from zero (#6892) 2023-12-02 08:24:42 +01:00
Lawrence Lee
330f99832e Fix WB method reset when not using English
Use the GUI label for "Camera" instead of hard-coding it.
2023-11-26 16:25:06 -08:00
Lawrence Lee
a95a58a8a3 Fix sRGB working profile crash
The sRGB working profile cannot be found under some conditions because
the profile name is stored as a Glib::ustring and the same strings may
not be equal when using different locales. Use std::string whenever
comparing profile names.
2023-11-19 17:22:43 -08:00
U-PCSPECIALIST01\jdesm
1e7cedf3cb Ftblockdn - remove unwanted messages in console 2023-11-17 09:38:46 +01:00
Desmis
5acf1c0a7f White Balance - temperature correlation in batch mode - issue #6867 (#6877)
* Change Itcwb in simpleprocess

* Change for auto RGBgrey

* remove unnecessary code
2023-11-07 07:38:13 +01:00
Lawrence Lee
831a9bbd55 Fix crash when opening image in editor
Do not access uninitialized raw image data. The raw data is requested
when the demosaic mode is set to None and the cursor is moved over the
image in the editor. It can occur before the raw data is loaded.
2023-11-03 21:48:21 -07:00
Alexander Gruzintsev
de82b9fc7a Fix warnings: conversion to double/float, unused variables, register keyword 2023-10-30 08:18:33 +01:00
Lawrence Lee
0e835e8c00 Fix crash in noise reduction
Fix upper bound for array access while building histogram of absolute
values in mean absolute deviation (MAD) calculation.

Fixes #6871.
2023-10-29 16:20:12 -07:00
CarVac
29748d057a Update camconst.json white levels for 1DxII 2023-10-14 15:22:08 -04:00
Morgan Hardwood
72bf271214 Removed gzip from windows.yml workflow #6864
gzip is now included as part of the MSYS2 base install.
2023-10-13 23:04:33 +02:00
Beep6581
46e5a63b6c Merge pull request #6864 from kmilos/patch-1
Streamline Windows build action
2023-10-13 23:03:55 +02:00
Miloš Komarčević
ae236073e2 Streamline Windows build action
Use pacboy for msystem independent install
Use build directory directly from CMake
Remove lensfun patch (included upstream)
2023-10-12 16:28:56 +02:00
Desmis
d276a56b10 Local adjustments - improvment Dehaze with black (#6860)
* Local Dehaze black

* Enable black

* Change threshold black - publish_pre_dev_labels ladehazeblack
2023-10-12 06:59:33 +02:00
Lawrence37
dac3dcf664 Merge pull request #6854 from Lawrence37/color-toning-layers-fix
Fix hidden layers in the Color Toning tool
2023-10-10 21:05:33 -07:00
Lawrence37
ab8de06c66 Merge branch 'dev' into nr-gain 2023-10-10 21:03:03 -07:00