summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>2016-11-10 08:30:50 +0100
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>2016-11-10 08:30:50 +0100
commit86abdf992c0c44e13f1044af46d26cddd9b9d8f2 (patch)
tree87677240be37a7ca92e50b0f7019765e5692469b
parenta397a9625183cce953c0b5f3aeca6bccfbb3a5b5 (diff)
downloadscilab-86abdf992c0c44e13f1044af46d26cddd9b9d8f2.zip
scilab-86abdf992c0c44e13f1044af46d26cddd9b9d8f2.tar.gz
utf: graphics 2
Change-Id: I9551ce7ccf29ae5a8b68a285a2464d20372a8f45
-rw-r--r--scilab/modules/graphic_objects/includes/ScilabView.hxx2
-rw-r--r--scilab/modules/graphic_objects/src/cpp/FigureList.cpp2
-rw-r--r--scilab/modules/graphic_objects/src/cpp/ScilabView.cpp2
-rw-r--r--scilab/modules/graphics/sci_gateway/cpp/sci_matplot.cpp4
-rw-r--r--scilab/modules/graphics/src/nographics/nographics_gw.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/scilab/modules/graphic_objects/includes/ScilabView.hxx b/scilab/modules/graphic_objects/includes/ScilabView.hxx
index 7d24c7e..7055bee 100644
--- a/scilab/modules/graphic_objects/includes/ScilabView.hxx
+++ b/scilab/modules/graphic_objects/includes/ScilabView.hxx
@@ -119,7 +119,7 @@ public :
119 static PathItem* getItem(std::string _pstTag, std::list<int>& _ignoredList); 119 static PathItem* getItem(std::string _pstTag, std::list<int>& _ignoredList);
120 static PathItem* getFigureItem(std::string _pstTag); 120 static PathItem* getFigureItem(std::string _pstTag);
121 121
122 static int search_path(char* _pstPath); 122 static int search_path(const char* _pstPath);
123 static std::string get_path(int uid); 123 static std::string get_path(int uid);
124 124
125 static void setUserdata(int _id, int* _data, int _datasize); 125 static void setUserdata(int _id, int* _data, int _datasize);
diff --git a/scilab/modules/graphic_objects/src/cpp/FigureList.cpp b/scilab/modules/graphic_objects/src/cpp/FigureList.cpp
index 9487d4c..3813392 100644
--- a/scilab/modules/graphic_objects/src/cpp/FigureList.cpp
+++ b/scilab/modules/graphic_objects/src/cpp/FigureList.cpp
@@ -58,7 +58,7 @@ void unregisterToController()
58 ScilabView::unregisterToController(); 58 ScilabView::unregisterToController();
59} 59}
60 60
61int search_path(char* _pstPath) 61int search_path(const char* _pstPath)
62{ 62{
63 return ScilabView::search_path(_pstPath); 63 return ScilabView::search_path(_pstPath);
64} 64}
diff --git a/scilab/modules/graphic_objects/src/cpp/ScilabView.cpp b/scilab/modules/graphic_objects/src/cpp/ScilabView.cpp
index cf4a8d8..57a70ec 100644
--- a/scilab/modules/graphic_objects/src/cpp/ScilabView.cpp
+++ b/scilab/modules/graphic_objects/src/cpp/ScilabView.cpp
@@ -552,7 +552,7 @@ PathItem* ScilabView::getFigureItem(std::string _pstTag)
552 return NULL; 552 return NULL;
553} 553}
554 554
555int ScilabView::search_path(char* _pstPath) 555int ScilabView::search_path(const char* _pstPath)
556{ 556{
557 //copy string to protect it against strtok 557 //copy string to protect it against strtok
558 char* pstPath = strdup(_pstPath); 558 char* pstPath = strdup(_pstPath);
diff --git a/scilab/modules/graphics/sci_gateway/cpp/sci_matplot.cpp b/scilab/modules/graphics/sci_gateway/cpp/sci_matplot.cpp
index 8a54a7e..e4015b0 100644
--- a/scilab/modules/graphics/sci_gateway/cpp/sci_matplot.cpp
+++ b/scilab/modules/graphics/sci_gateway/cpp/sci_matplot.cpp
@@ -285,7 +285,7 @@ types::Function::ReturnValue sci_matplot(types::typed_list &in, types::optional_
285 delete[] axesflag; 285 delete[] axesflag;
286 } 286 }
287 287
288 Scierror(999, _("%s: Wrong type for input argument #%ls: string expected.\n"), "Matplot1", o.first.c_str()); 288 Scierror(999, _("%s: Wrong type for input argument #%s: string expected.\n"), "Matplot1", o.first.c_str());
289 return types::Function::Error; 289 return types::Function::Error;
290 } 290 }
291 291
@@ -316,7 +316,7 @@ types::Function::ReturnValue sci_matplot(types::typed_list &in, types::optional_
316 delete[] axesflag; 316 delete[] axesflag;
317 } 317 }
318 318
319 Scierror(999, _("%s: Wrong type for input argument #%ls: A matrix expected.\n"), "Matplot1", o.first.c_str()); 319 Scierror(999, _("%s: Wrong type for input argument #%s: A matrix expected.\n"), "Matplot1", o.first.c_str());
320 return types::Function::Error; 320 return types::Function::Error;
321 } 321 }
322 322
diff --git a/scilab/modules/graphics/src/nographics/nographics_gw.cpp b/scilab/modules/graphics/src/nographics/nographics_gw.cpp
index 3162481..7d118ee 100644
--- a/scilab/modules/graphics/src/nographics/nographics_gw.cpp
+++ b/scilab/modules/graphics/src/nographics/nographics_gw.cpp
@@ -14,7 +14,7 @@
14#include "function.hxx" 14#include "function.hxx"
15#include "context.hxx" 15#include "context.hxx"
16 16
17#define MODULE_NAME L"graphics" 17#define MODULE_NAME "graphics"
18extern "C" 18extern "C"
19{ 19{
20#include "gw_graphics.h" 20#include "gw_graphics.h"