Skip to content

O
opencv
Commit 48a6edbd authored by Roman Donchenko's avatar Roman Donchenko
Browse files
Options

Fixed compilation errors.

parent 8bed7bb5
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
modules/contrib/src/inputoutput.cpp
View file @ 48a6edbd
...@@ -56,9 +56,9 @@ namespace cv ...@@ -56,9 +56,9 @@ namespace cv
fname = FindFileData.cFileName; fname = FindFileData.cFileName;
#endif #endif
if (addPath) if (addPath)
list.push_back(path + "/" + std::string(fname)); list.push_back(path + "/" + String(fname));
else else
list.push_back(std::string(fname)); list.push_back(String(fname));
} }
} }
#ifdef HAVE_WINRT #ifdef HAVE_WINRT
...@@ -145,9 +145,9 @@ namespace cv ...@@ -145,9 +145,9 @@ namespace cv
#endif #endif
if (addPath) if (addPath)
list.push_back(path + "/" + std::string(fname)); list.push_back(path + "/" + String(fname));
else else
list.push_back(std::string(fname)); list.push_back(String(fname));
} }
} }
#ifdef HAVE_WINRT #ifdef HAVE_WINRT
......
modules/java/generator/src/cpp/Mat.cpp
View file @ 48a6edbd
#define LOG_TAG "org.opencv.core.Mat" #define LOG_TAG "org.opencv.core.Mat"
#include <stdexcept> #include <stdexcept>
#include <string>
#include "common.h" #include "common.h"
#include "opencv2/core.hpp" #include "opencv2/core.hpp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment