Skip to content

Commit fee2ed3

Browse files
author
Roman Donchenko
committed
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts: modules/contrib/src/retina.cpp modules/core/include/opencv2/core/mat.hpp modules/core/src/algorithm.cpp modules/core/src/arithm.cpp modules/features2d/src/features2d_init.cpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/gpu/perf/perf_imgproc.cpp modules/imgproc/src/generalized_hough.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/video/src/tvl1flow.cpp modules/video/src/video_init.cpp
2 parents c3bfe3f + 9628abc commit fee2ed3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+342
-326
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
*.autosave
22
*.pyc
33
*.user
4+
*~
45
.*.swp
56
.DS_Store
67
.sw[a-z]

‎apps/haartraining/cvclassifier.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ typedef enum CvBoostType
340340
CV_LKCLASS = 5, /* classification (K class problem) */
341341
CV_LSREG = 6, /* least squares regression */
342342
CV_LADREG = 7, /* least absolute deviation regression */
343-
CV_MREG = 8, /* M-regression (Huber loss) */
343+
CV_MREG = 8 /* M-regression (Huber loss) */
344344
} CvBoostType;
345345

346346
/****************************************************************************************\

‎doc/tutorials/introduction/linux_install/linux_install.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Required Packages
1616
* CMake 2.6 or higher;
1717
* Git;
1818
* GTK+2.x or higher, including headers (libgtk2.0-dev);
19-
* pkgconfig;
19+
* pkg-config;
2020
* Python 2.6 or later and Numpy 1.5 or later with developer packages (python-dev, python-numpy);
2121
* ffmpeg or libav development packages: libavcodec-dev, libavformat-dev, libswscale-dev;
2222
* [optional] libdc1394 2.x;

‎modules/bioinspired/src/retina.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ RetinaImpl::RetinaImpl(const cv::Size inputSz, const bool colorMode, int colorSa
312312
{
313313
_retinaFilter = 0;
314314
_init(inputSz, colorMode, colorSamplingMethod, useRetinaLogSampling, reductionFactor, samplingStrenght);
315-
};
315+
}
316316

317317
RetinaImpl::~RetinaImpl()
318318
{

‎modules/calib3d/test/test_chessboardgenerator.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class ChessBoardGenerator
3434
Mat rvec, tvec;
3535
};
3636

37-
};
37+
}
3838

3939

4040
#endif

‎modules/contrib/src/adaptiveskindetector.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void CvAdaptiveSkinDetector::initData(IplImage *src, int widthDivider, int heigh
5555
imgGrayFrame = cvCreateImage(imageSize, IPL_DEPTH_8U, 1);
5656
imgLastGrayFrame = cvCreateImage(imageSize, IPL_DEPTH_8U, 1);
5757
imgHSVFrame = cvCreateImage(imageSize, IPL_DEPTH_8U, 3);
58-
};
58+
}
5959

6060
CvAdaptiveSkinDetector::CvAdaptiveSkinDetector(int samplingDivider, int morphingMethod)
6161
{
@@ -80,7 +80,7 @@ CvAdaptiveSkinDetector::CvAdaptiveSkinDetector(int samplingDivider, int morphing
8080
imgLastGrayFrame = NULL;
8181
imgSaturationFrame = NULL;
8282
imgHSVFrame = NULL;
83-
};
83+
}
8484

8585
CvAdaptiveSkinDetector::~CvAdaptiveSkinDetector()
8686
{
@@ -93,7 +93,7 @@ CvAdaptiveSkinDetector::~CvAdaptiveSkinDetector()
9393
cvReleaseImage(&imgGrayFrame);
9494
cvReleaseImage(&imgLastGrayFrame);
9595
cvReleaseImage(&imgHSVFrame);
96-
};
96+
}
9797

9898
void CvAdaptiveSkinDetector::process(IplImage *inputBGRImage, IplImage *outputHueMask)
9999
{
@@ -190,7 +190,7 @@ void CvAdaptiveSkinDetector::process(IplImage *inputBGRImage, IplImage *outputHu
190190

191191
if (outputHueMask != NULL)
192192
cvCopy(imgFilteredFrame, outputHueMask);
193-
};
193+
}
194194

195195

196196
//------------------------- Histogram for Adaptive Skin Detector -------------------------//
@@ -202,12 +202,12 @@ CvAdaptiveSkinDetector::Histogram::Histogram()
202202
float *ranges[] = { range };
203203
fHistogram = cvCreateHist(1, histogramSize, CV_HIST_ARRAY, ranges, 1);
204204
cvClearHist(fHistogram);
205-
};
205+
}
206206

207207
CvAdaptiveSkinDetector::Histogram::~Histogram()
208208
{
209209
cvReleaseHist(&fHistogram);
210-
};
210+
}
211211

212212
int CvAdaptiveSkinDetector::Histogram::findCoverageIndex(double surfaceToCover, int defaultValue)
213213
{
@@ -221,7 +221,7 @@ int CvAdaptiveSkinDetector::Histogram::findCoverageIndex(double surfaceToCover,
221221
}
222222
}
223223
return defaultValue;
224-
};
224+
}
225225

226226
void CvAdaptiveSkinDetector::Histogram::findCurveThresholds(int &x1, int &x2, double percent)
227227
{
@@ -244,7 +244,7 @@ void CvAdaptiveSkinDetector::Histogram::findCurveThresholds(int &x1, int &x2, do
244244
x2 = GSD_HUE_UT;
245245
else
246246
x2 += GSD_HUE_LT;
247-
};
247+
}
248248

249249
void CvAdaptiveSkinDetector::Histogram::mergeWith(CvAdaptiveSkinDetector::Histogram *source, double weight)
250250
{
@@ -285,4 +285,4 @@ void CvAdaptiveSkinDetector::Histogram::mergeWith(CvAdaptiveSkinDetector::Histog
285285
}
286286
}
287287
}
288-
};
288+
}

‎modules/contrib/src/ba.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ static void fjac(int /*i*/, int /*j*/, CvMat *point_params, CvMat* cam_params, C
940940
941941
#endif
942942

