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

Merge pull request #2164 from ilya-lavrenov:excess_commas_semicolons_v2

Browse Source
This commit is contained in:
Roman Donchenko
2014-01-20 14:15:04 +04:00
committed by OpenCV Buildbot
parent 8386ce2b2f 37789f015a
commit 087371c021
68 changed files with 442 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/imgproc/src/color.cpp
View File

@@ -3658,7 +3658,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
int ustepIdx = 0;
int vstepIdx = dstSz.height % 4 == 2 ? 1 : 0;
if(uIdx == 1) { std::swap(u ,v), std::swap(ustepIdx, vstepIdx); };
if(uIdx == 1) { std::swap(u ,v), std::swap(ustepIdx, vstepIdx); }
switch(dcn*10 + bIdx)
{

4
modules/imgproc/src/min_enclosing_triangle.cpp
View File

@@ -287,7 +287,7 @@ static void updateSidesCA(const std::vector<cv::Point2f> &polygon,
cv::Point2f &sideAStartVertex, cv::Point2f &sideAEndVertex,
cv::Point2f &sideCStartVertex, cv::Point2f &sideCEndVertex);
};
}
///////////////////////////////////// Main functions /////////////////////////////////////
@@ -1560,4 +1560,4 @@ static bool lessOrEqual(double number1, double number2) {
return ((number1 < number2) || (almostEqual(number1, number2)));
}
};
}