Merge pull request #682 from vpisarev/python_str_fix

repaired std::string handling

modules/python/src2/cv2.cpp

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

modules/python/src2/gen2.py

@@ -214,8 +214,7 @@ simple_argtype_mapping = {
     "int": ("int", "i", "0"),
     "float": ("float", "f", "0.f"),
     "double": ("double", "d", "0"),
-    "c_string": ("char*", "s", '(char*)""'),
-    "string": ("std::string", "s", None)
+    "c_string": ("char*", "s", '(char*)""')
 }
 
 def normalize_class_name(name):
@@ -571,7 +570,7 @@ class FuncInfo(object):
             else:
                 code_fcall = "ERRWRAP2( "
                 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 = "
                 if ismethod:
                     code_fcall += "_self_->" + self.cname