[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/source
Caolán McNamara
caolanm at redhat.com
Thu May 23 23:35:58 PDT 2013
vcl/source/glyphs/graphite_layout.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 627a9d087163ff98e966c01f625b09fb766c837a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 22 09:26:32 2013 +0100
WaE: signed/unsigned comparison
Change-Id: Iaa439c268eda24d700471560927d8f4c0f2e017b
(cherry picked from commit 6a0a33444255fcdbe16500de24fc5bfd74adca4b)
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 8a99bb4..1190408 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -594,7 +594,7 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
nSegCharLimit - rArgs.mnEndCharPos, bRtl);
}
}
- size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + mnSegCharOffset,
+ int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + mnSegCharOffset,
rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : rArgs.mnLength), NULL);
if (rArgs.mnMinCharPos + numchars > limit) numchars = limit - rArgs.mnMinCharPos; // fdo#52540
if (mpFeatures)
More information about the Libreoffice-commits
mailing list