|
 |
86e716e |
From 1bdf3ff2b4499a08c62c43e7698038c07489a9d0 Mon Sep 17 00:00:00 2001
|
|
|
86e716e |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
86e716e |
Date: Thu, 22 Sep 2011 17:25:00 +0100
|
|
|
86e716e |
Subject: [PATCH 4/5] WaE: signed/unsigned error
|
|
|
86e716e |
|
|
|
86e716e |
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
|
|
|
86e716e |
---
|
|
|
86e716e |
vcl/source/glyphs/graphite_layout.cxx | 4 ++--
|
|
|
86e716e |
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
86e716e |
|
|
|
86e716e |
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
|
|
|
86e716e |
index 5238609..4123414 100644
|
|
|
86e716e |
--- a/vcl/source/glyphs/graphite_layout.cxx
|
|
|
86e716e |
+++ b/vcl/source/glyphs/graphite_layout.cxx
|
|
|
86e716e |
@@ -329,7 +329,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, ImplLayoutArgs &rArgs, float fSc
|
|
|
86e716e |
float leftBoundary = gr_slot_origin_X(clusterFirst);
|
|
|
86e716e |
float rightBoundary = (clusterAfter)?
|
|
|
86e716e |
gr_slot_origin_X(clusterAfter) : gr_seg_advance_X(pSegment);
|
|
|
86e716e |
- size_t bFirstChar = gr_cinfo_base(gr_seg_cinfo(pSegment, nFirstCharInCluster));
|
|
|
86e716e |
+ int bFirstChar = gr_cinfo_base(gr_seg_cinfo(pSegment, nFirstCharInCluster));
|
|
|
86e716e |
if (mnSegCharOffset + bFirstChar >= mnMinCharPos &&
|
|
|
86e716e |
mnSegCharOffset + bFirstChar < mnEndCharPos)
|
|
|
86e716e |
{
|
|
|
86e716e |
@@ -339,7 +339,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, ImplLayoutArgs &rArgs, float fSc
|
|
|
86e716e |
{
|
|
|
86e716e |
for (int i = nFirstCharInCluster; i <= nLastCharInCluster; i++)
|
|
|
86e716e |
{
|
|
|
86e716e |
- size_t ibase = gr_cinfo_base(gr_seg_cinfo(pSegment, i));
|
|
|
86e716e |
+ int ibase = gr_cinfo_base(gr_seg_cinfo(pSegment, i));
|
|
|
86e716e |
if (mnSegCharOffset + ibase >= mnEndCharPos)
|
|
|
86e716e |
break;
|
|
|
86e716e |
// from the point of view of the dx array, the xpos is
|
|
|
86e716e |
--
|
|
|
86e716e |
1.7.7.6
|
|
|
86e716e |
|