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

Fix vectorscope

Browse Source
This commit is contained in:
Flössie
2020-08-16 16:01:29 +02:00
parent d59f488aea
commit 7aa6b713c6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/histogrampanel.cc
View File

@@ -898,7 +898,7 @@ void HistogramRGBAreaVert::get_preferred_width_for_height_vfunc (int height, int
HistogramArea::HistogramArea (DrawModeListener *fml) : HistogramArea::HistogramArea (DrawModeListener *fml) :
vectorscope_scale(0), vectorscope_scale(0),
vect(0, 0), vect(0, 0),
vect_buffer_dirty(true), vect_buffer_size(0), vect_buffer_dirty(true),
waveform_scale(0), waveform_scale(0),
rwave(0, 0), gwave(0, 0),bwave(0, 0), lwave(0, 0), rwave(0, 0), gwave(0, 0),bwave(0, 0), lwave(0, 0),
wave_buffer_dirty(true), wave_buffer_dirty(true),
@@ -1022,6 +1022,7 @@ void HistogramArea::update(
lwave = waveformLuma; lwave = waveformLuma;
wave_buffer_dirty = true; wave_buffer_dirty = true;
} else if (scopeType >= 2) { } else if (scopeType >= 2) {
vectorscope_scale = vectorscopeScale;
vect = vectorscope; vect = vectorscope;
vect_buffer_dirty = true; vect_buffer_dirty = true;
} }
@@ -1343,7 +1344,7 @@ void HistogramArea::drawVectorscope(Cairo::RefPtr<Cairo::Context> &cr, int w, in
if (vect_buffer_dirty && vectorscope_scale > 0) { if (vect_buffer_dirty && vectorscope_scale > 0) {
if (vect_buffer.size() != static_cast<std::size_t>(cairo_stride) * vect_height) { if (vect_buffer.size() != static_cast<std::size_t>(cairo_stride) * vect_height) {
vect_buffer.resize(cairo_stride * vect_height); vect_buffer.resize(static_cast<std::size_t>(cairo_stride) * vect_height);
} }
assert(vect_buffer.size() % 4 == 0); assert(vect_buffer.size() % 4 == 0);

1
rtgui/histogrampanel.h
View File

@@ -164,7 +164,6 @@ protected:
array2D<int> vect; array2D<int> vect;
std::vector<unsigned char> vect_buffer; std::vector<unsigned char> vect_buffer;
bool vect_buffer_dirty; bool vect_buffer_dirty;
int vect_buffer_size;
int waveform_scale; int waveform_scale;
array2D<int> rwave, gwave, bwave, lwave; array2D<int> rwave, gwave, bwave, lwave;
std::vector<unsigned char> wave_buffer; std::vector<unsigned char> wave_buffer;