diff options
Diffstat (limited to 'src/libjin/Graphics/Font/Text.cpp')
| -rw-r--r-- | src/libjin/Graphics/Font/Text.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/libjin/Graphics/Font/Text.cpp b/src/libjin/Graphics/Font/Text.cpp index 68601de..f202267 100644 --- a/src/libjin/Graphics/Font/Text.cpp +++ b/src/libjin/Graphics/Font/Text.cpp @@ -56,7 +56,7 @@ namespace graphics { return get(); } - +/* Text::Iterator Text::Iterator::begin() { Iterator itor(encode, data, length); @@ -70,7 +70,7 @@ namespace graphics itor.toEnd(); return itor; } - +*/ void Text::Iterator::toBegin() { p = (const unsigned char*)data; @@ -117,17 +117,22 @@ namespace graphics Text::Text(Encode encode, const void* data) { - Iterator it = Iterator(encode, data, strlen((const char*)data)); - for (; it != it.end(); ++it) + unsigned length = strlen((const char*)data); + Iterator end = Iterator(encode, data, length); + end.toEnd(); + Iterator it = Iterator(encode, data, length); + for (; it != end; ++it) { content.push_back(*it); } } - Text::Text(Encode _encode, const void* _data, unsigned int _length) + Text::Text(Encode encode, const void* data, unsigned length) { - Iterator it = Iterator(_encode, _data, _length); - for (; it != it.end(); ++it) + Iterator end = Iterator(encode, data, length); + end.toEnd(); + Iterator it = Iterator(encode, data, length); + for (; it != end; ++it) { content.push_back(*it); } |