943-
};
943+
}
944944
static void func(int /*i*/, int /*j*/, CvMat *point_params, CvMat* cam_params, CvMat* estim, void* /*data*/) {
945945
//just do projections
946946
CvMat _Mi;
@@ -979,17 +979,17 @@ static void func(int /*i*/, int /*j*/, CvMat *point_params, CvMat* cam_params, C
979979
cvTranspose( _mp2, estim );
980980
cvReleaseMat( &_mp );
981981
cvReleaseMat( &_mp2 );
982-
};
982+
}
983983

984984
static void fjac_new(int i, int j, Mat& point_params, Mat& cam_params, Mat& A, Mat& B, void* data) {
985985
CvMat _point_params = point_params, _cam_params = cam_params, _Al = A, _Bl = B;
986986
fjac(i,j, &_point_params, &_cam_params, &_Al, &_Bl, data);
987-
};
987+
}
988988

989989
static void func_new(int i, int j, Mat& point_params, Mat& cam_params, Mat& estim, void* data) {
990990
CvMat _point_params = point_params, _cam_params = cam_params, _estim = estim;
991991
func(i,j,&_point_params,&_cam_params,&_estim,data);
992-
};
992+
}
993993

994994
void LevMarqSparse::bundleAdjust( std::vector<Point3d>& points, //positions of points in global coordinate system (input and output)
995995
const std::vector<std::vector<Point2d> >& imagePoints, //projections of 3d points for every camera

‎modules/contrib/src/facerec.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ CV_INIT_ALGORITHM(Eigenfaces, "FaceRecognizer.Eigenfaces",
872872
obj.info()->addParam(obj, "labels", obj._labels, true);
873873
obj.info()->addParam(obj, "eigenvectors", obj._eigenvectors, true);
874874
obj.info()->addParam(obj, "eigenvalues", obj._eigenvalues, true);
875-
obj.info()->addParam(obj, "mean", obj._mean, true));
875+
obj.info()->addParam(obj, "mean", obj._mean, true))
876876

877877
CV_INIT_ALGORITHM(Fisherfaces, "FaceRecognizer.Fisherfaces",
878878
obj.info()->addParam(obj, "ncomponents", obj._num_components);
@@ -881,7 +881,7 @@ CV_INIT_ALGORITHM(Fisherfaces, "FaceRecognizer.Fisherfaces",
881881
obj.info()->addParam(obj, "labels", obj._labels, true);
882882
obj.info()->addParam(obj, "eigenvectors", obj._eigenvectors, true);
883883
obj.info()->addParam(obj, "eigenvalues", obj._eigenvalues, true);
884-
obj.info()->addParam(obj, "mean", obj._mean, true));
884+
obj.info()->addParam(obj, "mean", obj._mean, true))
885885

886886
CV_INIT_ALGORITHM(LBPH, "FaceRecognizer.LBPH",
887887
obj.info()->addParam(obj, "radius", obj._radius);
@@ -890,7 +890,7 @@ CV_INIT_ALGORITHM(LBPH, "FaceRecognizer.LBPH",
890890
obj.info()->addParam(obj, "grid_y", obj._grid_y);
891891
obj.info()->addParam(obj, "threshold", obj._threshold);
892892
obj.info()->addParam(obj, "histograms", obj._histograms, true);
893-
obj.info()->addParam(obj, "labels", obj._labels, true));
893+
obj.info()->addParam(obj, "labels", obj._labels, true))
894894

895895
bool initModule_contrib()
896896
{

0 commit comments

Comments
 (0)