Skip to content

Commit d667864

Browse files
committed
a few more trailing white spaces
1 parent 5461494 commit d667864

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

modules/ximgproc/include/opencv2/ximgproc/estimated_covariance.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ window forumlation.
6565
@param src The source image. Input image must be of a complex type.
6666
@param windowRows The number of rows in the window.
6767
@param windowCols The number of cols in the window.
68-
The window size parameters control the accuracy of the estimation.
69-
The sliding window moves over the entire image from the top-left corner
68+
The window size parameters control the accuracy of the estimation.
69+
The sliding window moves over the entire image from the top-left corner
7070
to the bottom right corner. Each location of the window represents a sample.
7171
If the window is the size of the image, then this gives the exact covariance matrix.
72-
For all other cases, the sizes of the window will impact the number of samples
73-
and the number of elements in the estimated covariance matrix.
72+
For all other cases, the sizes of the window will impact the number of samples
73+
and the number of elements in the estimated covariance matrix.
7474
*/
7575

7676
CV_EXPORTS_W void covarianceEstimation(InputArray src, OutputArray dst, int windowRows, int windowCols);

modules/ximgproc/src/estimated_covariance.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,15 @@ void EstimateCovariance::iterateCombinations(Mat inputData,Mat outputData)
185185

186186
#ifdef HAVE_OPENMP
187187
#pragma omp parallel
188-
#endif
188+
#endif
189189
{
190190
int idx;
191191
int combs;
192192
#ifdef HAVE_OPENMP
193193
int thread_id= omp_get_thread_num();
194194
#else
195195
int thread_id=0;
196-
#endif
196+
#endif
197197
int startComb;
198198
if (remainder > thread_id){
199199
combs=combsPerCPU;
@@ -216,7 +216,7 @@ void EstimateCovariance::iterateCombinations(Mat inputData,Mat outputData)
216216
computeOneCombination(startComb++, inputData, outputData,
217217
outputVector,finalMatPosR, finalMatPosC);
218218
}
219-
delete[] finalMatPosR;
219+
delete[] finalMatPosR;
220220
delete[] finalMatPosC;
221221
}
222222
}
@@ -258,7 +258,7 @@ void EstimateCovariance::computeOneCombination(int comb_id,Mat inputData, Mat ou
258258
}
259259
}
260260
outputVector.at<std::complex<float> >(0,0) = temp_res;
261-
261+
262262
// Checking if the first element belongs to the first set of combinatons.
263263
// The combination that the first element is above the second.
264264
if (!type2) {
@@ -341,7 +341,7 @@ void EstimateCovariance::computeOneCombination(int comb_id,Mat inputData, Mat ou
341341
std::complex<float> w = std::complex<float>(0,0),x = std::complex<float>(0,0),
342342
y = std::complex<float>(0,0),z = std::complex<float>(0,0),deltaRowSum = std::complex<float>(0,0);
343343
std::complex<float> tempRes = std::complex<float>(0,0);
344-
// Index arithmetic
344+
// Index arithmetic
345345
int rM1 = r-1;
346346
int drPr = DR+r;
347347
int rM1PdeltaR = rM1 + deltaR;
@@ -391,8 +391,8 @@ void covarianceEstimation(InputArray input_, OutputArray output_,int windowRows,
391391

392392
Mat temp=input_.getMat();
393393
if(temp.channels() == 1){
394-
temp.convertTo(temp,CV_32FC2);
395-
Mat zmat = Mat::zeros(temp.size(), CV_32F);
394+
temp.convertTo(temp,CV_32FC2);
395+
Mat zmat = Mat::zeros(temp.size(), CV_32F);
396396
Mat twoChannelsbefore[] = {temp,zmat};
397397
cv::merge(twoChannelsbefore,2,input);
398398
}else{
@@ -412,4 +412,4 @@ void covarianceEstimation(InputArray input_, OutputArray output_,int windowRows,
412412
}
413413

414414
} // namespace ximgproc
415-
} // namespace cv
415+
} // namespace cv

0 commit comments

Comments
 (0)