2399 Commits

Author SHA1 Message Date
Desmis
6db96ed88e merge with dev 2020-04-13 18:00:27 +02:00
Desmis
25513c85bc Improve toning with meanab sigmaab and damper 2020-04-13 17:52:56 +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
71da91c85f Wavelet levels - Added Damper to local contrast final 2020-04-13 09:04:38 +02:00
Desmis
60bb7b520b Wavelet - Fixed crash when blur residual high and zoom high 2020-04-12 14:08:06 +02:00
Desmis
1df6bfcab5 merge with dev 2020-04-08 09:14:29 +02:00
Desmis
9f5e81b026 Change tooltip offset 2020-04-06 09:42:46 +02:00
Desmis
31355ca70e Added equalizer denoise luminance 2020-04-06 09:37:37 +02:00
Desmis
753cf61ae6 merge with dev 2020-04-05 15:51:12 +02:00
Desmis
ca8399bc90 change labels 2020-04-05 11:13:18 +02:00
Desmis
05250a2497 Change labels chroma 2020-04-05 11:04:01 +02:00
Desmis
2d52fbdcef Improve wavelet levels with denoise chroma 2020-04-05 10:28:45 +02:00
Desmis
d0e65ec93c Change history_msg 2020-04-05 06:59:17 +02:00
Desmis
d00ec5a1b2 Change tooltip and history msg damper 2020-04-04 08:32:34 +02:00
Desmis
61c6b19533 GUI for wavelt denoise chroma 2020-04-02 12:32:29 +02:00
Desmis
ed57e3163e Prepare ftblockdn to chroma denoise 2020-04-02 09:10:33 +02:00
Desmis
428bd617c9 merge with dev 2020-03-31 16:46:01 +02:00
Desmis
b8749f708c Added effect to edge sharpness 2020-03-31 14:24:17 +02:00
Desmis
5102c82c11 Improve blur with effect 2020-03-31 10:04:16 +02:00
Desmis
0fa2ca79c2 Improvment contrast to prevent texture and noise 2020-03-30 08:54:26 +02:00
Desmis
c062d654bb merge with dev 2020-03-29 18:31:52 +02:00
Desmis
7d33319893 small change to blur - change label and tooltip 2020-03-29 08:00:48 +02:00
Desmis
a61463447a Improvment to Blur levels 2020-03-28 08:35:00 +01:00
Desmis
d10ff9e816 Wavelet Improvment to GUI Residual 2020-03-27 16:21:17 +01:00
Desmis
ac83695645 Suppress warning and add tooltips 2020-03-27 09:27:43 +01:00
Desmis
c836376766 Blur residual luma and chroma 2020-03-26 09:34:38 +01:00
Desmis
ea56e57ec2 First version blur by level 2020-03-26 07:19:54 +01:00
Desmis
51f1198b65 Init blur by levels 2020-03-25 18:06:32 +01:00
Desmis
821abcc706 merge with dev 2020-03-25 07:30:44 +01:00
Desmis
cdf8d8ec7f Wavelet - added offset to contrast levels 2020-03-25 07:15:27 +01:00
Desmis
c405eab2c5 merge with dev 2020-03-24 17:34:09 +01:00
Desmis
6d154bcdae Wavelet - Give possibility to use old algo SH residual image 2020-03-24 11:29:50 +01:00
Desmis
1f4613cd3b GUI for TM wavelet 2020-03-22 10:37:21 +01:00
Desmis
e573de78b4 merge with dev 2020-03-19 13:40:11 +01:00
rom9
fb023e7ba8 Removed channel compensation adjusters 2020-03-15 17:01:40 +01:00
Ingo Weyrich
9c9cd6dd87 copied some dcp profiles from ART 2020-03-10 11:45:04 +01:00
Desmis
6c96e5a0a4 Added D41 to Ciecam02 illuminant 2020-03-05 08:10:47 +01:00
Desmis
bb54a97436 Ciecam02 change label and tooltip 2020-03-04 18:12:06 +01:00
Desmis
05f365c0d6 Added method Illuminant to make choices easier in free mode 2020-03-04 16:31:49 +01:00
rom9
50becdef31 Merge branch 'dev' into preprocess_wb 2020-03-02 20:54:48 +01:00
Desmis
f4da001589 Ciecam02 autotempout button 2020-03-02 20:00:02 +01:00
Desmis
d55e649a64 merge with dev 2020-02-29 08:14:03 +01:00
Benitoite
fbe718b64f
fixes macOS autobuild (#5674)
* update macOS autobuild yaml

* updates */CMakeLists* for macOS autobuild compatibility

* "" a dir for cmake

* Un empty an empty EXTRA_INCDIR

* use a cmake operator

* Use the . dir to un-empty a string

* fix minutes timer in macos yaml

* test & skip instead of load & include

* disregard fractional part of minutes in mac yaml

* add another cmake test

* fix typo in mac yaml

* fix other part of same typo

* correct a filename in mac yaml

* test all include dirs

* fix of mac yaml

* mac:fix a path in yaml

* mac:and its antecedent

* options.h include a dir

* test __has_include (gcc 5.* & up & clang)

* remove a printf() in mac yaml

* mac:change a "" and an elseif() to else()

* fix a whitespace error

* fix 2 whitespace errors

* ZULU>UTC

* add a "UTC

* on the other side of the "

* mac:properly set default LOCAL_PREFIX in CACHE

* use of zsh subshells in macos yaml

* mac:remove some &&

* mac:remove some "

* mac:floating point divisors

* mac:use double paren (())

* mac:add a dir

* mac:floatize with decimal point

* mac:zsh -c certain lines

* remove a marker
2020-02-28 19:20:40 +01:00
Desmis
ae0586719a Enabled bencfun for Itcwb 2020-02-28 08:33:12 +01:00
Desmis
10af444786 Change tooltip orthographe 2020-02-27 18:08:02 +01:00
Desmis
d56c53b1ae Change tooltip 2020-02-27 18:06:30 +01:00
Desmis
32f3273a2a Change some tooltips 2020-02-27 08:50:08 +01:00
Lawrence Lee
357cf5b96a Remove scaling from perspective correction
Scaling is applied at the end of all geometric transformations, so it
would be more appropriate outside of the perspective correction tool.
Such an implementation would also work better with the auto-fit feature.
2020-02-26 22:52:55 -08:00
Desmis
603b55e690 Preset cat02 automatic 2020-02-25 17:28:19 +01:00
Beep6581
817286b027
Merge pull request #5644 from Benitoite/patch-22
mac: simplifies bundle structure, bundle packaging fixes
2020-02-25 09:05:20 +01:00