diff --git a/modules/contrib/src/inputoutput.cpp b/modules/contrib/src/inputoutput.cpp index 9edf6a056f5ed9cc308458a7646f0dd5244341db..d0e947b33fe0cc66c8b379ea0992366e234db616 100644 --- 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 diff --git a/modules/java/generator/src/cpp/Mat.cpp b/modules/java/generator/src/cpp/Mat.cpp index bc5b87f4ee77e6b3a1b3ff501ecf4134d7d8ea8b..b3b0f66e72c405d073b214ab3f7db8ba13c0d25f 100644 --- 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 +#include #include "common.h" #include "opencv2/core.hpp"