Commit Graph

5000 Commits

Author SHA1 Message Date
Alexander Gruzintsev
de82b9fc7a Fix warnings: conversion to double/float, unused variables, register keyword 2023-10-30 08:18:33 +01:00
Lawrence Lee
0e835e8c00 Fix crash in noise reduction
Fix upper bound for array access while building histogram of absolute
values in mean absolute deviation (MAD) calculation.

Fixes #6871.
2023-10-29 16:20:12 -07:00
Pandagrapher
3eb73fb225 Merge with 'Beep6581/dev' 2023-10-20 13:16:03 +02:00
Lawrence Lee
1efa06e887 Fix Lensfun camera mismatch
Work around a Lensfun bug that finds the wrong camera when given an
exact name of certain cameras.
2023-10-14 21:18:04 -07:00
CarVac
29748d057a Update camconst.json white levels for 1DxII 2023-10-14 15:22:08 -04:00
Pandagrapher
488a157476 Fixing review comments 2023-10-13 11:12:37 +02:00
Desmis
d276a56b10 Local adjustments - improvment Dehaze with black (#6860)
* Local Dehaze black

* Enable black

* Change threshold black - publish_pre_dev_labels ladehazeblack
2023-10-12 06:59:33 +02:00
Lawrence37
ab8de06c66 Merge branch 'dev' into nr-gain 2023-10-10 21:03:03 -07: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
Pandagrapher
0c2d7c1382 Merge with 'Beep6581/dev' 2023-09-22 20:36:03 +02:00
Flössie
dcbc0327a1 Fix UB in ProcParams::load() and the resulting Clang 15+ miscompilation
Fixes #6847.
2023-09-17 15:14:11 -07:00
Lawrence Lee
dab9a3f57e Fix automatic distortion correction crash
Closes #6840.
2023-09-17 15:14:03 -07:00
Flössie
2a87c65a14 Fix UB in ProcParams::load() and the resulting Clang 15+ miscompilation
Fixes #6847.
2023-09-15 15:24:24 +02:00
Battyányi Dániel
d0b34a3234 Fixed crop mode checking
Me make dumb mistake in prev. commit sry.
2023-09-12 18:19:51 +02:00
Battyányi Dániel
1a0b7f4562 Replaced casting with != 2023-09-12 14:01:35 +02:00
Battyányi Dániel
b4daf36349 CropMode changed from "plain enum" to "enum class" 2023-09-12 10:39:50 +02:00
Battyányi Dániel
0fe4c18752 Semantic changes 2023-09-12 10:33:04 +02: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
Battyányi Dániel
ab6d5b190c Tags in numerical order inside parse_fuji()
As suggested by review comment
2023-09-11 23:18:57 +02:00
Battyányi Dániel
6ee6a46750 Width and height only updates to cropped version after detecting crop
As suggested by review comment
2023-09-11 23:11:38 +02:00
Battyányi Dániel
3806107315 Changed crop detection mechanism according to code review comment
Changed the crop detection to use the CropMode Fujifilm tag from the makernotes instead of an arbitrary threshold.
2023-09-11 22:58:24 +02:00
Battyányi Dániel
ea86a14dff removed unecessarily setting of raw_height and raw_width 2023-09-11 22:22:37 +02:00
Lawrence Lee
97e181bd58 Fix automatic distortion correction crash
Closes #6840.
2023-09-09 14:59:14 -07:00
Pandagrapher
735958fc0d Merge with 'Beep6581/dev' 2023-09-08 17:58:50 +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
Pandagrapher
990e9c70a5 Merge with 'Beep6581/dev' 2023-09-05 09:48:43 +02: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
a618efe782 Fix Lensfun corrections not available
Also search by exact match of lens model and name.
2023-09-03 15:30:42 -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
Dániel Battyányi
554a6dc161 Added RT signifier comments 2023-08-30 23:34:36 +02:00
Dániel Battyányi
5231f3a742 Removed comments 2023-08-30 23:09:03 +02:00
Dániel Battyányi
23e2f0cca5 Fixed issue #6312
Fixed issue, where raw cropped Fuji X-Pro3 could not be loaded correctly. This would result in a Segmentation Fault.
With these changes the program should read the correct dimensions from the file's metadata, and load the image accordingly.
2023-08-30 22:17:16 +02:00
Lawrence Lee
0fdac3797a Merge branch 'dev' into browser-preview-applied-pparams 2023-08-29 22:58:51 -07:00
Beep6581
e189a1a4ec Merge pull request #6817 from ss23/clang_windows_mingw_64bit_fix
Use `_WIN32` instead of `WIN32` to detect Windows
2023-08-29 00:47:13 +02: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
Pandagrapher
b57d1026a3 Merge with 'Beep6581/dev' 2023-08-24 13:48:07 +02:00
Lawrence37
ac48cc55d8 Better use of cache with inpaint opposed highight reconstruction (#6822)
* Speed up preview when inpaint opposed enabled

Only reprocess from raw if the white balance is changed. Otherwise, a
cache from later in the pipeline can be used.

* Remove unused code

* Fix refresh map bit positions

* Make WB & inpaint opposed refresh less brittle

Co-authored-by: Hombre57 <natureh.510@gmail.com>

---------

Co-authored-by: Hombre57 <natureh.510@gmail.com>
2023-08-15 07:52:38 -07: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
Lawrence Lee
7eb7fb210f Merge branch 'dev' into metadata-exiv2 2023-08-12 15:08:42 -07:00
Pandagrapher
d0743ef359 Merge with 'Beep6581/dev' 2023-08-12 18:03:41 +02:00
U-PCSPECIALIST01\jdesm
269e426cc6 Another change to blendmask 2023-08-07 08:48:08 +02:00
U-PCSPECIALIST01\jdesm
8d437fec38 Change range blmask in iplocallab - thanks to hombre 2023-08-07 07:06:55 +02:00
Lawrence37
0052f08e94 Merge pull request #6794 from Lawrence37/auto-dcp-locale-fix
Fix for Auto-matched camera profile detection when using the English (US) language
2023-08-06 14:52:08 -07: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
Lawrence Lee
c5a0067eee Merge branch 'dev' into metadata-exiv2 2023-08-06 10:25:49 -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