download.lst | 4 ++-- emfio/source/reader/mtftools.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 6cca6b5a29e0c6a8dd34ef4036152dbdfb3843cc Author: Caolán McNamara <[email protected]> AuthorDate: Fri Jan 2 11:01:22 2026 +0000 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Jan 8 17:11:21 2026 +0100 ofz#472735025 Integer-overflow Change-Id: If7b76626d43435d4e079a11080b87c76f8b5db81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196420 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit cd48c8431965df97e6d1b6b5a63d05587572a8af) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196433 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx index 5888d5f9de9f..a8380cb374fc 100644 --- a/emfio/source/reader/mtftools.cxx +++ b/emfio/source/reader/mtftools.cxx @@ -276,7 +276,7 @@ namespace emfio aFont.SetFontSize( aFontSize ); pVDev->SetFont( aFont ); FontMetric aMetric( pVDev->GetFontMetric() ); - tools::Long nHeight = aMetric.GetAscent() + aMetric.GetDescent(); + tools::Long nHeight = static_cast<tools::Long>(aMetric.GetAscent()) + aMetric.GetDescent(); if (nHeight) { double fHeight = (static_cast<double>(aFontSize.Height()) * rFont.lfHeight ) / nHeight; commit 996cae297b6501818a81eb9a247946aa65ccd55b Author: Xisco Fauli <[email protected]> AuthorDate: Fri Jan 2 11:09:16 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Jan 8 17:11:13 2026 +0100 glm: upgrade to 1.0.3 Downloaded from https://github.com/g-truc/glm/archive/refs/tags/1.0.3.zip Change-Id: I1bd5d15a845f8842b7cf37368a600198e58da335 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196413 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit e4d38da717fada1860b00ebe396705b1a001c711) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196428 diff --git a/download.lst b/download.lst index 680308bba14c..5ee05b3a6e1f 100644 --- a/download.lst +++ b/download.lst @@ -312,8 +312,8 @@ FROZEN_TARBALL := frozen-1.2.0.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -GLM_SHA256SUM := be64032585415ca7dbea0d614915bb8eec012adf7b4d4fea7ff6b5bd3e0b906a -GLM_TARBALL := glm-1.0.2.zip +GLM_SHA256SUM := 3aa4347b8f13cba882df1c7b61a6ca910c75a875c56ec3d75d7dc9ae8eac34df +GLM_TARBALL := glm-1.0.3.zip # three static lines # so that git cherry-pick # will not run into conflicts
