diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp index 088b5242d2..eeec91794a 100644 --- a/modules/gpu/include/opencv2/gpu/gpu.hpp +++ b/modules/gpu/include/opencv2/gpu/gpu.hpp @@ -435,13 +435,13 @@ CV_EXPORTS void LUT(const GpuMat& src, const Mat& lut, GpuMat& dst, Stream& stre CV_EXPORTS void merge(const GpuMat* src, size_t n, GpuMat& dst, Stream& stream = Stream::Null()); //! makes multi-channel array out of several single-channel arrays -CV_EXPORTS void merge(const vector& src, GpuMat& dst, Stream& stream = Stream::Null()); +CV_EXPORTS void merge(const std::vector& src, GpuMat& dst, Stream& stream = Stream::Null()); //! copies each plane of a multi-channel array to a dedicated array CV_EXPORTS void split(const GpuMat& src, GpuMat* dst, Stream& stream = Stream::Null()); //! copies each plane of a multi-channel array to a dedicated array -CV_EXPORTS void split(const GpuMat& src, vector& dst, Stream& stream = Stream::Null()); +CV_EXPORTS void split(const GpuMat& src, std::vector& dst, Stream& stream = Stream::Null()); //! computes magnitude of complex (x(i).re, x(i).im) vector //! supports only CV_32FC2 type @@ -1268,9 +1268,9 @@ private: struct CV_EXPORTS HOGConfidence { double scale; - vector locations; - vector confidences; - vector part_scores[4]; + std::vector locations; + std::vector confidences; + std::vector part_scores[4]; }; struct CV_EXPORTS HOGDescriptor @@ -1288,27 +1288,27 @@ struct CV_EXPORTS HOGDescriptor size_t getDescriptorSize() const; size_t getBlockHistogramSize() const; - void setSVMDetector(const vector& detector); + void setSVMDetector(const std::vector& detector); - static vector getDefaultPeopleDetector(); - static vector getPeopleDetector48x96(); - static vector getPeopleDetector64x128(); + static std::vector getDefaultPeopleDetector(); + static std::vector getPeopleDetector48x96(); + static std::vector getPeopleDetector64x128(); - void detect(const GpuMat& img, vector& found_locations, + void detect(const GpuMat& img, std::vector& found_locations, double hit_threshold=0, Size win_stride=Size(), Size padding=Size()); - void detectMultiScale(const GpuMat& img, vector& found_locations, + void detectMultiScale(const GpuMat& img, std::vector& found_locations, double hit_threshold=0, Size win_stride=Size(), Size padding=Size(), double scale0=1.05, int group_threshold=2); - void computeConfidence(const GpuMat& img, vector& hits, double hit_threshold, - Size win_stride, Size padding, vector& locations, vector& confidences); + void computeConfidence(const GpuMat& img, std::vector& hits, double hit_threshold, + Size win_stride, Size padding, std::vector& locations, std::vector& confidences); - void computeConfidenceMultiScale(const GpuMat& img, vector& found_locations, + void computeConfidenceMultiScale(const GpuMat& img, std::vector& found_locations, double hit_threshold, Size win_stride, Size padding, - vector &conf_out, int group_threshold); + std::vector &conf_out, int group_threshold); void getDescriptors(const GpuMat& img, Size win_stride, GpuMat& descriptors, @@ -1838,11 +1838,11 @@ public: private: GpuMat uPyr_[2]; - vector prevPyr_; - vector nextPyr_; + std::vector prevPyr_; + std::vector nextPyr_; GpuMat vPyr_[2]; - vector buf_; - vector unused; + std::vector buf_; + std::vector unused; bool isDeviceArch11_; };