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

Remove all include directives for <string>

Browse Source
This commit is contained in:
Andrey Kamaev 2013-03-22 19:31:36 +04:00
parent 29b544d83c
commit 75513a46dc
21 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/androidcamera/src/camera_activity.cpp
View File

@ -4,7 +4,6 @@
#include <dirent.h>
#include <android/log.h>
#include <cctype>
#include <string>
#include <vector>
#include <algorithm>
#include <opencv2/core/version.hpp>

10
modules/core/doc/basic_structures.rst
View File

@ -2457,13 +2457,13 @@ Algorithm::name
---------------
Returns the algorithm name
.. ocv:function:: string Algorithm::name() const
.. ocv:function:: String Algorithm::name() const
Algorithm::get
--------------
Returns the algorithm parameter
.. ocv:function:: template<typename _Tp> typename ParamType<_Tp>::member_type Algorithm::get(const string& name) const
.. ocv:function:: template<typename _Tp> typename ParamType<_Tp>::member_type Algorithm::get(const String& name) const
:param name: The parameter name.
@ -2472,7 +2472,7 @@ The method returns value of the particular parameter. Since the compiler can not
* myalgo.get<int>("param_name")
* myalgo.get<double>("param_name")
* myalgo.get<bool>("param_name")
* myalgo.get<string>("param_name")
* myalgo.get<String>("param_name")
* myalgo.get<Mat>("param_name")
* myalgo.get<vector<Mat> >("param_name")
* myalgo.get<Algorithm>("param_name") (it returns Ptr<Algorithm>).
@ -2529,13 +2529,13 @@ Algorithm::getList
------------------
Returns the list of registered algorithms
.. ocv:function:: void Algorithm::getList(vector<string>& algorithms)
.. ocv:function:: void Algorithm::getList(vector<String>& algorithms)
:param algorithms: The output vector of algorithm names.
This static method returns the list of registered algorithms in alphabetical order. Here is how to use it ::
vector<string> algorithms;
vector<String> algorithms;
Algorithm::getList(algorithms);
cout << "Algorithms: " << algorithms.size() << endl;
for (size_t i=0; i < algorithms.size(); i++)

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

@ -63,8 +63,8 @@ The sample below demonstrates how to use CommandLineParser:
use_time_stamp = parser.has("timestamp");
cv::String img1 = parser.get<string>(0);
cv::String img2 = parser.get<string>(1);
cv::String img1 = parser.get<cv::String>(0);
cv::String img2 = parser.get<cv::String>(1);
int repeat = parser.get<int>(2);

1
modules/core/include/opencv2/core.hpp
View File

@ -62,7 +62,6 @@
#include <complex>
#include <map>
#include <new>
#include <string>
#include <vector>
#include <sstream>
#endif // SKIP_INCLUDES

1
modules/core/src/gl_core_3_1.cpp
View File

@ -1,4 +1,3 @@
#include <string>
#include <sstream>
#include "cvconfig.h"
#include "opencv2/core.hpp"

1
modules/flann/include/opencv2/flann/flann_base.hpp
View File

@ -32,7 +32,6 @@
#define OPENCV_FLANN_BASE_HPP_
#include <vector>
#include <string>
#include <cassert>
#include <cstdio>

1
modules/flann/include/opencv2/flann/hierarchical_clustering_index.h
View File

@ -32,7 +32,6 @@
#define OPENCV_FLANN_HIERARCHICAL_CLUSTERING_INDEX_H_
#include <algorithm>
#include <string>
#include <map>
#include <cassert>
#include <limits>

1
modules/flann/include/opencv2/flann/kmeans_index.h
View File

@ -32,7 +32,6 @@
#define OPENCV_FLANN_KMEANS_INDEX_H_
#include <algorithm>
#include <string>
#include <map>
#include <cassert>
#include <limits>

2
modules/flann/include/opencv2/flann/nn_index.h
View File

@ -31,8 +31,6 @@
#ifndef OPENCV_FLANN_NNINDEX_H
#define OPENCV_FLANN_NNINDEX_H
#include <string>
#include "general.h"
#include "matrix.h"
#include "result_set.h"

1
modules/gpu/src/nvidia/NCVHaarObjectDetection.hpp
View File

@ -58,7 +58,6 @@
#ifndef _ncvhaarobjectdetection_hpp_
#define _ncvhaarobjectdetection_hpp_
#include <string>
#include "NCV.hpp"

1
modules/gpu/src/nvidia/core/NCV.cu
View File

