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

merge with dev - I hope no error

Browse Source
This commit is contained in:
Desmis
2018-11-24 14:18:37 +01:00
parent bdc888423b d1571658f8
commit 86c03e61d4
208 changed files with 2982 additions and 2150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
rtengine/rawimage.cc
View File

@@ -30,9 +30,9 @@ RawImage::RawImage(const Glib::ustring &name)
, allocation(nullptr)
{
memset(maximum_c4, 0, sizeof(maximum_c4));
RT_matrix_from_constant = 0;
RT_blacklevel_from_constant = 0;
RT_whitelevel_from_constant = 0;
RT_matrix_from_constant = ThreeValBool::X;
RT_blacklevel_from_constant = ThreeValBool::X;
RT_whitelevel_from_constant = ThreeValBool::X;
}
RawImage::~RawImage()
@@ -504,6 +504,10 @@ int RawImage::loadRaw(bool loadData, unsigned int imageNum, bool closeFile, Prog
fseek(ifp, data_offset, SEEK_SET);
(this->*load_raw)();
if (!float_raw_image) { // apply baseline exposure only for float DNGs
RT_baseline_exposure = 0;
}
if (plistener) {
plistener->setProgress(0.9 * progressRange);
}
@@ -602,14 +606,14 @@ int RawImage::loadRaw(bool loadData, unsigned int imageNum, bool closeFile, Prog
if (cc) {
for (int i = 0; i < 4; i++) {
if (RT_blacklevel_from_constant) {
if (RT_blacklevel_from_constant == ThreeValBool::T) {
int blackFromCc = cc->get_BlackLevel(i, iso_speed);
// if black level from camconst > 0xffff it is an absolute value.
black_c4[i] = blackFromCc > 0xffff ? (blackFromCc & 0xffff) : blackFromCc + cblack[i];
}
// load 4 channel white level here, will be used if available
if (RT_whitelevel_from_constant) {
if (RT_whitelevel_from_constant == ThreeValBool::T) {
maximum_c4[i] = cc->get_WhiteLevel(i, iso_speed, aperture);
if (tiff_bps > 0 && maximum_c4[i] > 0 && !isFoveon()) {
@@ -1053,16 +1057,31 @@ DCraw::dcraw_coeff_overrides(const char make[], const char model[], const int is
*black_level = -1;
*white_level = -1;
const bool is_pentax_dng = dng_version && !strncmp(RT_software.c_str(), "PENTAX", 6);
if (RT_blacklevel_from_constant == ThreeValBool::F && !is_pentax_dng) {
*black_level = black;
}
if (RT_whitelevel_from_constant == ThreeValBool::F && !is_pentax_dng) {
*white_level = maximum;
}
memset(trans, 0, sizeof(*trans) * 12);
// indicate that DCRAW wants these from constants (rather than having loaded these from RAW file
// note: this is simplified so far, in some cases dcraw calls this when it has say the black level
// from file, but then we will not provide any black level in the tables. This case is mainly just
// to avoid loading table values if we have loaded a DNG conversion of a raw file (which already
// have constants stored in the file).
RT_whitelevel_from_constant = 1;
RT_blacklevel_from_constant = 1;
RT_matrix_from_constant = 1;
// // indicate that DCRAW wants these from constants (rather than having loaded these from RAW file
// // note: this is simplified so far, in some cases dcraw calls this when it has say the black level
// // from file, but then we will not provide any black level in the tables. This case is mainly just
// // to avoid loading table values if we have loaded a DNG conversion of a raw file (which already
// // have constants stored in the file).
// if (RT_whitelevel_from_constant == ThreeValBool::X || is_pentax_dng) {
// RT_whitelevel_from_constant = ThreeValBool::T;
// }
// if (RT_blacklevel_from_constant == ThreeValBool::X || is_pentax_dng) {
// RT_blacklevel_from_constant = ThreeValBool::T;
// }
// if (RT_matrix_from_constant == ThreeValBool::X) {
// RT_matrix_from_constant = ThreeValBool::T;
// }
{
// test if we have any information in the camera constants store, if so we take that.
@@ -1070,10 +1089,14 @@ DCraw::dcraw_coeff_overrides(const char make[], const char model[], const int is
rtengine::CameraConst *cc = ccs->get(make, model);
if (cc) {
*black_level = cc->get_BlackLevel(0, iso_speed);
*white_level = cc->get_WhiteLevel(0, iso_speed, aperture);
if (RT_blacklevel_from_constant == ThreeValBool::T) {
*black_level = cc->get_BlackLevel(0, iso_speed);
}
if (RT_whitelevel_from_constant == ThreeValBool::T) {
*white_level = cc->get_WhiteLevel(0, iso_speed, aperture);
}
if (cc->has_dcrawMatrix()) {
if (RT_matrix_from_constant == ThreeValBool::T && cc->has_dcrawMatrix()) {
const short *mx = cc->get_dcrawMatrix();
for (int j = 0; j < 12; j++) {
@@ -1090,8 +1113,12 @@ DCraw::dcraw_coeff_overrides(const char make[], const char model[], const int is
for (size_t i = 0; i < sizeof table / sizeof(table[0]); i++) {
if (strcasecmp(name, table[i].prefix) == 0) {
*black_level = table[i].black_level;
*white_level = table[i].white_level;
if (RT_blacklevel_from_constant == ThreeValBool::T) {
*black_level = table[i].black_level;
}
if (RT_whitelevel_from_constant == ThreeValBool::T) {
*white_level = table[i].white_level;
}
for (int j = 0; j < 12; j++) {
trans[j] = table[i].trans[j];