[Libreoffice-commits] core.git: avmedia/source

[Julien Nabet (via logerrit)]

 avmedia/source/framework/MediaControlBase.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f4e496af66bc6a779f600158cc42b986d654f143
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Mon Dec 14 19:45:22 2020 +0100
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Dec 15 08:29:32 2020 +0100

    Related tdf#138888: fix assertion on avmedia/MediaControlBase
    
    Assertion when trying to insert a video in Impress, see bt:
    https://bugs.documentfoundation.org/attachment.cgi?id=168161
    
    According to https://en.cppreference.com/w/cpp/algorithm/clamp
    "behavior is undefined if the value of lo is greater than hi"
    
    Regression from:
    commit 36b3b357fe2a882db6a5f5a006239e16200fb847
    Author: Noel <noelgrandin at gmail.com>
    Date:   Thu Nov 12 16:10:56 2020 +0200
    
        replace std::min(std::max()) with std::clamp
    
    Change-Id: Idf33eb6c662b60174678f990f98aefc72edec2a6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107722
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx
index ef92cce8a736..890bb04d805b 100644
--- a/avmedia/source/framework/MediaControlBase.cxx
+++ b/avmedia/source/framework/MediaControlBase.cxx
@@ -64,7 +64,7 @@ void MediaControlBase::UpdateVolumeSlider( MediaItem const & aMediaItem )
     {
         mxVolumeSlider->set_sensitive(true);
         const sal_Int32 nVolumeDB = aMediaItem.getVolumeDB();
-        mxVolumeSlider->set_value( std::clamp( nVolumeDB, sal_Int32(0), AVMEDIA_DB_RANGE ) );
+        mxVolumeSlider->set_value( std::clamp( nVolumeDB, AVMEDIA_DB_RANGE, sal_Int32(0)) );
     }
 }