[Libreoffice-commits] .: vcl/source

[Caolán McNamara]

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

New commits:
commit 09f9d9627e2e9302713b282dafc1134ab7d4640a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 11 10:19:43 2011 +0000

    WaE: signed unsigned comparisions

diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index d27769b..d16da64 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -244,7 +244,11 @@ 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);
-            if (lastChar < iChar && gr_cinfo_after(gr_seg_cinfo(pSegment, iChar)) > gr_slot_index(clusterAfter))
+            if (
+                lastChar < iChar &&
+                 (gr_cinfo_after(gr_seg_cinfo(pSegment, iChar)) >
+                 static_cast<int>(gr_slot_index(clusterAfter)))
+               )
             {
                 reordered = true;
             }
@@ -315,7 +319,11 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, ImplLayoutArgs &rArgs, float fSc
                 nFirstCharInCluster = minimum<int>(firstChar, nFirstCharInCluster);
                 nLastCharInCluster = maximum<int>(lastChar, nLastCharInCluster);
             }
-            if (firstChar > iChar && gr_cinfo_before(gr_seg_cinfo(pSegment, iChar)) > gr_slot_index(clusterFirst))
+            if (
+                firstChar > iChar &&
+                 (gr_cinfo_before(gr_seg_cinfo(pSegment, iChar)) >
+                 static_cast<int>(gr_slot_index(clusterFirst)))
+               )
             {
                 reordered = true;
             }