generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #682 from vpisarev/python_str_fix

Browse Source 
repaired std::string handling
This commit is contained in:
Andrey Kamaev 2013-03-21 08:57:39 -07:00
commit bbae05413d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/python/src2/cv2.cpp
View File

@ -100,6 +100,8 @@ catch (const cv::Exception &e) \
using namespace cv; using namespace cv;
typedef cv::softcascade::ChannelFeatureBuilder softcascade_ChannelFeatureBuilder; typedef cv::softcascade::ChannelFeatureBuilder softcascade_ChannelFeatureBuilder;
typedef std::string string;
typedef std::vector<uchar> vector_uchar; typedef std::vector<uchar> vector_uchar;
typedef std::vector<int> vector_int; typedef std::vector<int> vector_int;
typedef std::vector<float> vector_float; typedef std::vector<float> vector_float;

5
modules/python/src2/gen2.py
View File

@ -214,8 +214,7 @@ simple_argtype_mapping = {
"int": ("int", "i", "0"), "int": ("int", "i", "0"),
"float": ("float", "f", "0.f"), "float": ("float", "f", "0.f"),
"double": ("double", "d", "0"), "double": ("double", "d", "0"),
"c_string": ("char*", "s", '(char*)""'), "c_string": ("char*", "s", '(char*)""')
"string": ("std::string", "s", None)
} }
def normalize_class_name(name): def normalize_class_name(name):
@ -571,7 +570,7 @@ class FuncInfo(object):
else: else:
code_fcall = "ERRWRAP2( " code_fcall = "ERRWRAP2( "
if v.rettype: if v.rettype:
code_decl += " " + simple_argtype_mapping.get(v.rettype, (v.rettype, None, None))[0] + " retval;\n" code_decl += " " + v.rettype + " retval;\n"
code_fcall += "retval = " code_fcall += "retval = "
if ismethod: if ismethod:
code_fcall += "_self_->" + self.cname code_fcall += "_self_->" + self.cname