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

Fix scaling of H-C vectorscope

Browse Source
This commit is contained in:
Lawrence Lee
2020-09-22 22:10:57 -07:00
parent 79e79321ec
commit 6e7185081a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtengine/improccoordinator.cc
View File

@@ -1875,6 +1875,7 @@ bool ImProcCoordinator::updateVectorscopeHC()
params->crop.mapToResized(pW, pH, scale, x1, x2, y1, y2); params->crop.mapToResized(pW, pH, scale, x1, x2, y1, y2);
constexpr int size = VECTORSCOPE_SIZE; constexpr int size = VECTORSCOPE_SIZE;
constexpr float norm_factor = size / (128.f * 655.36f);
vectorscope_hc.fill(0); vectorscope_hc.fill(0);
vectorscopeScale = (x2 - x1) * (y2 - y1); vectorscopeScale = (x2 - x1) * (y2 - y1);
@@ -1893,8 +1894,8 @@ bool ImProcCoordinator::updateVectorscopeHC()
#endif #endif
for (int i = y1; i < y2; ++i) { for (int i = y1; i < y2; ++i) {
for (int j = x1, ofs_lab = (i - y1) * (x2 - x1); j < x2; ++j, ++ofs_lab) { for (int j = x1, ofs_lab = (i - y1) * (x2 - x1); j < x2; ++j, ++ofs_lab) {
const int col = (size / 96000.f) * a[ofs_lab] + size / 2; const int col = norm_factor * a[ofs_lab] + size / 2 + 0.5f;
const int row = (size / 96000.f) * b[ofs_lab] + size / 2; const int row = norm_factor * b[ofs_lab] + size / 2 + 0.5f;
if (col >= 0 && col < size && row >= 0 && row < size) { if (col >= 0 && col < size && row >= 0 && row < size) {
vectorscopeThr[row][col]++; vectorscopeThr[row][col]++;
} }

2
rtgui/histogrampanel.cc
View File

@@ -1666,7 +1666,7 @@ void HistogramArea::drawVectorscope(Cairo::RefPtr<Cairo::Context> &cr, int w, in
cx = (w + scope_size * S * std::cos(H * 2 * RT_PI_F)) / 2; cx = (w + scope_size * S * std::cos(H * 2 * RT_PI_F)) / 2;
cy = (h - scope_size * S * std::sin(H * 2 * RT_PI_F)) / 2; cy = (h - scope_size * S * std::sin(H * 2 * RT_PI_F)) / 2;
} else { } else {
constexpr float ab_factor = 327.68f / 96000.f; constexpr float ab_factor = 1.f / 256.f;
cx = w / 2.f + scope_size * pointer_a * ab_factor; cx = w / 2.f + scope_size * pointer_a * ab_factor;
cy = h / 2.f - scope_size * pointer_b * ab_factor; cy = h / 2.f - scope_size * pointer_b * ab_factor;
} }