Fixed compilation errors.

11 years ago · 48a6edbdfe
parent 8bed7bb5f9
commit 48a6edbdfe
2 changed files with 5 additions and 4 deletions
--- a/modules/contrib/src/inputoutput.cpp
+++ b/modules/contrib/src/inputoutput.cpp
@ -56,9 +56,9 @@ namespace cv
                        fname = FindFileData.cFileName;
                    #endif
                        if (addPath)
-                            list.push_back(path + "/" + std::string(fname));
+                            list.push_back(path + "/" + String(fname));
                        else
-                            list.push_back(std::string(fname));
+                            list.push_back(String(fname));
                    }
                }
            #ifdef HAVE_WINRT
@ -145,9 +145,9 @@ namespace cv
                    #endif

                        if (addPath)
-                            list.push_back(path + "/" + std::string(fname));
+                            list.push_back(path + "/" + String(fname));
                        else
-                            list.push_back(std::string(fname));
+                            list.push_back(String(fname));
                    }
                }
            #ifdef HAVE_WINRT
--- a/modules/java/generator/src/cpp/Mat.cpp
+++ b/modules/java/generator/src/cpp/Mat.cpp
@ -1,6 +1,7 @@
 #define LOG_TAG "org.opencv.core.Mat"

 #include <stdexcept>
+#include <string>

 #include "common.h"
 #include "opencv2/core.hpp"