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

attempts to fix build errors on Android

Browse Source
This commit is contained in:
Vadim Pisarevsky
2013-09-30 14:53:48 +04:00
parent f6fc39ce8f
commit cd84742556
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/shape/src/sc_dis.cpp
View File

@@ -166,7 +166,7 @@ public:
sigma = (float)fn["sigma"]; sigma = (float)fn["sigma"];
} }
private: protected:
int nAngularBins; int nAngularBins;
int nRadialBins; int nRadialBins;
float innerRadius; float innerRadius;
@@ -182,8 +182,6 @@ private:
float imageAppearanceWeight; float imageAppearanceWeight;
float shapeContextWeight; float shapeContextWeight;
float sigma; float sigma;
protected:
String name_; String name_;
}; };
@@ -226,7 +224,9 @@ float ShapeContextDistanceExtractorImpl::computeDistance(InputArray contour1, In
Ptr<ThinPlateSplineShapeTransformer> transDown = transformer.dynamicCast<ThinPlateSplineShapeTransformer>(); Ptr<ThinPlateSplineShapeTransformer> transDown = transformer.dynamicCast<ThinPlateSplineShapeTransformer>();
Mat warpedImage; Mat warpedImage;
for (int ii=0; ii<iterations; ii++) int ii, jj, pt;
for (ii=0; ii<iterations; ii++)
{ {
// Extract SCD descriptor in the set1 // // Extract SCD descriptor in the set1 //
set1SCE.extractSCD(set1, set1SCD, inliers1); set1SCE.extractSCD(set1, set1SCD, inliers1);
@@ -282,11 +282,11 @@ float ShapeContextDistanceExtractorImpl::computeDistance(InputArray contour1, In
multiply(temp, temp, diffIm); multiply(temp, temp, diffIm);
} }
gaussWindow = Mat::zeros(warpedImage.rows, warpedImage.cols, CV_32F); gaussWindow = Mat::zeros(warpedImage.rows, warpedImage.cols, CV_32F);
for (int pt=0; pt<sset1.cols; pt++) for (pt=0; pt<sset1.cols; pt++)
{ {
for (int ii=0; ii<diffIm.rows; ii++) for (ii=0; ii<diffIm.rows; ii++)
{ {
for (int jj=0; jj<diffIm.cols; jj++) for (jj=0; jj<diffIm.cols; jj++)
{ {
float xx = sset1.at<Point2f>(0,pt).x; float xx = sset1.at<Point2f>(0,pt).x;
float yy = sset1.at<Point2f>(0,pt).y; float yy = sset1.at<Point2f>(0,pt).y;
@@ -297,9 +297,9 @@ float ShapeContextDistanceExtractorImpl::computeDistance(InputArray contour1, In
} }
Mat appIm(diffIm.rows, diffIm.cols, CV_32F); Mat appIm(diffIm.rows, diffIm.cols, CV_32F);
for (int ii=0; ii<diffIm.rows; ii++) for (ii=0; ii<diffIm.rows; ii++)
{ {
for (int jj=0; jj<diffIm.cols; jj++) for (jj=0; jj<diffIm.cols; jj++)
{ {
float elema=float( diffIm.at<uchar>(ii,jj) )/255; float elema=float( diffIm.at<uchar>(ii,jj) )/255;
float elemb=gaussWindow.at<float>(ii,jj); float elemb=gaussWindow.at<float>(ii,jj);
@@ -320,8 +320,6 @@ Ptr <ShapeContextDistanceExtractor> createShapeContextDistanceExtractor(int nAng
outerRadius, iterations, comparer, transformer) ); outerRadius, iterations, comparer, transformer) );
} }
} // cv
//! SCD //! SCD
void SCD::extractSCD(cv::Mat &contour, cv::Mat &descriptors, const std::vector<int> &queryInliers, const float _meanDistance) void SCD::extractSCD(cv::Mat &contour, cv::Mat &descriptors, const std::vector<int> &queryInliers, const float _meanDistance)
{ {
@@ -779,3 +777,6 @@ void SCDMatcher::hungarian(cv::Mat &costMatrix, std::vector<cv::DMatch> &outMatc
inliers2[kc]=0; inliers2[kc]=0;
} }
} }
}

5
modules/shape/src/scd_def.hpp
View File

@@ -44,6 +44,8 @@
#include <math.h> #include <math.h>
#include <vector> #include <vector>
namespace cv
{
/* /*
* ShapeContextDescriptor class * ShapeContextDescriptor class
*/ */
@@ -126,3 +128,6 @@ protected:
std::vector<int> &inliers2, int sizeScd1=0, int sizeScd2=0); std::vector<int> &inliers2, int sizeScd1=0, int sizeScd2=0);
}; };
}