203 Commits

Author SHA1 Message Date
Lawrence37
9308a830ed
Merge pull request #6952 from Lawrence37/sony-ilce-7cr-camconst
Sony ILCE-7CR / ILCE-7RM5 camconst
2024-03-02 16:11:53 -08:00
Lawrence Lee
10050fd9b1
Add ILCE-7CR raw crop, PDAF pattern, dcraw matrix
Also use the same values for the Sony ILCE-7RM5 which should have the
same sensor. Copy the PDAF pattern to the ILCE-7RM4, which has the same
size sensor.
2024-02-11 23:24:36 -08:00
Lawrence37
f65e428e7f
Merge pull request #6833 from LoKolbasz/segfault_with_fuji_cropped_raw_issue#6312
Segfault fixed when opening Fuji cropped raw. Fixes #6312
2024-02-04 15:47:28 -08:00
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
Lawrence37
13bf7a1f0a
Merge pull request #6857 from Lawrence37/camconst-from-art
Update camconst.json from ART
2024-01-27 15:52:54 -08:00
Lawrence Lee
2bc7cea5a1
Add white levels for Panasonic DC-G100
Reduce white levels for ISOs 1600-4000 due to noise with LENR on.
2024-01-14 12:58:05 -08:00
CarVac
29748d057a
Update camconst.json white levels for 1DxII 2023-10-14 15:22:08 -04:00
Lawrence Lee
1ecbd73a4a
Update camconst.json from ART
Add color matrix for Canon EOS Rebel SL3 (250D / Kiss X10).
Add masked areas for Canon EOS M6 Mark II and 90D.
Include Canon PowerShot G9 X for values for G5 X and G7 X Mark II.
Add black level for LEICA D-LUX 7.
Include PANASONIC DC-GX880 for values for DC-GF10.
2023-09-24 16:37:29 -07:00
Battyányi Dániel
f09612453a
Metadata no longer overwrites camconsts
Added suggested changes to camconst and removed the camconst.json overwriting part as per the review comment
2023-09-12 00:07:43 +02:00
Lawrence37
f93c3ddf94
Merge pull request #6838 from Lawrence37/canon-various-camconsts
Raw crop and masked areas for a few Canon cameras
2023-09-05 18:32:34 -07:00
Lawrence37
c3a97f0304
Merge pull request #6836 from Lawrence37/ilce-7m4-raw-crop
Raw crop for Sony ILCE-7M4
2023-09-05 18:30:09 -07:00
Lawrence Lee
7c73da7723
Fix Olympus E-M10MarkIV white level
Closes #6236.
2023-09-04 14:31:03 -07:00
Lawrence Lee
408b41dc72
Raw crop and masked areas for a few Canon cameras
- Fix masked areas for EOS RP 1.6x crop mode
- Masked areas for EOS M50, EOS M50m2, and EOS M100 (all the same)
- Raw crop and masked areas for EOS R 1.6x crop mode
2023-09-03 18:03:08 -07:00
Lawrence Lee
6fb8ded886
Add Sony ILCE-7M4 raw crop
Remove 10 columns of bad pixels from the right border.
2023-09-02 22:03:34 -07:00
Beep6581
15144e4cc2
Merge pull request #6703 from Beep6581/om5
OM Digital Solutions OM-5 camconst #6699
2023-08-28 22:51:35 +02:00
Lawrence37
ec24613f3b
Merge pull request #6778 from Lawrence37/eos-7d-markii-raw-crop
Improved raw crop for Canon EOS 7D Mark II
2023-08-06 14:48:35 -07:00
Lawrence37
7e0f0b6636
Merge pull request #6807 from Lawrence37/ilce-7rm2-pdaf-pattern
Fix PDAF lines pattern for Sony ILCE-7RM2
2023-08-06 12:30:10 -07:00
Lawrence Lee
4faea6df7b
Merge branch 'dev' into eos-7d-markii-raw-crop 2023-08-06 11:58:30 -07: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
Lawrence Lee
5c42a50204
Fix PDAF lines pattern for Sony ILCE-7RM2 2023-07-30 14:25:17 -07:00
Lawrence Lee
fcf22ea33a
Update white level for Canon EOS R5
Drop the white level slightly to account for noise. White level
confirmed in https://github.com/Beep6581/RawTherapee/issues/6783.
2023-07-01 18:39:05 -07:00
Lawrence37
e507be76ab
Update OM-5 camconst
Add white level and fix 80MP raw crop.
2023-06-25 18:28:50 -07:00
Lawrence Lee
27f247e8db
Crop row of bad pixels for Canon EOS 7D Mark II 2023-06-20 22:25:10 -07:00
Lawrence Lee
376d680b16
Add basic camconst entry for Canon EOS R8
The camera seems to have the same characteristics as the Canon EOS R6m2.
The raw crops for the R6m2 are derived from standard and CRAW images for
full-frame and 1.6 crop. The raw crops for the R8 are from standard and
CRAW images for full-frame only, but for both standard and Dual Pixel.
The Dual Pixel R8 images require 10 pixels cropped from the right side
instead of 6. Thus, the full-frame crop needs adjustment.
2023-06-04 16:32:41 -07:00
Lawrence Lee
68ae17a640
Add PDAF pattern for Sony ZV-1 2023-05-14 12:14:33 -07:00
Lawrence Lee
bcf9b86dcf
Add Sony ZV-1 color matrix and black level 2023-05-13 17:36:22 -07:00
Lawrence37
677aaf2ec7
Merge pull request #6753 from Lawrence37/eos-r6m2-raw-crop
Canon EOS R6 Mark II raw crop
2023-04-29 14:18:47 -07:00
Lawrence Lee
25082b6fc0
Add Canon EOS R6 Mark II color matrix 2023-04-28 21:56:27 -07:00
Lawrence Lee
91a07a2ac5
Add raw crop for Canon EOS R6 Mark II 2023-04-27 21:11:58 -07:00
Lawrence Lee
61b05f8504
Fix crash with Fujifilm sports finder mode
Handle heights and widths larger than raw heights and widths. Add
camconst raw crop for certain Fujifilm cameras with sports finder mode
on.
2023-04-22 21:32:08 -07:00
Morgan Hardwood
4fef3f3852 OM Digital Solutions OM-5 camconst #6699
Co-authored-by: Michael Lenz <michael-lenz@users.noreply.github.com>
2023-03-10 02:07:43 +01:00
Lawrence37
2d37dec49b
Merge pull request #6667 from Beep6581/om-1
Initial support for OM-1 raws
2023-03-03 22:06:45 -08:00
U-PCSPECIALIST01\jdesm
a3adbce04b Support for Nikon Z9 2023-02-06 19:00:14 +01:00
Lawrence Lee
48b1b6f9be
Add OM-1 raw decoding and basic camconst entry 2023-01-17 22:06:58 -08:00
Thanatomanic
3423a7ac55
Support for GX680 digital back including DCP (#6655)
* Initial support for GX680 digital back
With help from LibRaw for decoding support.
Estimates for color calibration are very rough...
* Small modification to black level, add DCP
2023-01-02 21:24:15 +01:00
Thanatomanic
21a7c97ede
Multiple crop support for ILCE-7S
Fixes #3960
2023-01-01 11:43:54 +01:00
Thanatomanic
a9b8ece335
Add raw crop for EOS R3
Fully fixes #6420
2023-01-01 11:01:48 +01:00
Lawrence37
d74524f2c5
Camconst support for multiple crops (#6473)
Adapted from ART 
Co-authored-by: Alberto Griggio <agriggio@users.noreply.github.com>

* camconst: support for multiple image sizes in raw_crop and masked_areas
* Clean up code after porting raw crop changes
* fixed raw crop for Canon R6 reduced-resolution raws
* Add Canon EOS R5 1.6 crop raw crop & masked areas
2023-01-01 10:50:11 +01:00
Alex Forencich
2c9f5a735d
Add raw_crop and masked_areas for Canon EOS R7 and R10 (#6608)
Signed-off-by: Alex Forencich <alex@alexforencich.com>
2022-12-31 08:51:22 +01:00
Thanatomanic
7b51a079cd
Basic support for Fujifilm X-T5 and X-H2
Closes #6624
2022-12-02 10:03:19 +01:00
Thanatomanic
11168aa640
Fix black level for Panasonic DC-G90/G95/G99 2022-11-07 09:35:59 +01:00
Philippe Daouadi
d8320bc8b7
Add Canon EOS R3, R7 and R10 support (#6543) 2022-08-18 16:50:19 +02:00
Lawrence Lee
9bde8f18dc
Remove Leica M8 camconst entry
Workaround for issue #6498.
2022-06-11 18:44:03 -07:00
Morgan Hardwood
c8e3bf030a camconst.json whitespace fixes 2022-02-11 01:39:04 +01:00
Morgan Hardwood
34b56a14e4 Fixed color matrix for SONY ILCE-7M4 #6404 2022-02-11 01:27:09 +01:00
Thanatomanic
72ec73caa3
Basic support for Sony ILCE-7M4 in camconst.json 2021-12-15 06:34:14 +01:00
Ingo Weyrich
bffc8c11d4
fixes #6390 2021-12-03 11:18:49 +01:00
Ingo Weyrich
40827955ca camconst: Fujifilm X-T30 II has same sensor as Fujifilm X-T30 2021-11-23 14:39:01 +01:00
Ingo Weyrich
7a5c95ce3f camconst: FUJIFILM GFX50R has same sensor as FUJIFILM GFX50S 2021-10-27 15:22:24 +02:00
Ingo Weyrich
c25970749d camconst: FUJIFILM GFX50S II has same sensor as FUJIFILM GFX50S 2021-10-26 16:43:16 +02:00