[Libreoffice-commits] .: Branch 'libreoffice-3-4' - vcl/source

[Stephan Bergmann]

 vcl/source/glyphs/graphite_layout.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1bdf3ff2b4499a08c62c43e7698038c07489a9d0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 22 17:25:00 2011 +0100

    WaE: signed/unsigned error
    
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 5238609..4123414 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -329,7 +329,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, ImplLayoutArgs &rArgs, float fSc
             float leftBoundary = gr_slot_origin_X(clusterFirst);
             float rightBoundary = (clusterAfter)?
                 gr_slot_origin_X(clusterAfter) : gr_seg_advance_X(pSegment);
-            size_t bFirstChar = gr_cinfo_base(gr_seg_cinfo(pSegment, nFirstCharInCluster));
+            int bFirstChar = gr_cinfo_base(gr_seg_cinfo(pSegment, nFirstCharInCluster));
             if (mnSegCharOffset + bFirstChar >= mnMinCharPos &&
                 mnSegCharOffset + bFirstChar < mnEndCharPos)
             {
@@ -339,7 +339,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, ImplLayoutArgs &rArgs, float fSc
                 {
                     for (int i = nFirstCharInCluster; i <= nLastCharInCluster; i++)
                     {
-                        size_t ibase = gr_cinfo_base(gr_seg_cinfo(pSegment, i));
+                        int ibase = gr_cinfo_base(gr_seg_cinfo(pSegment, i));
                         if (mnSegCharOffset + ibase >= mnEndCharPos)
                             break;
                         // from the point of view of the dx array, the xpos is