summaryrefslogtreecommitdiff
path: root/vcl/source/glyphs
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-03-11 10:19:43 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-03-11 10:19:43 +0000
commit67f4ae5d67ac379cfcd061f8e41b949202bac4dd (patch)
treeff3e0f12e6ee958e902a72a34ca16bfb92b37f34 /vcl/source/glyphs
parent0550c3df0574ad2715f5470ee0e9c4f798e0ca8b (diff)
WaE: signed unsigned comparisions
Diffstat (limited to 'vcl/source/glyphs')
-rw-r--r--vcl/source/glyphs/graphite_layout.cxx12
1 files changed, 10 insertions, 2 deletions
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 5674ff436c14..989f2e8b25e2 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;
}