vcl/inc/bitmap/impoctree.hxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit ace0af37f2f79561cb52d695e3aa00eab3e2f547 Author: Noel Grandin <[email protected]> AuthorDate: Thu Nov 26 20:10:43 2020 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Nov 27 12:30:53 2020 +0100 tdf#138486 Artifacts in some impress templates fields need to be signed regression from commit 548d77d0c06f7088dd3eb408797aa1fc1d7eb277 Author: Noel <[email protected]> Date: Fri Nov 13 10:23:36 2020 +0200 tools::Long->sal_uInt16 in ImpErrorQuad Change-Id: Ia2a70d55d9af2ea3712ace3394c0de3931bee95c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106709 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 31f2b4b23e5d16c1b04035f08ebbb11c1abf62e3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106735 diff --git a/vcl/inc/bitmap/impoctree.hxx b/vcl/inc/bitmap/impoctree.hxx index 7c464dbb9758..b77e964f4f79 100644 --- a/vcl/inc/bitmap/impoctree.hxx +++ b/vcl/inc/bitmap/impoctree.hxx @@ -24,9 +24,9 @@ class ImpErrorQuad { - sal_uInt32 nRed; - sal_uInt32 nGreen; - sal_uInt32 nBlue; + sal_Int16 nRed; + sal_Int16 nGreen; + sal_Int16 nBlue; public: ImpErrorQuad() @@ -100,9 +100,9 @@ inline void ImpErrorQuad::ImplAddColorError7(const ImpErrorQuad& rErrQuad) inline BitmapColor ImpErrorQuad::ImplGetColor() { - return BitmapColor(std::clamp<sal_uInt16>(nRed, 0, 8160) >> 5, - std::clamp<sal_uInt16>(nGreen, 0, 8160) >> 5, - std::clamp<sal_uInt16>(nBlue, 0, 8160) >> 5); + return BitmapColor(std::clamp(nRed, sal_Int16(0), sal_Int16(8160)) >> 5, + std::clamp(nGreen, sal_Int16(0), sal_Int16(8160)) >> 5, + std::clamp(nBlue, sal_Int16(0), sal_Int16(8160)) >> 5); } #endif // INCLUDED_VCL_INC_IMPOCTREE_HXX _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
