Commit Graph

77 Commits

Author SHA1 Message Date
Desmis
e25f5aa455 Rebuild wavtm with curve finerCoraser - language - various chnages to denoise 2020-05-12 09:11:16 +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
Desmis
51f1198b65 Init blur by levels 2020-03-25 18:06:32 +01:00
Desmis
1f4613cd3b GUI for TM wavelet 2020-03-22 10:37:21 +01:00
Desmis
92fc0e307f merge with dev 2020-02-24 11:09:20 +01:00
Ingo Weyrich
aae22fcc86 Merge pull request #5617 from Beep6581/devirtualize
devirtualize method calls by declaring classes and methods final
2020-02-07 17:06:30 +01:00
Ingo Weyrich
9a4ade6f20 devirtualize method calls by declaring classes and methods final 2020-01-23 22:18:46 +01:00
Ingo Weyrich
bf301b7e40 reduce include depenencies 2020-01-18 23:46:48 +01:00
Desmis
d701afdef0 merge with dev 2019-12-01 06:56:16 +01:00
Ingo Weyrich
7b54c7f2a4 Some code cleanups 2019-11-21 21:36:57 +01:00
Desmis
e8986731e8 merge with dev 2019-11-07 08:09:21 +01:00
Ingo Weyrich
cac2eb53ef Further reduction of include dependencies 2019-10-31 20:41:08 +01:00
Flössie
add5c790d6 #pragma once for our headers plus drive-by formatting 2019-10-31 10:20:50 +01:00
Flössie
d7ec033829 Reduce dcp.h dependencies 2019-10-30 09:30:21 +01:00
Ingo Weyrich
3aa84c48da Forward declare ColorTemp 2019-10-29 12:33:14 +01:00
Ingo Weyrich
e92a99350b Forward declare Image8 2019-10-29 11:44:00 +01:00
Ingo Weyrich
54b6b53e12 Reduce image16.h dependencies 2019-10-28 21:15:34 +01:00
Desmis
9e9d0cd503 merge with dev 2019-09-17 11:11:43 +02:00
Ingo Weyrich
4079bb9920 Capture Sharpening: automatic radius calculation 2019-09-11 18:56:07 +02:00
Desmis
40da546cf8 merge with dev 2019-09-11 12:45:32 +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
Ingo Weyrich
7b3c50bc31 Capture sharpening: auto contrast threshold 2019-08-17 15:18:24 +02:00
Ingo Weyrich
8421f8780a capture sharpening: contrast threshold 2019-08-15 20:40:32 +02:00
Desmis
ad6c0d04a7 merge with dev 2019-07-19 09:27:49 +02:00
Desmis
07d74501f2 Second part ITCWB 2019-06-25 17:40:16 +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
Flössie
57d030881d More procparams.h relaxation 2019-03-01 17:40:02 +01:00
Flössie
0cbc4923bc Relax dependency from procparams.h 2019-02-28 20:44:50 +01:00
heckflosse
9fca8ed9f1 custom trc: speedup for preview and detail windows 2018-11-26 14:34:06 +01:00
heckflosse
831e18ca45 Add override keyword. Thanks @Floessie 2018-11-22 16:19:16 +01:00
heckflosse
5134040a5b Merge branch 'dev' into show_flatfield_autoclip_in_gui 2018-10-24 15:40:21 +02:00
heckflosse
ac700502db Flat field: Show auto calculated clip control value in ui 2018-10-24 00:49:51 +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
heckflosse
095cb010e5 reduce updates to preview, panning background, navigator and thumbs, fixes #4834 2018-09-27 18:16:29 +02:00
heckflosse
44729edf04 Prepared engine to display the Sharpening Contrast mask 2018-06-10 14:35:12 +02:00
Alberto Griggio
4df4fd6370 code cleanup after the new shadows/highlights tool 2018-04-13 15:43:06 +02:00
heckflosse
1f42e5cdd4 Avoid unnecessary update to main preview when opening first detail window, fixes #4368 2018-02-05 16:01:00 +01:00
Alberto Griggio
e384edba55 fattal: use a common cache for 1:1 detail crops when denoise is turned off 2017-11-17 21:28:17 +01:00
Desmis
db17c68f1e Format with astyle 3. changed files 2017-08-17 09:38:27 +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
Alberto Griggio
7a57e5276a merged with autowbfix branch 2017-02-16 14:12:03 +01:00
heckflosse
54d1533a7d Fix autowb issues, fixes #3690 2017-02-15 01:30:41 +01:00
Alberto Griggio
dca0e41f35 added "Auto White Balance temperature bias" feature
This new slider in the White Balance tools allows to alter the computation of
the "auto white balance" by "biasing" it towards warmer or cooler
temperatures. The bias is expressed as a percentage of the computed
temperature, so that the resuling temperature is given by
"computedTemp + computedTemp * bias".
2017-02-12 17:39:52 +01:00
Flössie
0bbc84b2af Merge branch 'master' into clang-tidy 2016-10-18 17:48:50 +02:00
heckflosse
ed42b1239c Merge cppckeck2 branch into master 2016-10-16 22:13:13 +02:00
heckflosse
e98bd47487 Cppcheck: Fix some warnings 2016-10-12 19:04:06 +02:00
Flössie
0731975ff0 Apply modernize-use-nullptr
Setup:
- `mkdir tidy; cd tidy`
- `cmake .. -DCMAKE_BUILD_TYPE=debug -DPROC_TARGET_NUMBER=1 -DCACHE_NAME_SUFFIX=4 -DBINDIR=. -DDATADIR=. -DBUILD_BUNDLE=ON -DWITH_LTO=OFF -DOPTION_OMP=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON`
- `cd ..`
- `find -name '*.cc' -exec clang-tidy-3.8 -header-filter=.* -p=tidy -fix-errors -checks=modernize-use-nullptr {} \;`
2016-10-12 17:48:40 +02:00
Hombre
23011fbd63 Merge branch 'master' into softproofing 2016-10-04 00:04:57 +02:00