Browse Source

use std::vector instead of cv::Vector

git-svn-id: https://emgucv.svn.sourceforge.net/svnroot/emgucv/trunk@683 d7f09016-e345-0410-b530-edf29a71df78
UWP10
canming 16 years ago
parent
commit
21ab8d0164
  1. 10
      Emgu.CV.Extern/HOGDescriptor.cpp
  2. 4
      Emgu.CV.Extern/octree.cpp

10
Emgu.CV.Extern/HOGDescriptor.cpp

@ -3,8 +3,8 @@
CVAPI(void) CvHOGDescriptorPeopleDetectorCreate(CvSeq* seq)
{
cv::Vector<float> v = cv::HOGDescriptor::getDefaultPeopleDetector();
cvSeqPushMulti(seq, v.begin(), v.size());
std::vector<float> v = cv::HOGDescriptor::getDefaultPeopleDetector();
cvSeqPushMulti(seq, &v.front(), v.size());
}
CVAPI(cv::HOGDescriptor*) CvHOGDescriptorCreateDefault() { return new cv::HOGDescriptor; }
@ -59,8 +59,8 @@ CVAPI(void) cvHOGDescriptorDetect(
{
cvClearSeq(foundLocations);
cv::Vector<cv::Rect> rects;
std::vector<cv::Point> hits;
cv::Mat mat = cv::cvarrToMat(img);
descriptor->detect(mat, rects, hitThreshold, winStride, padding);
cvSeqPushMulti(foundLocations, rects.begin(), rects.size());
descriptor->detect(mat, hits, hitThreshold, winStride, padding);
cvSeqPushMulti(foundLocations, &hits.front(), hits.size());
}*/

4
Emgu.CV.Extern/octree.cpp

@ -9,10 +9,10 @@ CVAPI(void) CvOctreeBuildTree(cv::Octree* tree, cv::Point3f* points, int numberO
}
CVAPI(void) CvOctreeGetPointsWithinSphere(cv::Octree* tree, cv::Point3f* center, float radius, CvSeq* pointSeq )
{
cv::vector<cv::Point3f> points;
std::vector<cv::Point3f> points;
tree->getPointsWithinSphere(*center, radius, points);
cvClearSeq(pointSeq);
if (points.size() > 0)
cvSeqPushMulti(pointSeq, &points[0], points.size());
cvSeqPushMulti(pointSeq, &points.front(), points.size());
}
CVAPI(void) CvOctreeRelease(cv::Octree* tree) { delete tree; }
Loading…
Cancel
Save