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

Compile opencv_test_core with cv::String instead of std::string

Browse Source 
All tests passed!
This commit is contained in:
Andrey Kamaev
2013-03-20 17:53:13 +04:00
parent 14bb4cbe1e
commit 762aefd71b
51 changed files with 598 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/core/doc/command_line_parser.rst
View File

@@ -16,7 +16,7 @@ The CommandLineParser class is designed for command line arguments parsing
:param argv:
:param keys:
.. ocv:function:: template<typename T> T CommandLineParser::get<T>(const std::string& name, bool space_delete = true)
.. ocv:function:: template<typename T> T CommandLineParser::get<T>(const cv::String& name, bool space_delete = true)
:param name:
:param space_delete:
@@ -26,7 +26,7 @@ The CommandLineParser class is designed for command line arguments parsing
:param index:
:param space_delete:
.. ocv:function:: bool CommandLineParser::has(const std::string& name)
.. ocv:function:: bool CommandLineParser::has(const cv::String& name)
:param name:
@@ -41,7 +41,7 @@ The CommandLineParser class is designed for command line arguments parsing
.. ocv:function:: void CommandLineParser::printErrors()
.. ocv:function:: std::string CommandLineParser::getPathToApplication()
.. ocv:function:: cv::String CommandLineParser::getPathToApplication()
The sample below demonstrates how to use CommandLineParser:
@@ -59,12 +59,12 @@ The sample below demonstrates how to use CommandLineParser:
int N = parser.get<int>("N");
double fps = parser.get<double>("fps");
std::string path = parser.get<std::string>("path");
cv::String path = parser.get<cv::String>("path");
use_time_stamp = parser.has("timestamp");
std::string img1 = parser.get<string>(0);
std::string img2 = parser.get<string>(1);
cv::String img1 = parser.get<string>(0);
cv::String img2 = parser.get<string>(1);
int repeat = parser.get<int>(2);
@@ -78,7 +78,7 @@ Syntax:
::
const std::string keys =
const cv::String keys =
"{help h usage ? | | print this message }"
"{@image1 | | image1 for compare }"
"{@image2 | | image2 for compare }"

2
modules/core/doc/utility_and_system_functions_and_macros.rst
View File

@@ -284,7 +284,7 @@ getBuildInformation
-------------------
Returns full configuration time cmake output.
.. ocv:function:: const std::string& getBuildInformation()
.. ocv:function:: const cv::String& getBuildInformation()
Returned value is raw cmake output including version control system revision, compiler version, compiler flags, enabled modules and third party libraries, etc. Output format depends on target architecture.

6
modules/core/doc/xml_yaml_persistence.rst
View File

@@ -113,7 +113,7 @@ Here is how to read the file created by the code sample above: ::
// first method: use (type) operator on FileNode.
int frameCount = (int)fs2["frameCount"];
std::string date;
cv::String date;
// second method: use FileNode::operator >>
fs2["calibrationDate"] >> date;
@@ -548,11 +548,11 @@ Returns the node content as double.
:returns: The node content as double.
FileNode::operator std::string
FileNode::operator cv::String
------------------------------
Returns the node content as text string.
.. ocv:function:: FileNode::operator std::string() const
.. ocv:function:: FileNode::operator cv::String() const
:returns: The node content as a text string.