5250 Commits

Author SHA1 Message Date
Andy Dodd
91dc97eafb Fix regression with demosaiced DNGs caused by 831a9bbd
Uses a new function checkRawDataDimensions as suggested/written by @Lawrence37 to verify that image dimensions are correct.

Fixes #6996
2024-03-18 09:09:07 -04:00
Simone Gotti
2aea26b5f3 Handle flat field images with different black levels than raw image
For bayer images handle flat field images with different black levels
than the raw image.
2024-03-17 21:56:56 +01:00
Alexander Brock
28a5d36e9a Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2024-03-10 17:22:19 +01:00
Lawrence Lee
c3a1656ac0
Fix WB multipliers for some Canon cameras
Read the correct tag for the as-shot multipliers (index 0x69). The port
from LibRaw incorrectly used the tag at index 0x69 + 0x64, which is the
daylight WB multipliers. This fix affects Canon cameras with color data
versions 34 (EOS R3) and 48 (EOS R6m2, EOS R7, and EOS R10).
2024-03-09 22:17:55 -08:00
Desmis
96a48c6334
Local adjustments - set method Avoid Gamut to Munsell - better processing of highlights and gamut (#6965)
* Avoidgamumethod set to Munsell-only

* Set appimage.yml and windows.yml to la_gamutmunsell

* Remove procparams conversion XYZ absolute tu Munsell only

* Neutralize appimage.yml and windows.yml
2024-03-09 07:36:46 +01:00
Simone Gotti
3e26976403 Read embedded dcp profile from raw files
raw files, usually dng files, can provide a dcp profile by providing the
related tags.

This patch will make the "Use embedded" options in the color management
panel selectable if the source raw file embeds a dcp profile.
In this case the DCP panel will be enabled like when reading an external
dcp profile.

Additional changes:

* Rename "Use embedded, if possible" to just "Use embedded" since the
option is already disabled when no embedded profile is found.
* Update the "Use embedded" options tooltip as it's now not related to
  only non raw images.
2024-03-07 10:37:54 +01:00
Pandagrapher
7e63892628 Merge with 'Beep6581/dev' 2024-03-06 19:10:49 +01:00
Alexander Brock
041472e39b Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2024-03-03 20:06:08 +01:00
Desmis
484f1a29de
Local adjustments - Chromaticity curve C(h) (#6964)
* Chromaticity curve C(h)

* Appimage.yml windows.yml lachroma
2024-03-03 07:28:37 +01:00
Lawrence Lee
51e52d9aba
Merge branch 'dev' into libraw-copylib 2024-03-02 21:01:34 -08:00
Lawrence Lee
6daf3f6a23
Fix possible infinite loop in dcraw
Use same type for variable comparison in loop condition. Fixes CodeQL
alert 96.
2024-03-02 20:55:07 -08:00
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
Lawrence37
8495ba7502
Merge pull request #6837 from Lawrence37/lensfun-match-saved-name
Fix for some Lensfun corrections not available
2024-03-02 15:45:59 -08:00
Alberto Griggio
65a14051fe
rawimage: put global black level (as found in DNG converted files) for xtrans files where the code expects to find it 2024-02-22 22:22:41 -08:00
Alexander Brock
5b2d290805 Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2024-02-18 23:39:48 +01:00
Lawrence Lee
7945f93e8f
Merge branch 'releases' into dev 2024-02-15 23:15:50 -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
Lawrence Lee
6d2022b5d5
Fix compiler warnings 2024-02-08 22:08:44 -08:00
Desmis
8ad4ebf482
Change default behavior Local Adjustments settings Avoid Color Shift to XYZ Absolute (#6948)
* Change default settings avoidcolorshift to XYZ absolute

* Same change in controlspotpanel.cc
2024-02-08 21:53:07 -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
42817bffa4
Defringe tool banding & desaturation fix (#6934)
* Fix defringe banding & desaturation race condition

Use a copy of the image instead of the image itself for the source data.
Affects Defringe, Color Appearance & Lighting Hot/bad pixel filter, and
Contrast by Detail Levels Reduce artifacts.

* Fix CodeQL warning

Fix multiplication overflow.
2024-02-04 15:41:32 -08:00
Lawrence37
2f7c2e973c
Fix rotation of images with odd number of rows (#6926)
* Fix line in middle of 180 degree rotated image

For images with an odd number of rows, a 180 degree rotation resulted in
one row of un-rotated pixels because it was effectively rotated twice.

* Replace verbose swap with std::swap
2024-02-04 15:40:38 -08:00
Lawrence37
0d0834cbe7
Dynamic Range Compression Improvement (5.10) (#6943)
* Improve Dynamic Range Compression - for some images with very high DR

* Clean code

* Improve TM fattal with saturation control in LA

* Saturation control fattal in LA

* Re-order paramsedit

* Change history_msg_tmo_satur with saturation

---------

Co-authored-by: U-PCSPECIALIST01\jdesm <jdesmis@gmail.com>
2024-02-04 15:38:04 -08:00
Alexander Brock
e9bdda8727 Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2024-02-04 18:01:33 +01:00
Desmis
5349f7a860
Improve Dynamic Range Compression - for some images with very high DR - Main and LA (#6931)
* Improve Dynamic Range Compression - for some images with very high DR

* Clean code

* Improve TM fattal with saturation control in LA

* Saturation control fattal in LA

* Re-order paramsedit

* Change history_msg_tmo_satur with saturation
2024-02-02 07:42:34 +01:00
Lawrence37
f06e756c20
AWB non-raw file fixes (for 5.10) (#6940)
* Improve Itcwb with non-raw files

* Change pre-dev builds wbrefinement

* Change template in pre-dev

* Improvment improccordinator.cc

* Forgotten observer convert

* Reenable wbauto autogrey as 5.8

* Remove wrong code

* Missing getrgbloc references

* Fixed bug due to bias in queu with temperaure correlation issue 6911

* Simpleprocess queue compatibility tif-jpg

* Preserve AWB edits from 5.9

In 5.9 for non-raw files,
   1. RGB grey uses the unit multipliers with temperature bias applied.
   2. Temperature correlation uses the equivalent of temperature 5000,
      green 1, and red/blue equalizer 1.

* Refactor temperature correlation AWB code

* Fix inaccurate RGB grey WB preview after using ITC

The RGB grey automatic white balance algorithm caches the multipliers.
Temperature correlation automatic white balance also caches results to
the same location, but never uses it. This causes the RGB grey method to
produce incorrect results in the editor. Removing the temperature
correlation cache fixes the issue and does not have side-effects.

---------

Co-authored-by: U-PCSPECIALIST01\jdesm <jdesmis@gmail.com>
2024-02-01 22:41:56 -08:00
Desmis
e4087e2fa2
White balance auto temperature correlation - improve behavior with non raw files (#6903)
* Improve Itcwb with non-raw files

* Change pre-dev builds wbrefinement

* Change template in pre-dev

* Improvment improccordinator.cc

* Forgotten observer convert

* Reenable wbauto autogrey as 5.8

* Remove wrong code

* Missing getrgbloc references

* Fixed bug due to bias in queu with temperaure correlation issue 6911

* Simpleprocess queue compatibility tif-jpg

* Preserve AWB edits from 5.9

In 5.9 for non-raw files,
   1. RGB grey uses the unit multipliers with temperature bias applied.
   2. Temperature correlation uses the equivalent of temperature 5000,
      green 1, and red/blue equalizer 1.

* Refactor temperature correlation AWB code

* Fix inaccurate RGB grey WB preview after using ITC

The RGB grey automatic white balance algorithm caches the multipliers.
Temperature correlation automatic white balance also caches results to
the same location, but never uses it. This causes the RGB grey method to
produce incorrect results in the editor. Removing the temperature
correlation cache fixes the issue and does not have side-effects.

---------

Co-authored-by: Lawrence Lee <45837045+Lawrence37@users.noreply.github.com>
2024-02-01 07:48:07 +01:00
Lawrence37
2c51b822a3
Merge pull request #6889 from Lawrence37/wprof-crash-fix
Fix for segfault due to wprof being null
2024-01-27 21:47:55 -08:00
Lawrence37
8f1f532fe6
Merge pull request #6878 from Lawrence37/switch-image-fix
Fix for crash when moving cursor over loading raw image
2024-01-27 21:47:15 -08:00
Lawrence37
4dd7517a55
Merge pull request #6873 from 0v3rt1r3d/0v3rt1r3d/fix-a-couple-of-warnings
Fix a couple of warnings
2024-01-27 21:46:14 -08:00
Lawrence37
9b7aef5d58
Merge pull request #6865 from CarVac/dev
Fix camconst.json white levels for 1DxII
2024-01-27 21:45:40 -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
Lawrence37
7eb2aedbc1
Merge pull request #6927 from Lawrence37/panasonic-dc-g100-white-levels
Panasonic DC-G100 white levels
2024-01-25 21:04:19 -08:00
Lawrence37
5ffa0632f2
Merge pull request #6885 from Lawrence37/asan-mem-leak
Fixes for memory leaks and memcpy overlap found by AddressSanitizer
2024-01-25 21:02:50 -08:00
Lawrence37
ddcaa7a81c
Merge pull request #6881 from Lawrence37/lensfun-vignette-fix
Fix focus distance from metadata
2024-01-25 21:01:17 -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
Alexander Brock
bbc8d0d4c7 Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into defish 2024-01-14 20:30:32 +01:00
Lawrence Lee
67da8a9634
Implement Hasselblad flat-field and levels 2024-01-11 22:35:26 -08:00
Lawrence Lee
2b6789b4ac
Fix Hasselblad model name when using LibRaw
The model, rather than the normalized model, gives the name that matches
those given by dcraw for Hasselblad cameras. This is important for
matching the model name in camconst.json.
2024-01-11 22:32:09 -08:00
Lawrence Lee
d13badbbe0
Implement DNG bad pixels constant for LibRaw
Works if the FixBadPixelsConstant is zero, as implemented for dcraw.
Other constant values may be implemented in the future.
2024-01-06 21:40:00 -08:00
Lawrence Lee
d96809ecab
Copy missing camera constants from dcraw to LibRaw
Update white level for Fujifilm HS20EXR/HS22EXR and add constants for
Panasonic DMC-TZ82.
2024-01-06 21:40:00 -08:00
Lawrence Lee
ab21f77b95
Implement Sony Pixel Shift for LibRaw 2024-01-06 21:39:59 -08:00
Lawrence Lee
88f9978e1f
Merge commit 'de5f92937857cccc45080c59c6236561416e5ece' into libraw-copylib
Upgrade LibRaw to 0.21.2.
2023-12-31 14:05:48 -08:00
Lawrence Lee
ebf5b422be
Use proper include for LibRaw
The include directory for LibRaw is properly set by CMake so
    `#include <libraw/libraw.h>`
will work for both the internal and system versions.
2023-12-31 12:33:01 -08:00
Lawrence Lee
e599f71bf2
Remove unused rawimage functions
Prevent accidental use of these functions that will not supply the
correct data when using LibRaw.
2023-12-31 12:03:16 -08:00
Lawrence Lee
dca44bb89a
Fix crash loading multi-frame RAFs with LibRaw
Set the frame number when reading image metadata.
2023-12-31 12:00:45 -08:00
Lawrence37
255a0c7086
Merge pull request #6906 from Lawrence37/fix-odd-raw-crop-raw-ca
Fix for wrong colors when the demosaic border is odd (dev)
2023-12-23 11:18:31 -08:00
Lawrence37
d0e36ee509
Merge pull request #6904 from Lawrence37/fix-odd-raw-crop-raw-ca
Fix for wrong colors when the demosaic border is odd
2023-12-23 11:14:37 -08:00
Lawrence37
85746a8093
Fix bad colors when demosaic border is odd
Colors are incorrect if the demosaic border is odd and raw chromatic
aberration is enabled.
2023-12-21 22:09:32 -08:00