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

Fixed compilation errors.

Browse Source
This commit is contained in:
Roman Donchenko 2013-08-06 17:06:13 +04:00
parent 8bed7bb5f9
commit 48a6edbdfe
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/contrib/src/inputoutput.cpp
View File

@ -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
#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

1
modules/java/generator/src/cpp/Mat.cpp
View File

@ -1,6 +1,7 @@
#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"