[aseprite] 70/196: Fix crash in GenericDrawTextSurface::drawChar() when a TTF is used with Unicode text

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 6f0819fa302a9865e6ceefc982ff21dfeba31b3d
Author: David Capello <davidcapello at gmail.com>
Date:   Tue Mar 15 15:10:56 2016 -0300

    Fix crash in GenericDrawTextSurface::drawChar() when a TTF is used with Unicode text
---
 src/she/common/generic_surface.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/she/common/generic_surface.h b/src/she/common/generic_surface.h
index ff2f195..69c5a22 100644
--- a/src/she/common/generic_surface.h
+++ b/src/she/common/generic_surface.h
@@ -112,9 +112,10 @@ public:
       }
 
       case FontType::kTrueType: {
-        std::string str;
+        // TODO avoid a temporary string
+        std::wstring str;
         str.push_back(chr);
-        drawString(font, fg, bg, x, y, str);
+        drawString(font, fg, bg, x, y, base::to_utf8(str).c_str());
         break;
       }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git