liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DNG: use black/white levels and matrix from the file, unless it comes from the Adobe DNG Converter

Browse Source 
See #4472
This commit is contained in:
Alberto Griggio
2018-10-24 12:03:15 +02:00
parent 19cc60a623
commit 4fbb0cd3eb
3 changed files with 54 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtengine/dcraw.h
View File

@@ -55,10 +55,9 @@ public:
,verbose(0)
,use_auto_wb(0),use_camera_wb(0),use_camera_matrix(1)
,output_color(1),output_bps(8),output_tiff(0),med_passes(0),no_auto_bright(0)
,RT_whitelevel_from_constant(0)
,RT_blacklevel_from_constant(0)
,RT_matrix_from_constant(0)
,RT_from_adobe_dng_converter(false)
,RT_whitelevel_from_constant(ThreeValBool::X)
,RT_blacklevel_from_constant(ThreeValBool::X)
,RT_matrix_from_constant(ThreeValBool::X)
,getbithuff(this,ifp,zero_after_ff)
,nikbithuff(ifp)
{
@@ -150,10 +149,11 @@ protected:
int output_color, output_bps, output_tiff, med_passes;
int no_auto_bright;
unsigned greybox[4] ;
int RT_whitelevel_from_constant;
int RT_blacklevel_from_constant;
int RT_matrix_from_constant;
bool RT_from_adobe_dng_converter;
enum class ThreeValBool { X = -1, F, T };
ThreeValBool RT_whitelevel_from_constant;
ThreeValBool RT_blacklevel_from_constant;
ThreeValBool RT_matrix_from_constant;
std::string RT_software;
float cam_mul[4], pre_mul[4], cmatrix[3][4], rgb_cam[3][4];