basegfx/source/color/bcolormodifier.cxx | 24 ++++++++++++------------
basegfx/source/tools/bgradient.cxx | 10 +++++-----
basegfx/source/tools/canvastools.cxx | 4 ++--
basegfx/source/tools/unopolypolygon.cxx | 4 ++--
download.lst | 4 ++--
external/glm/UnpackedTarball_glm.mk | 1 -
external/glm/c++20.patch.0 | 11 -----------
external/glm/clang-cl.patch.0 | 18 +++++++++---------
8 files changed, 32 insertions(+), 44 deletions(-)
New commits:
commit 4ee04612875b30d122849038a00382356def6bc1
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon May 6 10:17:42 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue May 7 12:54:20 2024 +0200
loplugin:ostr basegfx
Change-Id: I79212cbfd1c7cae810f8e24dbd73372b9f97f9ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167190
Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/basegfx/source/color/bcolormodifier.cxx
b/basegfx/source/color/bcolormodifier.cxx
index 3b9d1ce158c3..04ab3757cb45 100644
--- a/basegfx/source/color/bcolormodifier.cxx
+++ b/basegfx/source/color/bcolormodifier.cxx
@@ -47,7 +47,7 @@ namespace basegfx
OUString BColorModifier_gray::getModifierName() const
{
- return "gray";
+ return u"gray"_ustr;
}
BColorModifier_invert::~BColorModifier_invert()
@@ -66,7 +66,7 @@ namespace basegfx
OUString BColorModifier_invert::getModifierName() const
{
- return "invert";
+ return u"invert"_ustr;
}
BColorModifier_luminance_to_alpha::~BColorModifier_luminance_to_alpha()
@@ -87,7 +87,7 @@ namespace basegfx
OUString BColorModifier_luminance_to_alpha::getModifierName() const
{
- return "luminance_to_alpha";
+ return u"luminance_to_alpha"_ustr;
}
BColorModifier_replace::~BColorModifier_replace()
@@ -113,7 +113,7 @@ namespace basegfx
OUString BColorModifier_replace::getModifierName() const
{
- return "replace";
+ return u"replace"_ustr;
}
BColorModifier_interpolate::~BColorModifier_interpolate()
@@ -139,7 +139,7 @@ namespace basegfx
OUString BColorModifier_interpolate::getModifierName() const
{
- return "interpolate";
+ return u"interpolate"_ustr;
}
BColorModifier_matrix::~BColorModifier_matrix()
@@ -194,7 +194,7 @@ namespace basegfx
OUString BColorModifier_matrix::getModifierName() const
{
- return "matrix";
+ return u"matrix"_ustr;
}
BColorModifier_saturate::BColorModifier_saturate(double fValue)
@@ -239,7 +239,7 @@ namespace basegfx
OUString BColorModifier_saturate::getModifierName() const
{
- return "saturate";
+ return u"saturate"_ustr;
}
BColorModifier_hueRotate::BColorModifier_hueRotate(double fRad)
@@ -290,7 +290,7 @@ namespace basegfx
OUString BColorModifier_hueRotate::getModifierName() const
{
- return "hueRotate";
+ return u"hueRotate"_ustr;
}
BColorModifier_black_and_white::~BColorModifier_black_and_white()
@@ -325,7 +325,7 @@ namespace basegfx
OUString BColorModifier_black_and_white::getModifierName() const
{
- return "black_and_white";
+ return u"black_and_white"_ustr;
}
BColorModifier_gamma::BColorModifier_gamma(double fValue)
@@ -376,7 +376,7 @@ namespace basegfx
OUString BColorModifier_gamma::getModifierName() const
{
- return "gamma";
+ return u"gamma"_ustr;
}
BColorModifier_RGBLuminanceContrast::BColorModifier_RGBLuminanceContrast(double
fRed, double fGreen, double fBlue, double fLuminance, double fContrast)
@@ -458,7 +458,7 @@ namespace basegfx
OUString BColorModifier_RGBLuminanceContrast::getModifierName() const
{
- return "RGBLuminanceContrast";
+ return u"RGBLuminanceContrast"_ustr;
}
BColorModifier_randomize::BColorModifier_randomize(double fRandomPart)
@@ -514,7 +514,7 @@ namespace basegfx
OUString BColorModifier_randomize::getModifierName() const
{
- return "randomize";
+ return u"randomize"_ustr;
}
::basegfx::BColor BColorModifierStack::getModifiedColor(const
::basegfx::BColor& rSource) const
diff --git a/basegfx/source/tools/bgradient.cxx
b/basegfx/source/tools/bgradient.cxx
index 9f98c54cfc1c..a8bbe95c526b 100644
--- a/basegfx/source/tools/bgradient.cxx
+++ b/basegfx/source/tools/bgradient.cxx
@@ -55,12 +55,12 @@ StringMap lcl_jsonToStringMap(std::u16string_view rJSON)
basegfx::BGradient lcl_buildGradientFromStringMap(StringMap& rMap)
{
- basegfx::BGradient aGradient(
-
basegfx::BColorStops(ColorToBColorConverter(rMap["startcolor"].toInt32(16)).getBColor(),
-
ColorToBColorConverter(rMap["endcolor"].toInt32(16)).getBColor()));
+ basegfx::BGradient aGradient(basegfx::BColorStops(
+
ColorToBColorConverter(rMap[u"startcolor"_ustr].toInt32(16)).getBColor(),
+
ColorToBColorConverter(rMap[u"endcolor"_ustr].toInt32(16)).getBColor()));
- aGradient.SetGradientStyle(lcl_getStyleFromString(rMap["style"]));
- aGradient.SetAngle(Degree10(rMap["angle"].toInt32()));
+ aGradient.SetGradientStyle(lcl_getStyleFromString(rMap[u"style"_ustr]));
+ aGradient.SetAngle(Degree10(rMap[u"angle"_ustr].toInt32()));
return aGradient;
}
diff --git a/basegfx/source/tools/canvastools.cxx
b/basegfx/source/tools/canvastools.cxx
index 70f4787710ad..b46662419b95 100644
--- a/basegfx/source/tools/canvastools.cxx
+++ b/basegfx/source/tools/canvastools.cxx
@@ -287,8 +287,8 @@ namespace basegfx::unotools
if( !xLinePoly.is() )
{
throw lang::IllegalArgumentException(
-
"basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(): Invalid input"
- "poly-polygon, cannot retrieve vertex data",
+
u"basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(): Invalid input"
+ "poly-polygon, cannot retrieve vertex data"_ustr,
uno::Reference< uno::XInterface >(),
0 );
}
diff --git a/basegfx/source/tools/unopolypolygon.cxx
b/basegfx/source/tools/unopolypolygon.cxx
index 323e06a96f18..3f4d273cf8f2 100644
--- a/basegfx/source/tools/unopolypolygon.cxx
+++ b/basegfx/source/tools/unopolypolygon.cxx
@@ -95,8 +95,8 @@ namespace basegfx::unotools
// found - contract violation.
if( !xLinePoly.is() )
throw lang::IllegalArgumentException(
- "UnoPolyPolygon::addPolyPolygon(): Invalid input "
- "poly-polygon, cannot retrieve vertex data",
+ u"UnoPolyPolygon::addPolyPolygon(): Invalid input "
+ "poly-polygon, cannot retrieve vertex data"_ustr,
getXWeak(), 1);
aSrcPoly = unotools::polyPolygonFromPoint2DSequenceSequence(
commit 01fe29c78d21951be45bf8957092786d67c70b8e
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue May 7 11:32:41 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue May 7 12:54:16 2024 +0200
glm: Upgrade to 1.0.1
c++20.patch.0 got obseleted in
https://github.com/g-truc/glm/commit/6fdeff4d67f3db493d47c44da20aa1efaa6574ef
Change-Id: I8698968b55f299c55777fe280b3eda9e2bea9cdc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167268
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index 28538879f5ec..27ffbbb97306 100644
--- a/download.lst
+++ b/download.lst
@@ -277,8 +277,8 @@ FROZEN_TARBALL := frozen-1.1.1.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-GLM_SHA256SUM :=
6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad
-GLM_TARBALL := glm-0.9.9.8.zip
+GLM_SHA256SUM :=
09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5
+GLM_TARBALL := glm-1.0.1.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/glm/UnpackedTarball_glm.mk
b/external/glm/UnpackedTarball_glm.mk
index 934621eac841..78226f44cc08 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1))
$(eval $(call gb_UnpackedTarball_add_patches,glm, \
external/glm/clang-cl.patch.0 \
- external/glm/c++20.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/glm/c++20.patch.0 b/external/glm/c++20.patch.0
deleted file mode 100644
index 9fdd813a1e53..000000000000
--- a/external/glm/c++20.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
---- glm/detail/type_half.inl
-+++ glm/detail/type_half.inl
-@@ -6,7 +6,7 @@
- volatile float f = 1e10;
-
- for(int i = 0; i < 10; ++i)
-- f *= f; // this will overflow before the for loop
terminates
-+ f = f * f; // this will overflow before the for loop
terminates
- return f;
- }
-
diff --git a/external/glm/clang-cl.patch.0 b/external/glm/clang-cl.patch.0
index e5536e145094..6ba15fb788b1 100644
--- a/external/glm/clang-cl.patch.0
+++ b/external/glm/clang-cl.patch.0
@@ -3,12 +3,12 @@
--- glm/detail/func_integer.inl
+++ glm/detail/func_integer.inl
@@ -3,7 +3,9 @@
- #include "_vectorize.hpp"
- #if(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
- # include <intrin.h>
-+#if !defined __clang__
- # pragma intrinsic(_BitScanReverse)
-+#endif
- #endif//(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
- #include <limits>
-
+ #include "_vectorize.hpp"
+ #if(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
+ # include <intrin.h>
++#if !defined __clang__
+ # pragma intrinsic(_BitScanReverse)
++#endif
+ #endif//(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
+ #include <limits>
+
