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

Merge branch 'dev' into release-5.3-rc1

Browse Source
This commit is contained in:
Morgan Hardwood
2017-09-29 00:37:50 +02:00
parent ea0934547b 0a3a4a1e74
commit 6615061780
6 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
rtdata/dcpprofiles/Canon EOS 1300D.dcp Normal file
View File

Binary file not shown.

BIN
rtdata/dcpprofiles/Canon EOS 60D.dcp Normal file
View File

Binary file not shown.

BIN
rtdata/dcpprofiles/Canon EOS 6D Mark II.dcp Normal file
View File

Binary file not shown.

BIN
rtdata/dcpprofiles/Panasonic DC-TZ91.dcp Normal file
View File

Binary file not shown.

9
rtengine/rtthumbnail.cc
View File

@@ -714,9 +714,8 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
double avg_r = 0;
double avg_g = 0;
double avg_b = 0;
const float eps = 1e-5; //tolerance to avoid dividing by zero
float rn = eps, gn = eps, bn = eps;
unsigned int rn = 0, gn = 0, bn = 0;
for (int i = 32; i < height - 32; i++) {
int start, end;
@@ -831,9 +830,9 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
}
}
double reds = avg_r / rn * tpp->camwbRed;
double greens = avg_g / gn * tpp->camwbGreen;
double blues = avg_b / bn * tpp->camwbBlue;
double reds = avg_r / std::max(rn, 1u) * tpp->camwbRed;
double greens = avg_g / std::max(gn, 1u) * tpp->camwbGreen;
double blues = avg_b / std::max(bn, 1u) * tpp->camwbBlue;
tpp->redAWBMul = ri->get_rgb_cam (0, 0) * reds + ri->get_rgb_cam (0, 1) * greens + ri->get_rgb_cam (0, 2) * blues;
tpp->greenAWBMul = ri->get_rgb_cam (1, 0) * reds + ri->get_rgb_cam (1, 1) * greens + ri->get_rgb_cam (1, 2) * blues;

8
rtgui/filebrowser.cc
View File

@@ -975,15 +975,11 @@ void FileBrowser::menuItemActivated (Gtk::MenuItem* m)
bppcl->endBatchPParamsChange();
}
} else if (m == clearFromCache) {
for (size_t i = 0; i < mselected.size(); i++) {
tbl->clearFromCacheRequested (mselected, false);
}
tbl->clearFromCacheRequested (mselected, false);
//queue_draw ();
} else if (m == clearFromCacheFull) {
for (size_t i = 0; i < mselected.size(); i++) {
tbl->clearFromCacheRequested (mselected, true);
}
tbl->clearFromCacheRequested (mselected, true);
//queue_draw ();
} else if (miOpenDefaultViewer != nullptr && m == miOpenDefaultViewer) {