From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue, 6 Aug 2013 13:06:13 +0000 (+0400)
Subject: Fixed compilation errors.
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~3816^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48a6edbdfe48fb5fcf0431aaa0c1dbed34d71993;p=platform%2Fupstream%2Fopencv.git

Fixed compilation errors.
---

diff --git a/modules/contrib/src/inputoutput.cpp b/modules/contrib/src/inputoutput.cpp
index 9edf6a0..d0e947b 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 bc5b87f..b3b0f66 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 <stdexcept>
+#include <string>
 
 #include "common.h"
 #include "opencv2/core.hpp"