You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2019/10/27 07:12:02 UTC
[openoffice] branch AOO418 updated (c1c573a -> f322e99)
This is an automated email from the ASF dual-hosted git repository.
arielch pushed a change to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
from c1c573a Fixed date/time conversion, removed whitespace, fixed typos
new bc5cd33 set 0u - so it build under Debian 9 too - thanks Damjan ffor the hint
new a529b01 Fix -Wshift-negative-value compiler warnings. The result of shifting negative integer values is undefined, so change the operand to be unsigned.
new 53a0094 Fix build with modern boost which has dropped the old tr1 headers. Support for the native <complex> include file has been around on Linux since at least CentOS 5.
new f549c9e #i126999#: fix vcl/source/glyphs/graphite_layout.cxx compile with libc++ 3.8.0
new f322e99 i123947 - fix stlport emulation when compiling in C++11 mode
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/basebmp/inc/basebmp/packedpixeliterator.hxx | 8 ++++----
main/formula/inc/formula/grammar.hxx | 4 ++--
main/scaddins/source/analysis/analysishelper.hxx | 2 +-
main/stlport/systemstl/list | 12 ++++++++----
main/stlport/systemstl/map | 2 ++
main/stlport/systemstl/numeric | 2 ++
main/stlport/systemstl/set | 2 ++
main/stlport/systemstl/vector | 2 ++
main/vcl/source/gdi/bmpfast.cxx | 2 +-
main/vcl/source/glyphs/graphite_layout.cxx | 22 +++++++++++-----------
10 files changed, 35 insertions(+), 23 deletions(-)
[openoffice] 03/05: Fix build with modern boost which has dropped
the old tr1 headers. Support for the native include file has been
around on Linux since at least CentOS 5.
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
arielch pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 53a0094d045fbe1d95a4392bad9e92b2d4ea56e0
Author: Don Lewis <tr...@apache.org>
AuthorDate: Thu Sep 28 07:12:46 2017 +0000
Fix build with modern boost which has dropped the old tr1 headers.
Support for the native <complex> include file has been around on Linux
since at least CentOS 5.
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1809957 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit f8ac4166ea8d41393182f4ed6cd76ef29151d1c9)
---
main/scaddins/source/analysis/analysishelper.hxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/scaddins/source/analysis/analysishelper.hxx b/main/scaddins/source/analysis/analysishelper.hxx
index 7b799c6..558417e 100644
--- a/main/scaddins/source/analysis/analysishelper.hxx
+++ b/main/scaddins/source/analysis/analysishelper.hxx
@@ -35,7 +35,7 @@
#include <math.h>
-#include <boost/tr1/complex.hpp>
+#include <complex>
#ifndef double_complex
typedef std::complex<double> double_complex;
#endif
[openoffice] 05/05: i123947 - fix stlport emulation when compiling
in C++11 mode
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
arielch pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit f322e9922b6852cb8bf6187b8219a3d0bba4f778
Author: Ariel Constenla-Haile <ar...@apache.org>
AuthorDate: Sun Oct 27 03:51:33 2019 -0300
i123947 - fix stlport emulation when compiling in C++11 mode
(cherry picked from commit 1828d080320011efd486c973e80e3eec3ad241f7)
---
main/stlport/systemstl/list | 12 ++++++++----
main/stlport/systemstl/map | 2 ++
main/stlport/systemstl/numeric | 2 ++
main/stlport/systemstl/set | 2 ++
main/stlport/systemstl/vector | 2 ++
5 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/main/stlport/systemstl/list b/main/stlport/systemstl/list
index 283880b..6c66137 100644
--- a/main/stlport/systemstl/list
+++ b/main/stlport/systemstl/list
@@ -26,10 +26,14 @@
// TODO: use computed include file name
#include_next <list>
#elif defined(_MSC_VER)
- #include <../../VC/include/list>
- // MSVC's list would cause a lot of expression-result-unused warnings
- // unless it is compiled in iterator-debugging mode. Silence this noise
- #pragma warning(disable:4555)
+ // MSVC's list would cause a lot of expression-result-unused warnings
+ // unless it is compiled in iterator-debugging mode. Silence this noise temporarily.
+ #pragma warning(push)
+ #pragma warning(disable:4555)
+ #include <../../VC/include/list>
+ #pragma warning(pop)
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+ #include_next <list>
#else // fall back to boost/tr1
#include <boost/tr1/tr1/list>
#endif
diff --git a/main/stlport/systemstl/map b/main/stlport/systemstl/map
index 13f783b..ec1c3db 100644
--- a/main/stlport/systemstl/map
+++ b/main/stlport/systemstl/map
@@ -25,6 +25,8 @@
#ifdef HAVE_STL_INCLUDE_PATH
// TODO: use computed include file name
#include_next <map>
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+ #include_next <map>
#elif defined(_MSC_VER)
#include <../../VC/include/map>
#else // fall back to boost/tr1
diff --git a/main/stlport/systemstl/numeric b/main/stlport/systemstl/numeric
index 975612b..5bd6b90 100644
--- a/main/stlport/systemstl/numeric
+++ b/main/stlport/systemstl/numeric
@@ -25,6 +25,8 @@
#ifdef HAVE_STL_INCLUDE_PATH
// TODO: use computed include file name
#include_next <numeric>
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+ #include_next <numeric>
#elif defined(_MSC_VER)
#include <../../VC/include/numeric>
#else // fall back to boost/tr1
diff --git a/main/stlport/systemstl/set b/main/stlport/systemstl/set
index 2d99053..674cab0 100644
--- a/main/stlport/systemstl/set
+++ b/main/stlport/systemstl/set
@@ -27,6 +27,8 @@
// TODO: use computed include file name
#include "utility"
#include_next <set>
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+ #include_next <set>
#elif defined(_MSC_VER)
#include <../../VC/include/set>
#else // fall back to boost/tr1
diff --git a/main/stlport/systemstl/vector b/main/stlport/systemstl/vector
index 8b4e86f..3275372 100644
--- a/main/stlport/systemstl/vector
+++ b/main/stlport/systemstl/vector
@@ -25,6 +25,8 @@
#ifdef HAVE_STL_INCLUDE_PATH
// TODO: use computed include file name
#include_next <vector>
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+ #include_next <vector>
#elif defined(_MSC_VER)
#include <../../VC/include/vector>
#else // fall back to boost/tr1
[openoffice] 01/05: set 0u - so it build under Debian 9 too -
thanks Damjan ffor the hint
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
arielch pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit bc5cd333d76771b5ada721c541f30d44aea40f81
Author: Mechtilde Stehmann <me...@apache.org>
AuthorDate: Wed Jan 9 20:57:59 2019 +0000
set 0u - so it build under Debian 9 too - thanks Damjan ffor the hint
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1850909 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit aa82d4445d9ec67b82553d5182f6639a46b0b02b)
---
main/basebmp/inc/basebmp/packedpixeliterator.hxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/main/basebmp/inc/basebmp/packedpixeliterator.hxx b/main/basebmp/inc/basebmp/packedpixeliterator.hxx
index 4ad390a..d345fab 100644
--- a/main/basebmp/inc/basebmp/packedpixeliterator.hxx
+++ b/main/basebmp/inc/basebmp/packedpixeliterator.hxx
@@ -83,7 +83,7 @@ public:
num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
/** Bit mask for one pixel (least significant bits)
*/
- bit_mask=~(~0 << bits_per_pixel)
+ bit_mask=~(~0u << bits_per_pixel)
};
private:
@@ -253,7 +253,7 @@ public:
num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
/** Bit mask for one pixel (least significant bits)
*/
- bit_mask=~(~0 << bits_per_pixel)
+ bit_mask=~(~0u << bits_per_pixel)
};
private:
@@ -506,7 +506,7 @@ public:
num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
/** Bit mask for one pixel (least significant bits)
*/
- bit_mask=~(~0 << bits_per_pixel)
+ bit_mask=~(~0u << bits_per_pixel)
};
// TODO(F2): direction of iteration (ImageIterator can be made to
[openoffice] 02/05: Fix -Wshift-negative-value compiler warnings.
The result of shifting negative integer values is undefined,
so change the operand to be unsigned.
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
arielch pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit a529b01c2d1a87a60a38458297ce61ce4b693866
Author: truckman <tr...@13f79535-47bb-0310-9956-ffa450edef68>
AuthorDate: Thu Sep 1 00:14:50 2016 +0000
Fix -Wshift-negative-value compiler warnings. The result of shifting
negative integer values is undefined, so change the operand to be
unsigned.
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1758692 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit b296461cbb97e87a3394616aaf6cc6e89aafbd4c)
---
main/basebmp/inc/basebmp/packedpixeliterator.hxx | 2 +-
main/formula/inc/formula/grammar.hxx | 4 ++--
main/vcl/source/gdi/bmpfast.cxx | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/main/basebmp/inc/basebmp/packedpixeliterator.hxx b/main/basebmp/inc/basebmp/packedpixeliterator.hxx
index d345fab..58a119f 100644
--- a/main/basebmp/inc/basebmp/packedpixeliterator.hxx
+++ b/main/basebmp/inc/basebmp/packedpixeliterator.hxx
@@ -51,7 +51,7 @@ inline value_type get_mask( difference_type d )
const unsigned int nIntraWordPositions( sizeof(value_type)*8 / bits_per_pixel );
// create bits_per_pixel 1s shift to intra-word position
- return ((~(~0 << bits_per_pixel)) << bits_per_pixel*(MsbFirst ?
+ return ((~(~0u << bits_per_pixel)) << bits_per_pixel*(MsbFirst ?
(nIntraWordPositions-1 - (d % nIntraWordPositions)) :
(d % nIntraWordPositions)));
}
diff --git a/main/formula/inc/formula/grammar.hxx b/main/formula/inc/formula/grammar.hxx
index acd4682..b53fdcf 100644
--- a/main/formula/inc/formula/grammar.hxx
+++ b/main/formula/inc/formula/grammar.hxx
@@ -56,9 +56,9 @@ public:
// Room for 32k hypothetical languages plus EXTERNAL.
static const int kConventionShift = 16;
// Room for 256 reference conventions.
- static const int kEnglishBit = (1 << (kConventionShift + 8));
+ static const int kEnglishBit = (1u << (kConventionShift + 8));
// Mask off all non-language bits.
- static const int kFlagMask = ~((~int(0)) << kConventionShift);
+ static const int kFlagMask = ~((~0u) << kConventionShift);
/** Values encoding the formula language plus address reference convention
plus English parsing/formatting
diff --git a/main/vcl/source/gdi/bmpfast.cxx b/main/vcl/source/gdi/bmpfast.cxx
index 77deb1e..5278673 100644
--- a/main/vcl/source/gdi/bmpfast.cxx
+++ b/main/vcl/source/gdi/bmpfast.cxx
@@ -354,7 +354,7 @@ inline void ImplBlendPixels( const TrueColorPixelPtr<DSTFMT>& rDst,
{
if( !nAlphaVal )
ImplConvertPixel( rDst, rSrc );
- else if( nAlphaVal != ~(~0 << ALPHABITS) )
+ else if( nAlphaVal != ~(~0u << ALPHABITS) )
{
static const unsigned nAlphaShift = (ALPHABITS > 8) ? 8 : ALPHABITS;
if( ALPHABITS > nAlphaShift )
[openoffice] 04/05: #i126999#: fix
vcl/source/glyphs/graphite_layout.cxx compile with libc++ 3.8.0
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
arielch pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit f549c9e0c31d717f8a9fb42390813acc09af6f7d
Author: truckman <tr...@13f79535-47bb-0310-9956-ffa450edef68>
AuthorDate: Thu Jun 16 08:00:20 2016 +0000
#i126999#: fix vcl/source/glyphs/graphite_layout.cxx compile with libc++ 3.8.0
Rename local inline function round() to round2long() to avoid ambiguity
with libc++ round() function and better describe its functionality. This
fixes a compile error when building with libc++ version 3.8.0, which
was first observed with FreeBSD 11.0.
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1748663 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit a4e19be7f6f6069ba569aa50c7f757af9e497d27)
---
main/vcl/source/glyphs/graphite_layout.cxx | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/main/vcl/source/glyphs/graphite_layout.cxx b/main/vcl/source/glyphs/graphite_layout.cxx
index 0459da5..95dd7ee 100644
--- a/main/vcl/source/glyphs/graphite_layout.cxx
+++ b/main/vcl/source/glyphs/graphite_layout.cxx
@@ -107,7 +107,7 @@ namespace
typedef ext_std::pair<gr::GlyphIterator, gr::GlyphIterator> glyph_range_t;
typedef ext_std::pair<gr::GlyphSetIterator, gr::GlyphSetIterator> glyph_set_range_t;
- inline long round(const float n) {
+ inline long round2long(const float n) {
return long(n + (n < 0 ? -0.5 : 0.5));
}
@@ -294,8 +294,8 @@ GraphiteLayout::Glyphs::fill_from(gr::Segment & rSegment, ImplLayoutArgs &rArgs,
fMinX = std::min(aBounds.first, fMinX);
fMaxX = std::max(aBounds.second, fMaxX);
}
- long nXOffset = round(fMinX * fScaling);
- rWidth = round(fMaxX * fScaling) - nXOffset + nDxOffset;
+ long nXOffset = round2long(fMinX * fScaling);
+ rWidth = round2long(fMaxX * fScaling) - nXOffset + nDxOffset;
if (rWidth < 0)
{
// This can happen when there was no base inside the range
@@ -406,7 +406,7 @@ std::pair<float,float> GraphiteLayout::Glyphs::appendCluster(gr::Segment& rSeg,
if (j + nDelta >= nGlyphs || j + nDelta < 0) // at rhs ltr,rtl
{
fNextOrigin = fSegmentAdvance;
- nNextOrigin = round(fSegmentAdvance * fScaling + rDXOffset);
+ nNextOrigin = round2long(fSegmentAdvance * fScaling + rDXOffset);
aBounds.second = std::max(fSegmentAdvance, aBounds.second);
}
else
@@ -414,7 +414,7 @@ std::pair<float,float> GraphiteLayout::Glyphs::appendCluster(gr::Segment& rSeg,
gr::GlyphInfo aNextGlyph = *(iGlyphs.first + j + nDelta);
fNextOrigin = std::max(aNextGlyph.attachedClusterBase()->origin(), aNextGlyph.origin());
aBounds.second = std::max(fNextOrigin, aBounds.second);
- nNextOrigin = round(fNextOrigin * fScaling + rDXOffset);
+ nNextOrigin = round2long(fNextOrigin * fScaling + rDXOffset);
}
aBounds.first = std::min(aGlyph.origin(), aBounds.first);
if ((signed)aGlyph.firstChar() < rArgs.mnEndCharPos &&
@@ -432,8 +432,8 @@ std::pair<float,float> GraphiteLayout::Glyphs::appendCluster(gr::Segment& rSeg,
// the origin of the first glyph of the next cluster ltr
// rtl it is the origin of the 1st glyph of the cluster
long nXPos = (bRtl)?
- round(aFirstGlyph.attachedClusterBase()->origin() * fScaling) + rDXOffset :
- round(aBounds.second * fScaling) + rDXOffset;
+ round2long(aFirstGlyph.attachedClusterBase()->origin() * fScaling) + rDXOffset :
+ round2long(aBounds.second * fScaling) + rDXOffset;
// force the last char in range to have the width of the cluster
if (bRtl)
{
@@ -474,7 +474,7 @@ GraphiteLayout::Glyphs::append(gr::Segment &segment, ImplLayoutArgs &args, gr::G
}
long glyphId = gi.glyphID();
long deltaOffset = 0;
- int glyphWidth = round(nextOrigin * scaling) - round(gi.origin() * scaling);
+ int glyphWidth = round2long(nextOrigin * scaling) - round2long(gi.origin() * scaling);
#ifdef GRLAYOUT_DEBUG
fprintf(grLog(),"c%d g%d gWidth%d x%f ", firstChar, (int)gi.logicalIndex(), glyphWidth, nextOrigin);
#endif
@@ -513,11 +513,11 @@ GraphiteLayout::Glyphs::append(gr::Segment &segment, ImplLayoutArgs &args, gr::G
nGlyphFlags |= (gi.directionLevel() & 0x1)? GlyphItem::IS_RTL_GLYPH : 0;
GlyphItem aGlyphItem(size(),//gi.logicalIndex(),
glyphId,
- Point(round(gi.origin() * scaling + rDXOffset),
- round((-gi.yOffset() * scaling) - segment.AscentOffset()* scaling)),
+ Point(round2long(gi.origin() * scaling + rDXOffset),
+ round2long((-gi.yOffset() * scaling) - segment.AscentOffset()* scaling)),
nGlyphFlags,
glyphWidth);
- aGlyphItem.mnOrigWidth = round(gi.advanceWidth() * scaling);
+ aGlyphItem.mnOrigWidth = round2long(gi.advanceWidth() * scaling);
push_back(aGlyphItem);
// update the offset if this glyph was dropped