|
 |
fbd42f2 |
From f4e496af66bc6a779f600158cc42b986d654f143 Mon Sep 17 00:00:00 2001
|
|
|
fbd42f2 |
From: Julien Nabet <serval2412@yahoo.fr>
|
|
|
fbd42f2 |
Date: Mon, 14 Dec 2020 19:45:22 +0100
|
|
|
fbd42f2 |
Subject: [PATCH] Related tdf#138888: fix assertion on avmedia/MediaControlBase
|
|
|
fbd42f2 |
|
|
|
fbd42f2 |
Assertion when trying to insert a video in Impress, see bt:
|
|
|
fbd42f2 |
https://bugs.documentfoundation.org/attachment.cgi?id=168161
|
|
|
fbd42f2 |
|
|
|
fbd42f2 |
According to https://en.cppreference.com/w/cpp/algorithm/clamp
|
|
|
fbd42f2 |
"behavior is undefined if the value of lo is greater than hi"
|
|
|
fbd42f2 |
|
|
|
fbd42f2 |
Regression from:
|
|
|
fbd42f2 |
commit 36b3b357fe2a882db6a5f5a006239e16200fb847
|
|
|
fbd42f2 |
Author: Noel <noelgrandin@gmail.com>
|
|
|
fbd42f2 |
Date: Thu Nov 12 16:10:56 2020 +0200
|
|
|
fbd42f2 |
|
|
|
fbd42f2 |
replace std::min(std::max()) with std::clamp
|
|
|
fbd42f2 |
|
|
|
fbd42f2 |
Change-Id: Idf33eb6c662b60174678f990f98aefc72edec2a6
|
|
|
fbd42f2 |
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107722
|
|
|
fbd42f2 |
Tested-by: Jenkins
|
|
|
fbd42f2 |
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
|
fbd42f2 |
---
|
|
|
fbd42f2 |
avmedia/source/framework/MediaControlBase.cxx | 2 +-
|
|
|
fbd42f2 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
fbd42f2 |
|
|
|
fbd42f2 |
diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx
|
|
|
fbd42f2 |
index ef92cce8a736..890bb04d805b 100644
|
|
|
fbd42f2 |
--- a/avmedia/source/framework/MediaControlBase.cxx
|
|
|
fbd42f2 |
+++ b/avmedia/source/framework/MediaControlBase.cxx
|
|
|
fbd42f2 |
@@ -64,7 +64,7 @@ void MediaControlBase::UpdateVolumeSlider( MediaItem const & aMediaItem )
|
|
|
fbd42f2 |
{
|
|
|
fbd42f2 |
mxVolumeSlider->set_sensitive(true);
|
|
|
fbd42f2 |
const sal_Int32 nVolumeDB = aMediaItem.getVolumeDB();
|
|
|
fbd42f2 |
- mxVolumeSlider->set_value( std::clamp( nVolumeDB, sal_Int32(0), AVMEDIA_DB_RANGE ) );
|
|
|
fbd42f2 |
+ mxVolumeSlider->set_value( std::clamp( nVolumeDB, AVMEDIA_DB_RANGE, sal_Int32(0)) );
|
|
|
fbd42f2 |
}
|
|
|
fbd42f2 |
}
|
|
|
fbd42f2 |
|
|
|
fbd42f2 |
--
|
|
|
fbd42f2 |
2.31.1
|
|
|
fbd42f2 |
|