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

Merge remote-tracking branch 'dev/newlocallab' into newlocallab

Browse Source
This commit is contained in:
Pandagrapher 2020-04-24 09:58:35 +02:00
commit 50ad85bae5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtdata/themes/RawTherapee-GTK3-20_.css
View File

@ -565,7 +565,7 @@ button.text-button.toggle:hover:checked {
.drawingarea { .drawingarea {
border-radius: 0; border-radius: 0;
background-color: #2A2A2A; background-color: #2A2A2A;
border: 0.0833333333333333em solid #1D1D1D; border: 0.0833333333333333em solid #888888;
} }
.drawingarea:disabled { .drawingarea:disabled {
background-color: #444; background-color: #444;

8
rtengine/dcraw.cc
View File

@ -9077,6 +9077,9 @@ void CLASS adobe_coeff (const char *make, const char *model)
if (RT_blacklevel_from_constant == ThreeValBool::X || is_pentax_dng) { if (RT_blacklevel_from_constant == ThreeValBool::X || is_pentax_dng) {
RT_blacklevel_from_constant = ThreeValBool::T; RT_blacklevel_from_constant = ThreeValBool::T;
} }
if (RT_matrix_from_constant == ThreeValBool::X) {
RT_matrix_from_constant = ThreeValBool::T;
}
// -- RT -------------------------------------------------------------------- // -- RT --------------------------------------------------------------------
for (i=0; i < sizeof table / sizeof *table; i++) for (i=0; i < sizeof table / sizeof *table; i++)
@ -9096,9 +9099,6 @@ void CLASS adobe_coeff (const char *make, const char *model)
} else if (load_raw == &CLASS panasonic_load_raw) { } else if (load_raw == &CLASS panasonic_load_raw) {
tiff_bps = RT_pana_info.bpp; tiff_bps = RT_pana_info.bpp;
} }
if (RT_matrix_from_constant == ThreeValBool::X) {
RT_matrix_from_constant = ThreeValBool::T;
}
{ /* Check for RawTherapee table overrides and extensions */ { /* Check for RawTherapee table overrides and extensions */
int black_level, white_level; int black_level, white_level;
short trans[12]; short trans[12];
@ -10546,7 +10546,7 @@ dng_skip:
* files. See #4129 */) { * files. See #4129 */) {
memcpy (rgb_cam, cmatrix, sizeof cmatrix); memcpy (rgb_cam, cmatrix, sizeof cmatrix);
// raw_color = 0; // raw_color = 0;
RT_matrix_from_constant = ThreeValBool::X; RT_matrix_from_constant = ThreeValBool::F;
} }
if(!strncmp(make, "Panasonic", 9) && !strncmp(model, "DMC-LX100",9)) if(!strncmp(make, "Panasonic", 9) && !strncmp(model, "DMC-LX100",9))
adobe_coeff (make, model); adobe_coeff (make, model);

2
rtgui/mydiagonalcurve.cc
View File

@ -323,7 +323,7 @@ void MyDiagonalCurve::draw (int handle)
// draw the grid lines: // draw the grid lines:
cr->set_line_width (1.0 * s); cr->set_line_width (1.0 * s);
c = style->get_border_color(state); c = style->get_border_color(state);
cr->set_source_rgb (c.get_red(), c.get_green(), c.get_blue()); cr->set_source_rgba (c.get_red(), c.get_green(), c.get_blue(), 0.3);
cr->set_antialias (Cairo::ANTIALIAS_NONE); cr->set_antialias (Cairo::ANTIALIAS_NONE);
for (int i = 0; i <= 10; i++) { for (int i = 0; i <= 10; i++) {