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

merge with dev

Browse Source
This commit is contained in:
Desmis
2019-08-22 07:41:28 +02:00
parent 6c1d676d3c e93ce86067
commit 1becb76b72
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rtengine/dcraw.cc
View File

@@ -6549,6 +6549,31 @@ guess_cfa_pc:
cblack[4] = cblack[5] = MIN(sqrt(len),64);
case 50714: /* BlackLevel */
RT_blacklevel_from_constant = ThreeValBool::F;
//-----------------------------------------------------------------------------
// taken from LibRaw.
/*
Copyright 2008-2019 LibRaw LLC (info@libraw.org)
LibRaw is free software; you can redistribute it and/or modify
it under the terms of the one of two licenses as you choose:
1. GNU LESSER GENERAL PUBLIC LICENSE version 2.1
(See file LICENSE.LGPL provided in LibRaw distribution archive for details).
2. COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
(See file LICENSE.CDDL provided in LibRaw distribution archive for details).
*/
if (tiff_ifd[ifd].samples > 1 && tiff_ifd[ifd].samples == len) // LinearDNG, per-channel black
{
for (i = 0; i < 4 && i < len; i++)
{
double b = getreal(type);
cblack[i] = b+0.5;
}
black = 0;
} else
//-----------------------------------------------------------------------------
if(cblack[4] * cblack[5] == 0) {
int dblack[] = { 0,0,0,0 };
black = getreal(type);

18
rtgui/thresholdselector.cc
View File

@@ -629,13 +629,8 @@ void ThresholdSelector::findBoundaries(double &min, double &max)
switch (movedCursor) {
case (TS_BOTTOMLEFT):
if (separatedSliders) {
if (movedCursor == TS_BOTTOMLEFT) {
min = minValBottom;
max = maxValBottom;
} else if (movedCursor == TS_TOPLEFT) {
min = minValTop;
max = maxValTop;
}
min = minValBottom;
max = maxValBottom;
} else if (initalEq1) {
min = secondaryMovedCursor == TS_UNDEFINED ? positions[TS_TOPLEFT] : minValTop + (positions[TS_BOTTOMLEFT] - positions[TS_TOPLEFT]);
max = positions[TS_BOTTOMRIGHT];
@@ -648,13 +643,8 @@ void ThresholdSelector::findBoundaries(double &min, double &max)
case (TS_TOPLEFT):
if (separatedSliders) {
if (movedCursor == TS_BOTTOMLEFT) {
min = minValBottom;
max = maxValBottom;
} else if (movedCursor == TS_TOPLEFT) {
min = minValTop;
max = maxValTop;
}
min = minValTop;
max = maxValTop;
} else if (initalEq1) {
min = minValTop;
max = secondaryMovedCursor == TS_UNDEFINED ? positions[TS_BOTTOMLEFT] : positions[TS_BOTTOMRIGHT] - (positions[TS_BOTTOMLEFT] - positions[TS_TOPLEFT]);