diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2016-12-22 10:00:34 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2016-12-22 10:00:34 +0000 |
| commit | 588c04542348d0d596b3776ea61daaacf6f6aa90 (patch) | |
| tree | c4c3aa2f125e2e43ccde47465fe17e86a35acd24 | |
| parent | 57ec29bc7b42571e158da93551159a0a2ff48bab (diff) | |
| download | ports-588c04542348d0d596b3776ea61daaacf6f6aa90.tar.gz ports-588c04542348d0d596b3776ea61daaacf6f6aa90.zip | |
MFH: r426356
Fix build of multimedia/kdenlive -- ambiguity of abs()
Approved by: antoine
Approved by: ports-secteam (blanket)
Notes
Notes:
svn path=/branches/2016Q4/; revision=429152
| -rw-r--r-- | multimedia/kdenlive/files/patch-src_scopes_audioscopes_spectrogram.cpp | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/multimedia/kdenlive/files/patch-src_scopes_audioscopes_spectrogram.cpp b/multimedia/kdenlive/files/patch-src_scopes_audioscopes_spectrogram.cpp new file mode 100644 index 000000000000..d2c291c23377 --- /dev/null +++ b/multimedia/kdenlive/files/patch-src_scopes_audioscopes_spectrogram.cpp @@ -0,0 +1,37 @@ +Fix ambiguity of abs(). + +[7%] Building CXX object src/CMakeFiles/kdenlive.dir/scopes/audioscopes/spectrogram.cpp.o +/tmp/usr/ports/multimedia/kdenlive/work/kdenlive-16.04.3/src/scopes/audioscopes/spectrogram.cpp:276:77: error: call to 'abs' is ambiguous + hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x-(leftDist + mouseX + 30)) < (int) minDistX + ^~~ +/usr/include/stdlib.h:83:6: note: candidate function +int abs(int) __pure2; + ^ +/usr/include/c++/v1/stdlib.h:115:44: note: candidate function +inline _LIBCPP_INLINE_VISIBILITY long abs( long __x) _NOEXCEPT {return labs(__x);} + ^ +/usr/include/c++/v1/stdlib.h:117:44: note: candidate function +inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {return llabs(__x);} + ^ +[...] + +--- src/scopes/audioscopes/spectrogram.cpp.orig 2016-07-12 21:44:03 UTC ++++ src/scopes/audioscopes/spectrogram.cpp +@@ -245,7 +245,7 @@ QImage Spectrogram::renderHUD(uint) + x = leftDist + (m_innerScopeRect.width()-1) * ((float)hz)/m_freqMax; + + // Hide text if it would overlap with the text drawn at the mouse position +- hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x-(leftDist + mouseX + 20)) < (int) minDistX + 16 ++ hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs((int)(x-(leftDist + mouseX + 20))) < (int) minDistX + 16 + && mouseX < m_innerScopeRect.width() && mouseX >= 0; + + if (x <= rightBorder) { +@@ -273,7 +273,7 @@ QImage Spectrogram::renderHUD(uint) + } + // Draw the line at the very right (maximum frequency) + x = leftDist + m_innerScopeRect.width()-1; +- hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs(x-(leftDist + mouseX + 30)) < (int) minDistX ++ hideText = m_aTrackMouse->isChecked() && m_mouseWithinWidget && abs((int)(x-(leftDist + mouseX + 30))) < (int) minDistX + && mouseX < m_innerScopeRect.width() && mouseX >= 0; + davinci.drawLine(x, topDist, x, topDist + m_innerScopeRect.height()+6); + if (!hideText) { |