editeng/source/editeng/impedit3.cxx | 4 ++-- external/glm/UnpackedTarball_glm.mk | 4 ++++ external/glm/Wshadow-patch-fix.patch | 11 +++++++++++ filter/source/graphicfilter/icgm/bitmap.cxx | 6 +++--- 4 files changed, 20 insertions(+), 5 deletions(-)
New commits: commit 8205b38d7127143d567a587616bd0cc9091b62e3 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Jan 29 10:26:33 2014 +0100 Fix bad patch ...and whoever had the bad idea to make the downloaded GLM_TARBALL bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip to already be patched with that broken patch (external/glm/Wshadow-unix.patch or external/glm/Wshadow-windows.patch or whatever?) instead of applying locally via gb_UnpackedTarball_add_patches... Change-Id: I0053346f626cc3af42f7ea82a7a26c8b47876a98 diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk index e115bff..9b7bc9d 100644 --- a/external/glm/UnpackedTarball_glm.mk +++ b/external/glm/UnpackedTarball_glm.mk @@ -13,4 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,glm,$(GLM_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1)) +$(eval $(call gb_UnpackedTarball_add_patches,glm, \ + external/glm/Wshadow-patch-fix.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/glm/Wshadow-patch-fix.patch b/external/glm/Wshadow-patch-fix.patch new file mode 100644 index 0000000..3c25f40 --- /dev/null +++ b/external/glm/Wshadow-patch-fix.patch @@ -0,0 +1,11 @@ +--- a/glm/core/type_vec4.hpp ++++ b/glm/core/type_vec4.hpp +@@ -185,7 +185,7 @@ + template <int E0, int E1> + GLM_FUNC_DECL tvec4(T const & x_, glm::detail::swizzle<2, T, tvec2<T>, E0, E1, -1, -2> const & v, T const & w_) + { +- *this = tvec4<T>(x_, v(), w); ++ *this = tvec4<T>(x_, v(), w_); + } + + template <int E0, int E1> commit 790966d5d78cd3700c4ad2d6991cc48381bd1834 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Jan 29 08:43:51 2014 +0100 This has only converted the condition of ?: to long ...not the resulting value, since 9ad0aa90fa5cf8c3b3e6a42bd9a0172b4cf75a47 "#80304# More improvements for vertial writing," but seems unnecessary anyway. Change-Id: Ifb86e51970cd32a1933541c75fe5d1d8f8b9f05b diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index d3a462b..df451a3 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -518,9 +518,9 @@ void ImpEditEngine::CheckAutoPageSize() { Size aPrevPaperSize( GetPaperSize() ); if ( GetStatus().AutoPageWidth() ) - aPaperSize.Width() = (long) !IsVertical() ? CalcTextWidth( sal_True ) : GetTextHeight(); + aPaperSize.Width() = !IsVertical() ? CalcTextWidth( sal_True ) : GetTextHeight(); if ( GetStatus().AutoPageHeight() ) - aPaperSize.Height() = (long) !IsVertical() ? GetTextHeight() : CalcTextWidth( sal_True ); + aPaperSize.Height() = !IsVertical() ? GetTextHeight() : CalcTextWidth( sal_True ); SetValidPaperSize( aPaperSize ); // consider Min, Max commit 20287a82c5ba9971c9ce4da04949a181000f1e22 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Jan 29 08:26:12 2014 +0100 Needless casts sal_uInt8 -> sal_Int8 -> sal_uInt8 Change-Id: I2d55c4e088cf17183ededa0719b3bdcba5baba23 diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx index 09f5adc..f9242c7 100644 --- a/filter/source/graphicfilter/icgm/bitmap.cxx +++ b/filter/source/graphicfilter/icgm/bitmap.cxx @@ -144,9 +144,9 @@ void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc ) nxC = nxCount; for ( nx = 0; --nxC; nx++ ) { - aBitmapColor.SetRed( (sal_Int8)*pTemp++ ); - aBitmapColor.SetGreen( (sal_Int8)*pTemp++ ); - aBitmapColor.SetBlue( (sal_Int8)*pTemp++ ); + aBitmapColor.SetRed( *pTemp++ ); + aBitmapColor.SetGreen( *pTemp++ ); + aBitmapColor.SetBlue( *pTemp++ ); rDesc.mpAcc->SetPixel( ny, nx, aBitmapColor ); } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits