139 Commits

Author SHA1 Message Date
Thanatomanic
d9799ec5de Fix dcp.cc with some help from the implementation in ART 2020-10-16 12:39:17 +02:00
Thanatomanic
8b4389ade9 Resolve exiv2 merge conflicts and merge with 2020-10-16 11:45:26 +02:00
Desmis
fb06a4dcfd Pass GUI parameters mask to rtengine and iplocallab.cc 2020-06-23 12:00:23 +02:00
Pandagrapher
276dd89382 Save GUI part for deltaE preview in Locallab settings panel 2020-05-12 16:23:29 +02:00
Pandagrapher
cca6b09768 Merge remote-tracking branch 'dev/newlocallab' into newlocallab 2020-04-20 12:54:09 +02:00
Desmis
f0e78b2a0d merge with dev 2020-04-18 07:43:44 +02:00
Pandagrapher
4ea4663e34 Merge with 'dev/newlocallab'... 2020-04-16 16:01:53 +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
e573de78b4 merge with dev 2020-03-19 13:40:11 +01:00
Desmis
aa389dbcae Ciecam02 fixed bad temp and tint cat02preset 2020-02-29 12:51:17 +01:00
Desmis
92fc0e307f merge with dev 2020-02-24 11:09:20 +01:00
Ingo Weyrich
c984a95b9e Merge branch 'dev' into newlocallab 2020-02-07 18:24:50 +01:00
Desmis
6e3fd503cc Added show modifications to sharpening 2020-01-21 09:14:39 +01:00
Ingo Weyrich
bf301b7e40 reduce include depenencies 2020-01-18 23:46:48 +01:00
Desmis
cf214c7a1b Save provisory work GUI 2019-12-20 18:16:10 +01:00
Desmis
9ccd282d42 Add Local Encoding Log 1st - thanks to Alberto - Disabled 2019-12-05 14:03:03 +01:00
Desmis
8f79670aa8 save provisory work GUI vibrance mask 2019-11-17 11:24:29 +01:00
Desmis
e8986731e8 merge with dev 2019-11-07 08:09:21 +01:00
Ingo Weyrich
033d9fe02a Merge branch 'dev' into newlocallab 2019-11-04 23:01:33 +01:00
Ingo Weyrich
6335b68a80 Further reduction of include dependencies 2019-11-03 14:52:42 +01:00
Ingo Weyrich
d731e172c2 Further reduction of include dependencies 2019-11-01 16:15:59 +01:00
Ingo Weyrich
cac2eb53ef Further reduction of include dependencies 2019-10-31 20:41:08 +01:00
Ingo Weyrich
6935faa258 Further cleanup of include dependencies 2019-10-30 22:12:06 +01:00
Ingo Weyrich
068847eb5a Further cleanup of include dependencies 2019-10-29 21:06:27 +01:00
Desmis
e7df169df1 Display Transmission Map Info 2019-09-28 07:39:50 +02:00
Flössie
28f0bc14da Merge branch 'dev' into metadata-exiv2
- Rating (#5325) not yet implemented
2019-09-24 14:30:54 +02:00
Desmis
9e9d0cd503 merge with dev 2019-09-17 11:11:43 +02:00
Desmis
eea35577d7 merge with dev 2019-09-13 08:57:10 +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
Desmis
0711373021 Merge with dev 2019-09-11 08:35:25 +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
Pandagrapher
2080f65197 Improve mask preview and avoid reprocessing when switching spot
Changes:
- Mask preview has been improved. It only applies on detailed image now
("dcrop" pipeline) which corrects unexpected behavior on navigator
image. Mask preview now only applies on selected spot: when switching
between spots, mask preview is deactivated on newly selected spot.
- Image reprocessing is now avoided when switching between spots (except
if mask preview was previously activated). Mask background update
remains functionnal.

Bugfixe:
- AStyle runned on several modified files
2019-08-21 13:40:28 +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
9e66826f62 Simple mask for inverse Exposure and inverse ShadowsHighlight 2019-08-11 09:28:28 +02:00
Desmis
d39eded269 enabled simple mask for Color and light inverse 2019-08-09 18:32:09 +02:00
Desmis
243faf603c Save GUI mask for Blur 2019-08-04 13:19:54 +02:00
Desmis
a5389adbf6 Save GUI mask TM 2019-07-30 13:34:12 +02:00
Desmis
ad6c0d04a7 merge with dev 2019-07-19 09:27:49 +02:00
Desmis
cbeb828609 merge with dev 2019-07-18 13:41:26 +02:00
Beep6581
275f11e97d Merge pull request #5325 from erjiang/embedded-ratings
Use ratings from image metadata
2019-07-17 15:28:55 +02:00
Desmis
3469bc9535 Improve retinex_pde with show processus 2019-07-05 13:31:04 +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
lewiatan
105517c561 support rating tag from EXIF/XMP 2019-05-16 17:04:07 -07:00
Flössie
ba4de904cc Cleanups and a few fixes 2019-05-10 21:24:22 +02:00
Desmis
31f9b44d06 Save GUI for mask retinex - disabled 2019-05-10 16:56:57 +02:00