Dekel language/encoding patch + a few fixes

[lyx.git] / src / Painter.C

diff --git a/src/Painter.C b/src/Painter.C
index d3216b9ef93c27515be46b26e61ed2cb63aa1079..8b0e3e679c7cc7002247c4d923da8f5e466665df 100644 (file)
--- a/src/Painter.C
+++ b/src/Painter.C
@@ -269,7 +269,7 @@ PainterBase & Painter::text(int x, int y, char c, LyXFont const & f)
 }
 
 
-PainterBase & Painter::text(int x, int y, char const * s, int ls,
+PainterBase & Painter::text(int x, int y, char const * s, size_t ls,
                        LyXFont const & f)
 {
        if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
@@ -283,9 +283,9 @@ PainterBase & Painter::text(int x, int y, char const * s, int ls,
                        font2.setShape(LyXFont::UP_SHAPE);
                        font = &font2;
 #endif
-                       encoding = &symbol_encoding;
+                       encoding = encodings.symbol_encoding();
                }
-               for (int i = 0; i < ls; ++i) {
+               for (size_t i = 0; i < ls; ++i) {
                        Uchar c = encoding->ucs(s[i]);
                        xs[i].byte1 = c >> 8;
                        xs[i].byte2 = c & 0xff;
@@ -310,7 +310,7 @@ PainterBase & Painter::text(int x, int y, char const * s, int ls,
                smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
                char c;
                int tmpx = x;
-               for(int i = 0; i < ls; ++i) {
+               for(size_t i = 0; i < ls; ++i) {
                        c = s[i];
                        if (islower(static_cast<unsigned char>(c))) {
                                c = toupper(c);