Attachment 170415 Details for Bug 209588 – Rename custom round() and use a define to minimize changes

[patch] Rename custom round() and use a define to minimize changes

editors__openoffice-fix-round-1.diff (text/plain), 2.47 KB, created by Dimitry Andric on 2016-05-17 19:29:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2016-05-17 19:29:34 UTC

Size: 2.47 KB

patch

obsolete

>Index: editors/openoffice-4/files/patch-vcl_source_glyphs_graphite__layout.cxx
>===================================================================
>--- editors/openoffice-4/files/patch-vcl_source_glyphs_graphite__layout.cxx	(nonexistent)
>+++ editors/openoffice-4/files/patch-vcl_source_glyphs_graphite__layout.cxx	(working copy)
>@@ -0,0 +1,14 @@
>+--- vcl/source/glyphs/graphite_layout.cxx.orig	2014-02-25 08:33:06 UTC
>++++ vcl/source/glyphs/graphite_layout.cxx
>+@@ -107,9 +107,10 @@ 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 round_(const float n) {
>+         return long(n + (n < 0 ? -0.5 : 0.5));
>+     }
>++#define round round_
>+ 
>+ 
>+     template<typename T>
>
>Property changes on: editors/openoffice-4/files/patch-vcl_source_glyphs_graphite__layout.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx
>===================================================================
>--- editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx	(nonexistent)
>+++ editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx	(working copy)
>@@ -0,0 +1,14 @@
>+--- vcl/source/glyphs/graphite_layout.cxx.orig	2014-02-25 08:33:06 UTC
>++++ vcl/source/glyphs/graphite_layout.cxx
>+@@ -107,9 +107,10 @@ 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 round_(const float n) {
>+         return long(n + (n < 0 ? -0.5 : 0.5));
>+     }
>++#define round round_
>+ 
>+ 
>+     template<typename T>
>
>Property changes on: editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 209588: 170415