@ -41,7 +41,6 @@
#include <iostream>
#include <string>
#include <vector>
#include "NCV.hpp"

1
modules/gpu/src/precomp.hpp
View File

@ -64,7 +64,6 @@
#include <deque>
#include <stdexcept>
#include <memory>
#include <string>
#include "opencv2/gpu.hpp"
#include "opencv2/imgproc.hpp"

1
modules/highgui/src/cap_pvapi.cpp
View File

@ -63,7 +63,6 @@
# include <unistd.h>
#endif
#include <string>
//#include <arpa/inet.h>
#define MAX_CAMERAS 10

1
modules/ml/include/opencv2/ml.hpp
View File

@ -47,7 +47,6 @@
#ifdef __cplusplus
#include <map>
#include <string>
#include <iostream>
// Apple defines a check() macro somewhere in the debug headers

6
modules/objdetect/doc/latent_svm.rst
View File

@ -204,7 +204,7 @@ Two types of constructors.
.. ocv:function:: LatentSvmDetector::LatentSvmDetector()
.. ocv:function:: LatentSvmDetector::LatentSvmDetector(const vector<string>& filenames, const vector<string>& classNames=vector<string>())
.. ocv:function:: LatentSvmDetector::LatentSvmDetector(const vector<String>& filenames, const vector<String>& classNames=vector<String>())
@ -228,7 +228,7 @@ LatentSvmDetector::load
-----------------------
Load the trained models from given ``.xml`` files and return ``true`` if at least one model was loaded.
.. ocv:function:: bool LatentSvmDetector::load( const vector<string>& filenames, const vector<string>& classNames=vector<string>() )
.. ocv:function:: bool LatentSvmDetector::load( const vector<String>& filenames, const vector<String>& classNames=vector<String>() )
:param filenames: A set of filenames storing the trained detectors (models). Each file contains one model. See examples of such files here /opencv_extra/testdata/cv/latentsvmdetector/models_VOC2007/.
@ -250,7 +250,7 @@ LatentSvmDetector::getClassNames
--------------------------------
Return the class (model) names that were passed in constructor or method ``load`` or extracted from models filenames in those methods.
.. ocv:function:: const vector<string>& LatentSvmDetector::getClassNames() const
.. ocv:function:: const vector<String>& LatentSvmDetector::getClassNames() const
LatentSvmDetector::getClassCount
--------------------------------

2
modules/objdetect/src/cascadedetect.cpp
View File

@ -44,8 +44,6 @@
#include "cascadedetect.hpp"
#include <string>
#if defined (LOG_CASCADE_STATISTIC)
struct Logger
{

1
modules/ocl/src/haar.cpp
View File

@ -49,7 +49,6 @@
#include "precomp.hpp"
#include <stdio.h>
#include <string>
using namespace cv;
using namespace cv::ocl;

1
modules/softcascade/src/octave.cpp
View File

@ -42,7 +42,6 @@
#include "precomp.hpp"
#include <queue>
#include <string>
using cv::InputArray;
using cv::OutputArray;

4
modules/superres/src/frame_source.cpp
View File

@ -83,7 +83,7 @@ Ptr<FrameSource> cv::superres::createFrameSource_Empty()
#ifndef HAVE_OPENCV_HIGHGUI
Ptr<FrameSource> cv::superres::createFrameSource_Video(const string& fileName)
Ptr<FrameSource> cv::superres::createFrameSource_Video(const String& fileName)
{
(void) fileName;
CV_Error(CV_StsNotImplemented, "The called functionality is disabled for current build or platform");
@ -190,7 +190,7 @@ Ptr<FrameSource> cv::superres::createFrameSource_Camera(int deviceId)
#ifndef HAVE_OPENCV_GPU
Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const string& fileName)
Ptr<FrameSource> cv::superres::createFrameSource_Video_GPU(const String& fileName)
{
(void) fileName;
CV_Error(CV_StsNotImplemented, "The called functionality is disabled for current build or platform");

1
modules/videostab/include/opencv2/videostab/frame_source.hpp
View File

@ -44,7 +44,6 @@
#define __OPENCV_VIDEOSTAB_FRAME_SOURCE_HPP__
#include <vector>
#include <string>
#include "opencv2/core.hpp"
namespace cv

1
modules/videostab/include/opencv2/videostab/global_motion.hpp
View File

@ -44,7 +44,6 @@
#define __OPENCV_VIDEOSTAB_GLOBAL_MOTION_HPP__
#include <vector>
#include <string>
#include <fstream>
#include "opencv2/core.hpp"
#include "opencv2/features2d.hpp"