Commit Graph

79 Commits

Author SHA1 Message Date
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
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
bf301b7e40 reduce include depenencies 2020-01-18 23:46:48 +01:00
Desmis
e8986731e8 merge with dev 2019-11-07 08:09:21 +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
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
Beep6581
275f11e97d Merge pull request #5325 from erjiang/embedded-ratings
Use ratings from image metadata
2019-07-17 15:28:55 +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
0cbc4923bc Relax dependency from procparams.h 2019-02-28 20:44:50 +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
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
Flössie
2125f42116 Turn almost all Listeners into abstract interfaces 2018-10-09 20:32:40 +02:00
luz.paz
5f867be0c3 Misc. typo tixes 2018-07-31 13:14:14 -04:00
heckflosse
44729edf04 Prepared engine to display the Sharpening Contrast mask 2018-06-10 14:35:12 +02:00
heckflosse
4a1a10aab0 Pixel Shift: Improve motion mask and further changes 2018-04-14 01:11:01 +02:00
heckflosse
15794cc1ba First steps to extend dynamic profiles for Pixel Shift and HDR images 2018-04-05 14:41:02 +02:00
heckflosse
84f46eaab6 Add flat field correction for monochrome raw files 2018-03-09 14:51:28 +01:00
luz.paz
c3c3ceac79 Misc. typos
Found via `codespell` 
+ removed rtengine/dcraw.patch per discussion in https://github.com/Beep6581/RawTherapee/pull/4395
2018-02-14 14:07:18 -05: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
bb56d73cc8 started working on proof-of-concept histogram matching 2018-01-17 01:12:13 +01:00
Hombre
ee2c8f01e0 Merge branch 'dev' into tiff32float 2018-01-01 15:24:00 +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
62585bc434 merged 'localcontrast' into 'dev' 2017-12-20 23:16:28 +01:00
Alberto Griggio
38a3583077 StagedImageProcessor add explicit overload void endUpdateParams(ProcEventCode) to do proper function overload resolution
Fixes #4239
2017-12-20 22:57:57 +01:00
heckflosse
7d430adbc6 pixelshift: Optionally use one green instead of averaging two greens 2017-12-15 18:59:26 +01:00
Alberto Griggio
bc8b8902e6 make rtengine::processImage return an Imagefloat instead of an Image16
This is for supporting saving to 32-bit float TIFFs
2017-11-20 00:10:51 +01:00
Hombre57
bb874bcce7 Bigfix (see #4008) :
- CIECam now gets the shot's setting of the selected frame
- 'UserComment' metadata now correctly handled
- RT prepared to handle XTrans multiframe
- SensorType now set in the cache/data files
2017-10-04 23:27:08 +02:00
Hombre57
0905294bda Merge branch 'dev' into multiframe-handling, with some merge bugfix 2017-09-17 01:15:51 +02:00
Hombre57
ee0bff4124 Updated frame handling with any type of hierarchy (see #4008)
Images can now be detected in nested IFDs or as root IFDs.
2017-09-16 22:30:07 +02:00
Alberto Griggio
b4d3caf9c6 changed signature of ImProcFunctions::transform to take as input an ImageMetaData pointer 2017-09-06 00:15:41 +02:00
Desmis
db17c68f1e Format with astyle 3. changed files 2017-08-17 09:38:27 +02:00
Desmis
0bb824e2c1 Other changes for Elle 2017-08-14 08:21:35 +02:00
Desmis
be82e1bde2 Some changes requested by Elle 2017-08-13 13:07:39 +02:00