From 7e0cd02132cf1c7dc7634cda4efb20e1c3493fcd Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 10 Sep 2015 19:10:57 +0000
Subject: [PATCH] use UTF8 encoding
---
contrib/mobile/iOS/Onelab/ModelViewController.mm | 2 +-
contrib/mobile/iOS/Onelab/Onelab-Info.plist | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/mobile/iOS/Onelab/ModelViewController.mm b/contrib/mobile/iOS/Onelab/ModelViewController.mm
index 226599c412..c8159c026f 100644
--- a/contrib/mobile/iOS/Onelab/ModelViewController.mm
+++ b/contrib/mobile/iOS/Onelab/ModelViewController.mm
@@ -381,7 +381,7 @@ void getBitmap(void *self, const char *text, int textsize, unsigned char **map,
{
UILabel *lbl = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 1024, 7*textsize/6)];
lbl.font = [UIFont systemFontOfSize:textsize];
- [lbl setText:[NSString stringWithCString:text encoding:[NSString defaultCStringEncoding]]];
+ [lbl setText:[NSString stringWithCString:text encoding:NSUTF8StringEncoding]];
[lbl setBackgroundColor:[UIColor clearColor]];
CGSize lblSize = [[lbl text] sizeWithAttributes:@{NSFontAttributeName:[lbl font]}];
*realWidth = lblSize.width;
diff --git a/contrib/mobile/iOS/Onelab/Onelab-Info.plist b/contrib/mobile/iOS/Onelab/Onelab-Info.plist
index b2a21cda4d..e4fa2ea688 100644
--- a/contrib/mobile/iOS/Onelab/Onelab-Info.plist
+++ b/contrib/mobile/iOS/Onelab/Onelab-Info.plist
@@ -35,11 +35,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.0.12</string>
+ <string>1.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.0.12</string>
+ <string>1.1.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIFileSharingEnabled</key>
--
GitLab