diff options
| author | ronso0 <ronso0@mixxx.org> | 2019-10-22 01:21:10 +0200 |
|---|---|---|
| committer | ronso0 <ronso0@mixxx.org> | 2019-10-22 01:21:10 +0200 |
| commit | a254e62381a7a88bc311bf4f7fc4f308e63edf7d (patch) | |
| tree | 9a09e9936d044c64bc09476a461e41b58067d0ac /src/waveform | |
| parent | 8c1813512b547847840cb68844c607f2ff7b5046 (diff) | |
| parent | b83b62d890f5b1954fd76ec10a2b8edd0d2bae6b (diff) | |
Merge remote-tracking branch 'mixxx/master' into hotcue-confilcts-LateNight-Shade-fix
Diffstat (limited to 'src/waveform')
| -rw-r--r-- | src/waveform/waveform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/waveform/waveform.h b/src/waveform/waveform.h index 31d468069e..aa544d6058 100644 --- a/src/waveform/waveform.h +++ b/src/waveform/waveform.h @@ -111,7 +111,7 @@ class Waveform { // We do not lock the mutex since m_data is not resized after the // constructor runs. - inline int getTextureSize() const { return m_data.size(); } + inline int getTextureSize() const { return static_cast<int>(m_data.size()); } // Atomically get the number of data elements in this Waveform. We do not // lock the mutex since m_dataSize is not changed after the constructor |