From 48a6edbdfe48fb5fcf0431aaa0c1dbed34d71993 Mon Sep 17 00:00:00 2001
From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue, 6 Aug 2013 17:06:13 +0400
Subject: [PATCH] Fixed compilation errors.

---
 modules/contrib/src/inputoutput.cpp    | 8 ++++----
 modules/java/generator/src/cpp/Mat.cpp | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/contrib/src/inputoutput.cpp b/modules/contrib/src/inputoutput.cpp
index 9edf6a056f..d0e947b33f 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 bc5b87f4ee..b3b0f66e72 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"
-- 
GitLab