Commit Graph

66 Commits

Author SHA1 Message Date
Hombre
f42548b018 Merge branch 'dev' into spot-removal-tool 2020-05-18 14:54:30 +02:00
rom9
6590e6d98b Merge branch 'dev' into preprocess_wb 2020-05-13 19:47:09 +02:00
rom9
22eee9787e Film negative stable multipliers (#5485)
* Added new feature to calculate channel multipliers from crop area. This also saves the crop area channel medians to the processing profiles, in order to get a more consistent color balance when batch-applying the same profile to multiple pictures from the same film roll.

* Fixed wrong initialization of array, and missing check for the result of `getFilmNegativeMedians()`.
Moved `ImProcCoordinator::translateCoord()` from private member to anonymous namespace.
Fixed some whitespace and formatting issues.

* Fixed some formatting issues

* Passed `ipf` parameter as const in `translateCoord`.
Narrowed `using namespace` to single class `Coord2D`.

* Added `scaleGain` entry to thumbnail metadata file, to make `scale_mul` multipliers available in thumbnail processing phase. This simplifies multiplier calculations, so that "faking" thumbnail multipliers in the main image processing is not necessary anymore. This way, output values are immune to slight variations of multipliers between successive shots taken with in-camera AWB turned on.
Shifted multipliers so that the output channel medians are balanced when "Camera WB" is selected. This way, just computing multipliers from crop and setting "Camera WB" (which is the default) gives a pretty well balanced image as a starting point.

* New channel scaling method, based on a film base color sample instead of crop area channel medians. Channels are scaled so that the converted film base values are equal to 1/512th of the output range (65k). This giver better black levels in the output, and more consistency when batch-processing multiple negatives.
The output is now compensated for a known fixed WB value, so that the film base will appear grey when WB is set to 3500K, Green=1.
Added PPVERSION 347 to preserve backwards compatibility: when a processing profile saved by RT 5.7 is loaded (PPVERSION=346), the new fields are initialized to the special value -1, which will instruct the main processing to follow the old channel scaling behaviour. The old channel scaling multipliers will then be converted to the new film base values so that the resulting image is the same, and the fields will be overwritten as soon as the PP is saved again. This will transparently upgrade the processing profile.
When the new behaviour is used, but the film base values are still unset, they are estimated based on channel medians, excluding a 20% border around the image. This should give a better result out-of-the-box for pictures containing a large film holder.

* Code cleanup from review

* Run astyle on film neg source files

* Fixed automated build failure caused by incompatible libraries on my dev PC.

* Simplified `Thumbnail::processFilmNegative` method signature. There is no need to pass in `rmi`,`gmi`,`bmi` multipliers from the caller, i can do the same with my own internal multipliers.

* Added `FilmNegListener` class to pass estimeted film base values to the GUI after first processing. Removed old `filmBaseValues` instance variable from RawImageSource.

* Code cleanup

* Forgot to set baseValues flag in `PartialPasteDlg::applyPaste`
Fixed `filmBaseValuesLabel` not updating when reading zero baseValues. Normally not needed (the label is updated later by the listener), but when the user is browsing through pictures the listener won't fire, so the label must be updated to show values are unset.

* Overwritten channel scaling multipliers by calling `get_colorsCoeff` with `forceAutoWB=false`.
Initially, in `RawImageSource::load`, channels are auto-balanced by averaging the whole picture when computing multipliers.
This can give different multipliers for multiple shots of the same camera, which will lead to inconsistent conversions when batch-processing multiple negatives.
This commit re-sets `scale_mul`, `ref_pre_mul`, etc., in order to "undo" the auto-WB and use the normal camera multipliers.

* Found an easier way to get stable overall multipliers, removed the (horrible) on-the-fly mutation of scaling instance variables.
2020-04-13 17:20:56 +02:00
rom9
d4fc4dc083 Added new "Preprocess WB" parameter in the Raw toolpanel, just below "Raw White Points" tool. Allows to choose between "Camera" and "Auto" (average-based) raw channel multipliers, and to apply custom compesation factors.
Fixes #5616
2020-02-24 21:00:51 +01:00
Ingo Weyrich
0d2ffb5e61 more final fixes 2020-01-24 14:53:41 +01:00
Ingo Weyrich
9a4ade6f20 devirtualize method calls by declaring classes and methods final 2020-01-23 22:18:46 +01:00
Hombre57
c23f976302 Merge branch 'dev' into spot-removal-tool 2019-12-08 00:37:54 +01:00
Ingo Weyrich
d731e172c2 Further reduction of include dependencies 2019-11-01 16:15:59 +01:00
Flössie
add5c790d6 #pragma once for our headers plus drive-by formatting 2019-10-31 10:20:50 +01:00
Hombre
1cf62a2a65 Merge branch 'dev' into spot-removal-tool 2019-09-14 23:31:02 +02:00
Ingo Weyrich
4079bb9920 Capture Sharpening: automatic radius calculation 2019-09-11 18:56:07 +02:00
Ingo Weyrich
ba43437220 Merge pull request #5445 from Beep6581/capture_sharpening
Merge Capture sharpening into dev to get more tests
2019-09-10 19:27:01 +02:00
Morgan Hardwood
60b2196bce Updated gnu.org links to use HTTPS 2019-09-10 12:34:57 +02:00
Hombre
883e73454d Merge branch 'dev' into spot-removal-tool 2019-08-16 22:58:17 +02:00
Ingo Weyrich
506254ce46 capture sharpening: first mockup 2019-08-14 17:19:26 +02:00
Hombre
0db64d49a2 Introducing TweakOperator, for better tool's special mode handling 2019-08-06 02:04:48 +02:00
Hombre
7d310e688c Adding a new spot adjust editing mode in rtengine / preview window 2019-08-04 16:07:35 +02:00
Ingo Weyrich
46cbb652d5 cppcheck: further fixes 2019-08-01 14:02:38 +02:00
Hombre
437d883082 Merge branch 'dev' into spot-removal-tool 2019-07-31 23:03:50 +02:00
Flössie
80f2b6a002 Replace raw arrays with std::array<> 2019-06-14 08:58:04 +02:00
rom9
9df8008949 Film negative processing: first usable version. Only supports bayer raw files, thumbnails don't work
Added performance improvements suggested by heckflosse. Lowered median sampling step from 7 to 5 since calculation is now much faster.

Added support for Fuji X-Trans raw files.

Applied SSE2 patch provided by @heckflosse, improves performance in main processing loop.

Moved film negative processing stuff in its own compilation unit.

Code cleanup: removed redundant omp directives.

Added check for dead pixels, going above threshold after inversion. ST_BAYER only for now.

Reverted leftover hack in cropwindow.cc
2019-06-08 01:40:29 +02:00
Hombre
698492e21c Merge branch 'dev' into spot-removal-tool 2019-03-18 22:35:11 +01:00
heckflosse
43b77679d4 Favourites => Favorites, #5016 2018-11-23 16:48:05 +01:00
heckflosse
0ae602bcf0 custom tool panel. Changed naming to 'Favourites'. Added alt-h hotkey. Allow moving of subtools to Favourites 2018-11-23 16:00:57 +01:00
heckflosse
d604abec39 Custom tool panel, first step 2018-11-23 14:36:16 +01:00
heckflosse
831e18ca45 Add override keyword. Thanks @Floessie 2018-11-22 16:19:16 +01:00
Alberto Griggio
b50b8dea9f merge with dev 2018-10-27 16:11:17 +02:00
heckflosse
e5f373d0e1 Merge branch 'dev' into dual_demosaic_auto_threshold 2018-10-21 21:54:24 +02:00
heckflosse
8b65900066 Dual demosaic: Add auto threshold checkbox and show used value in ui, #4866 2018-10-21 20:21:43 +02:00
Alberto Griggio
14ac4babec added haze removal tool
Based on the paper:
  "Single Image Haze Removal Using Dark Channel Prior" by He, Sun and Tang
using a guided filter for the "soft matting" of the transmission map
2018-10-10 10:02:06 +02:00
Flössie
2125f42116 Turn almost all Listeners into abstract interfaces 2018-10-09 20:32:40 +02:00
heckflosse
78989731f5 Always use icons for tab headers, #4772 2018-09-18 11:37:15 +02:00
heckflosse
eeebe587ba Call Histogram matching only if necessary, #4674 2018-07-08 20:24:17 +02:00
Alberto Griggio
7b0383fd2f merge 'soft-light' into 'dev' 2018-06-29 23:34:31 +02:00
heckflosse
1b094a084a Show/hide contrast mask, still wrong icon on button 2018-06-13 13:02:10 +02:00
Alberto Griggio
112de05700 added SoftLight tool 2018-04-10 09:42:22 +02:00
heckflosse
84f46eaab6 Add flat field correction for monochrome raw files 2018-03-09 14:51:28 +01:00
Flössie
98efaa5f1b Avoid deadlock by shifting GUI update to idle thread (#4224) 2018-01-26 16:46:22 +01:00
Hombre
b6d2480fb5 Merge branch 'dev' into spot-removal-tool (#2239) 2018-01-25 20:41:10 +01:00
Alberto Griggio
3c2e30dbcc renamed Wavelet tab to Advanced and moved more tools there (see #4298) 2018-01-14 21:36:25 +01:00
Alberto Griggio
b589254d21 Moved "Copy metadata unchanged" to PP3, and added "strip metadata" mode
Fixes #3647
2017-12-29 23:03:44 +01:00
Alberto Griggio
b8777b3d87 added simple local contrast tool
Borrowed from G'MIC
2017-12-19 01:03:52 +01:00
Hombre
20a0fb7af9 Merge branch 'dev' into spot-removal-tool (see #2239) 2017-11-25 23:30:52 +01:00
Alberto Griggio
77b4ad497b Integrated "Fattal02" tone-mapping operator from Luminance HDR 2017-11-02 22:34:49 +01:00
heckflosse
b6bf4aba05 Don't create Metadata panel for batch editor, #4140 2017-10-13 20:54:03 +02:00
Alberto Griggio
f70ba32c9d run through astyle 2017-08-22 08:48:33 +02:00
Alberto Griggio
610f3e4853 added option to manually save the collapsed/expanded state of tools 2017-08-21 18:42:15 +02:00
Hombre57
f75bed1bfa Merge branch 'dev' into spot-removal-tool 2017-08-20 21:06:09 +02:00
heckflosse
18076077c0 Fix some coverity issues 2017-06-14 13:50:46 +02:00
heckflosse
9bb5164cce allow translation of demosaic methods; hide Sub-Image selector for files with onyl 1 raw file; ... 2017-03-22 14:13:51 +01:00