111 Commits

Author SHA1 Message Date
Lawrence37
e438e0e604
Some more cherry-picking for 5.10 (#6937)
* Local adjustments - Show additional settings - link with complexity  (#6899)

* Change hishow -additional seeting - with complexity

* Modify windows.yml and appimage.yml

* Fixed bug in duplicate spot

* Remove pre-dev builds

* Update camconst.json white levels for 1DxII

* Fix warnings: conversion to double/float, unused variables, register keyword

* Fix crash when opening image in editor

Do not access uninitialized raw image data. The raw data is requested
when the demosaic mode is set to None and the cursor is moved over the
image in the editor. It can occur before the raw data is loaded.

* Fix sRGB working profile crash

The sRGB working profile cannot be found under some conditions because
the profile name is stored as a Glib::ustring and the same strings may
not be equal when using different locales. Use std::string whenever
comparing profile names.

---------

Co-authored-by: Desmis <jdesmis@gmail.com>
Co-authored-by: CarVac <airplaniac2002@gmail.com>
Co-authored-by: Alexander Gruzintsev <0v3rt1r3d@gmail.com>
2024-02-04 15:43:33 -08:00
Stephen Shkardoon
23f2a2fc9f Use _WIN32 instead of WIN32 to detect Windows
`WIN32` is not defined when building a 64-bit executable on Windows with Clang. `_WIN32` is the more appropriate option here.
http://web.archive.org/web/20191012035921/http://nadeausoftware.com/articles/2012/01/c_c_tip_how_use_compiler_predefined_macros_detect_operating_system contains a handy table/matrix of the options and why this is best.
2023-08-13 17:09:49 +12:00
Desmis
8d0333120e
Research and development - WB auto -temperature correlation - tests - finding the optimum settings (#6643)
* Change estimchrom estim hue final

* Itcw observer checkbox

* 8 spectral colors

* 11 spectral colors

* 6 spectral colors

* Small change to correction green

* Fixed various bad behavior - settings itcwb_deltaspec

* 4 spectral colors green

* 3 green spectral colors

* 3 spectral colors green

* 5 spectral colors red green

* 3 spectral colors red green

* 3 spectral colrs green red

* Chnage slider choice deltaE - to size color patch

* display more info in console

* Display more info in console - comment code

* Clean - comment code

* 8 spectral colors green red

* 8 spectral colors blue

* 8 spectral colors blue

* 3 spectral colors

* 6 spectral colors

* 4 spectal colors

* 2 spectral colors

* Eliminate high Y - increse temp iteration - recenter selection inside patch

* compatibility 5.9

* Modify dislay and place selected dats in patch

* Dispaly in console hue chroma image selection

* First optimization

* optimization code - clean unused variables

* Remove sorted in chroma order - some others changes

* 5.9 compatibility

* Clean and optimize code

* Clean code - more display info in console

* More info in console - set itcwb_minsize in option

* Display patch chroma in GUI

* Change some default settings

* Minsize patch GUI

* Display GUI patch size

* Chroma patch variations

* Display in GUI min and max dats found in patch

* Some adjustments

* Remove too low datas in patch

* Various improvment - ponderate

* Clean code colortemp comment spectral datas

* Comment code - correc gren

* Comment and refine code

* Fixed bug in improcoordinator

* fixes a malfunction of AWB bias in improcoordinator

* Various improvments - clean code

* 2 improvments green and find patch

* Allows parametrind ponder and Ypurple in options

* Update autowb - filter on magenta purple

* Clean and optimize code

* Read colors in GUI

* Denoise median 5x5 image datas before Itcwb

* Change to GUI

* Replace median5x5 by 2 median3x3 - clean GUI code

* Work around to recalculate wbauto

* Remove work around - change params->wb related change

* Disabled low_sampling 5.9

* First try for compatibility Low sampling 5.9

* Re-enable WB autogrey

* Change reference image to autogrey if camera settings probably out

* Clean code aand adjust settings camera out

* Format astylert rawimagesource.cc - various small adjustments

* Small correction

* Small green correction

* Change default settings - correction to autowb bias in improccoordinator

* Save provisory work

* Save provisory work 2

* Try to find good tempitc with iterate when temptitc very different 5000K

* Change 2 default settings

* Work around awb temp bias

* Limit work around bias - small other changes

* 3 spectral colors deep blue

* 4 spectral color deep blue

* 4 color spectral yellow

* 5 spectral colors neutral red-magenta

* 5 spectral color neutral red magenta

* Change threshold tempitc

* 5.9 compatibility

* Work around bad claculation Planck's formula

* Fixed bad behavior when using blackbody spectal

* 6 spectral color - checkbutton remove 2 passes

* Fixed various bugs

* Format rawimagesource.cc

* Various improvment before to find the good selection

* First new optimization (perhaps?)

* Display GUI patc deltaE

* Various optimzation and tooltip

* Default observer 2°- Simplify GUI - improve display GUI - remove too low numbers datas

* 4 spectral colors - change 2 settings

* Change calculation threshold 2 passes

* 6 spectral colors magenta

* 13 spectral colors

* Improvment GUI display

* remove checkbutton no_purple

* 2 spectral colors - remove in GUI low sampling 5.9

* Change default setting display in console

* Change behavior when temp near stdA

* 4 spectral colors - settings Itcwb_tempstdA

* Gamut control on image histogram

* Clean code and format rawimagesource.cc

* Comment and format colortemp.cc

* Remove unused fileds from GUI - change tooltips

* Add tooltips

* Various changes

* Change settings when camera temperature is out

* improvment extra and tooltip

* Small change when using auto grey as start reference

* Remove itcwb_fgreen from GUI

* Various change - and 'unsatisfactory' test to take into account Custom

* Change second temp when < 4000 - replace automatic by automatic and refinement

* Neutralize 'Use custom tempertaure and green'

* Green refinement

* Clean code - small changes

* Other clean code

* Added forgotten itcw_green in procparams.cc

* Fixed a bug dispaly deltaE

* Change threshold settings - change code for Custom

* various change in case of using camera settings

* Change way to estimate range green

* clean code and message in console

* Clean and optimize

* Disable 2 passes if custom

* Improve GUI 2 passes

* Increase sampling and number of temperature above 9400K

* Hide AWB temperature bais and green refinement when Custom temerature ans green

* marks out the code with past time markers

* Improve time processing with spectral colors temp calculations

* Replace in console msec by nsec

* Scan temp 5.9

* Change max temp and behavior if temp > 15000k

* Refine temp near 14000K

* Increase sampling temperature 132 to 167

* Increase sampling temperature

* Set in preference choice for itcwb_custom

* White point calculated  with observer instead of table

* More on whitepoint calculation - informations

* Clean and format code with astyle colortemp.cc rawimagesource.cc improccoordinator.cc

* Small change tooltip

* Improve update auto-wb

* Remove 'use custom temperature and tin' - simplify sampling to 2 choice

* Small change to rand AWB bias - green refinement - tooltips

* slightly modify the parameters upstream of the algo - do not use camera in some cases

* Mixed initial green

* Refine init green and temp when no camera

* Refine temp and green in do not use camera settings

* Change tint threshold and various improvments (tooltips, wrong values..)

* Refinment and clean code

* Improve mode No use camera settings

* Init nocam

* Refine use no camera  settings

* Small change

* 5.9 compatibility - and format

* Refine sampling temperature  around 7000 - 8000K

* Format astylert rawimagesource colortemp

* 5.9 settings

* 5.9 settings 2

* Various change - 5.9 - format

* Improve pre and post algorithm

* Fixed correction temp > 8000K

* Fixed bad behavior Tppat.minchroma

* Change sampling choices and tooltip

* Change name wp wp2 wip to wb wb2 iwb to avoid misunderstood

* Small Change settings - limit display studgood to 0.0001

* Improvment display GUI temp

* Change default sampling

* Change ACESP0 to JDCmax

* Improve GUI abstract profile

* Allows dispaly in console xy values thanks to Reffort

* Remove bruce rgb in wp and abstract

* Change wp abstract and save itcwb with dispaly cellxy

* Change prim = 13 improccoordinator iplab2rgb

* remove display datas in console - fixed wrong display Y xyY

* Fixed ifferences in GUI maxhist minhist

* Change limits x y in function sampling

* fixed a dizziness

* Change  after algorithm rule when temp > 6000K

* Harmonize limx limy for oldsampling 5.9

* Added Cam xyz matrix to sampling - thanks to Reffort

* Display in console xyz matrix

* Forgotten instruction when mix camera and autowb grey

* Change rgbloc with Camera matrix Dcraw when no input profile

* Change rep to repref in rgbxyz

* Remove message in console

* 5.9 compat

* 5.9 compat 2

* 5.9 compat 3

* 5.9 compat 4

* 5.9 compat 5 format

* 5.9 compta 6

* Improve code

* Diasble itcwb_sampling in GUI

* Comment code

* Clean and comment code

* 5 spectral colors

* 9 spectral colors

* 2 spectral colors

* Various improvments

* 5 spectral colors

* 5 spectral colors

* First changes review lawrence37

* Second changes review Lawrence37

* 3rd changes review Lawrence37

* 4th changes review Lawrence37

* Change windows and appimage yml

* Re-enable Rtv4_Bruce in procparams.cc

* test for 5.9 compatibility

* Try to fixed crash

* Slightly improve the management of 5.9

* test for 5.9 compatibility by passing parameters via the GUI

* Forgotten parameter

* Change ref_spec limit and remove pac_start for itcwb_sampling

* Puts back the old Planck formula - the same as in dev

* Revert "test for 5.9 compatibility by passing parameters via the GUI"

This reverts commit d6b5a8feda31b93a5574cee6ebf4d3e9d58bbcfb.

* Switch to new ITCWB only when changing WB method

Prevents sudden changing of the white balance if ITCWB is selected and
the image is reopened.

* Fix spelling in comment

* Suggested change from Lawrence37 to whitebalance - small change to improcoordinator

* tempbias Set_sentive(false) if itcwb_smapling - clean whitebalance

* Another clean whitebalance.cc

---------

Co-authored-by: Lawrence Lee <45837045+Lawrence37@users.noreply.github.com>
2023-08-06 13:44:48 +02:00
Lawrence37
bca2d05f95
Merge pull request #6645 from Entropy512/user_icc
iccstore: Allow loading profiles from user-writable configuration directory
2023-06-13 20:48:56 -07:00
Hubert Figuière
a1bbc93538
Fix missing explicit include (#6704)
* Fix missing explicit include

- Also avoid rtgui include

* Fix more missing explicit include
2023-05-21 15:25:42 -07:00
Andy Dodd
09e9884757 iccstore: Allow loading profiles from user-writable configuration directory
In addition to bundled profiles and the system ICC profile store, load profiles from a user-writable/user-specific directory

On Linux, this is $HOME/.config/RawTherapee/iccprofiles/output - corresponding to "input" being already supported

Partial fix for part of #6644
2022-12-14 19:05:49 -05:00
Ingo Weyrich
a5a44ce9b2 removes an unused function 2020-09-15 13:48:47 +02:00
Ingo Weyrich
6caf33a589 Some fixes suggested by @Floessie 2020-07-16 11:35:41 +02:00
Flössie
8886402e93 Fix Clang-10 warnings 2020-04-02 13:23:57 +02:00
Ingo Weyrich
8f291c3ff2 Be -Wunused-macros clean 2020-02-07 20:18:35 +01:00
Ingo Weyrich
284fe57159 Further reduction of include dependencies 2019-10-31 13:29:12 +01:00
Ingo Weyrich
6935faa258 Further cleanup of include dependencies 2019-10-30 22:12:06 +01:00
Ingo Weyrich
ba8dda1836 Further cleanup of include dependencies 2019-10-30 16:38:02 +01:00
Ingo Weyrich
068847eb5a Further cleanup of include dependencies 2019-10-29 21:06:27 +01:00
Morgan Hardwood
60b2196bce Updated gnu.org links to use HTTPS 2019-09-10 12:34:57 +02:00
Flössie
57d030881d More procparams.h relaxation 2019-03-01 17:40:02 +01:00
heckflosse
36ca01616b Segfault when v2 ICC profiles do not contain parsable 'gamma/slope' info, fixes #5144 2019-01-19 19:15:32 +01:00
Alberto Griggio
cfc947a865 Moved the ICC TRC patching code for RTv2 profiles from ImProcFunctions::lab2rgbOut to ICCStore
See #5026
2018-11-25 14:23:06 +01:00
heckflosse
831e18ca45 Add override keyword. Thanks @Floessie 2018-11-22 16:19:16 +01:00
heckflosse
3824213e49 Fix two coverity issues 2018-11-17 19:25:32 +01:00
Hombre
fb0c95969b Creation of the ICCProfileCreator 2018-06-25 00:43:11 +02:00
Hombre
e2dc8ea2c3 Merge branch 'dev' into testoutputprofile 2018-06-14 21:47:14 +02:00
Alberto Griggio
09b5dca08d merge branch 'user-dcp-profiles-dir' 2018-06-13 14:31:07 +02:00
Hombre
b06e07034e Fix #4565 : Segfault saving image using RTv2_sRGB.icc
Also, replace identing tabs by spaces in some files
2018-05-19 00:19:06 +02:00
Desmis
84827c6038 Suppress warning for GammaTRC 2018-05-17 08:38:48 +02:00
Morgan Hardwood
d3696760f3 ICC spelling
Renamed "Prophoto" and "Acespx" to ProPhoto and ACES P0 and P1,
hyphenated as needed.
2018-05-16 22:27:56 +02:00
Desmis
0086c4af78 changes tags in RTv4*.icc 2018-05-16 11:43:29 +02:00
Desmis
6df57cc264 another change to write tags 2018-05-16 11:20:40 +02:00
Desmis
a6da4e18aa Some chnages to write tags 2018-05-16 10:04:46 +02:00
Desmis
7b9319a251 Change manufacturer and copyright tags in Rtv2*.icc and Rtv4*.icc 2018-05-14 14:12:05 +02:00
Hombre
fbc81028eb First batch of variable name normalisation in ICM tool, see #4478 2018-05-14 00:57:55 +02:00
Desmis
3806eb1408 Fixed bad quality ICCv2 for RT output profile 2018-05-12 18:10:18 +02:00
Desmis
be032de287 Fixed bug Free - Custom for gamma 2018-05-08 15:14:18 +02:00
Desmis
1271701114 Change Integrated with Embedded - changer folder profile ICC to cache 2018-05-04 07:39:48 +02:00
Desmis
275058e232 Some changes to GUI 2018-05-02 16:54:19 +02:00
Desmis
e99498ab07 Some changes to internal variables 2018-05-02 13:59:54 +02:00
Desmis
bab093b0f7 small changes to limits 2018-05-01 18:14:36 +02:00
Desmis
19b7a942af Add TRC to working profiles 2018-04-29 17:08:45 +02:00
Desmis
bfb063f599 add free primaries to ICC V4 2018-04-22 18:18:18 +02:00
Desmis
9a167b8054 add illuminant A incandescent to ICC V4 2018-04-20 07:17:16 +02:00
Desmis
49340d5c76 Fixed bug in Output profile and add illuminant choice to Icc V4 2018-04-17 17:22:22 +02:00
Desmis
7c0a0a42b9 Small changes to Tag 'desc' 2018-04-16 08:55:36 +02:00
Desmis
e9e6804074 best display Tag 'desc' 2018-04-16 08:47:34 +02:00
Desmis
77464007db Add primaries bestrgb betargb brucergb 2018-04-16 08:20:39 +02:00
Desmis
fe1114b7cf clean code 2018-04-15 15:34:36 +02:00
Desmis
02ce0e0e84 Fixed bug generation V2 V4 icc 2018-04-15 10:57:52 +02:00
Desmis
c2db569823 Fixed bug in XYZ V2 AcesP1 profile 2018-04-13 10:51:49 +02:00
Desmis
a872bd9e2d Oups - fixed bug in compilation 2018-04-12 17:42:40 +02:00
Desmis
69e3e7b766 Small change to name profile for ACES 2018-04-12 17:31:12 +02:00
Desmis
74b5b65524 Add ACESP1 - rename ACESc in ACESP0 - fixed some GUI bug in Primaries Output profiles 2018-04-12 16:51:54 +02:00