|
 |
f0633d |
From 215499e74fccb1809105d458b6076992be9d049c Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Andrzej Hunt <andrzej.hunt@collabora.com>
|
|
|
f0633d |
Date: Thu, 26 Dec 2013 18:57:28 +0000
|
|
|
f0633d |
Subject: [PATCH 091/109] EMF+: Integer coordinate values are signed.
|
|
|
f0633d |
MIME-Version: 1.0
|
|
|
f0633d |
Content-Type: text/plain; charset=UTF-8
|
|
|
f0633d |
Content-Transfer-Encoding: 8bit
|
|
|
f0633d |
|
|
|
f0633d |
Previously any coordinates with negative values would not be rendered
|
|
|
f0633d |
(as they would incorrectly appear to be outside the visible area).
|
|
|
f0633d |
|
|
|
f0633d |
(cherry picked from commit d8dedc775cedf0e9daf9284bc7e3a0331ccd2963)
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: I5babcec50d48dc2a6288a01685db61fbb7058680
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/7247
|
|
|
f0633d |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f0633d |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f0633d |
---
|
|
|
f0633d |
cppcanvas/source/mtfrenderer/emfplus.cxx | 4 ++--
|
|
|
f0633d |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
|
|
|
f0633d |
index a11dc8b..01a77d6 100644
|
|
|
f0633d |
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
|
|
|
f0633d |
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
|
|
|
f0633d |
@@ -169,8 +169,8 @@ namespace cppcanvas
|
|
|
f0633d |
{
|
|
|
f0633d |
for (int i = 0; i < nPoints; i ++) {
|
|
|
f0633d |
if (pathFlags & 0x4000) {
|
|
|
f0633d |
- // points are stored in short 16bit integer format
|
|
|
f0633d |
- sal_uInt16 x, y;
|
|
|
f0633d |
+ // points are stored in signed short 16bit integer format
|
|
|
f0633d |
+ sal_Int16 x, y;
|
|
|
f0633d |
|
|
|
f0633d |
s >> x >> y;
|
|
|
f0633d |
SAL_INFO ("cppcanvas.emf", "EMF+\tpoint [x,y]: " << x << "," << y);
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|