@@ -185,15 +185,15 @@ void EstimateCovariance::iterateCombinations(Mat inputData,Mat outputData)
185
185
186
186
#ifdef HAVE_OPENMP
187
187
#pragma omp parallel
188
- #endif
188
+ #endif
189
189
{
190
190
int idx;
191
191
int combs;
192
192
#ifdef HAVE_OPENMP
193
193
int thread_id= omp_get_thread_num ();
194
194
#else
195
195
int thread_id=0 ;
196
- #endif
196
+ #endif
197
197
int startComb;
198
198
if (remainder > thread_id){
199
199
combs=combsPerCPU;
@@ -216,7 +216,7 @@ void EstimateCovariance::iterateCombinations(Mat inputData,Mat outputData)
216
216
computeOneCombination (startComb++, inputData, outputData,
217
217
outputVector,finalMatPosR, finalMatPosC);
218
218
}
219
- delete[] finalMatPosR;
219
+ delete[] finalMatPosR;
220
220
delete[] finalMatPosC;
221
221
}
222
222
}
@@ -258,7 +258,7 @@ void EstimateCovariance::computeOneCombination(int comb_id,Mat inputData, Mat ou
258
258
}
259
259
}
260
260
outputVector.at <std::complex<float > >(0 ,0 ) = temp_res;
261
-
261
+
262
262
// Checking if the first element belongs to the first set of combinatons.
263
263
// The combination that the first element is above the second.
264
264
if (!type2) {
@@ -341,7 +341,7 @@ void EstimateCovariance::computeOneCombination(int comb_id,Mat inputData, Mat ou
341
341
std::complex<float > w = std::complex<float >(0 ,0 ),x = std::complex<float >(0 ,0 ),
342
342
y = std::complex<float >(0 ,0 ),z = std::complex<float >(0 ,0 ),deltaRowSum = std::complex<float >(0 ,0 );
343
343
std::complex<float > tempRes = std::complex<float >(0 ,0 );
344
- // Index arithmetic
344
+ // Index arithmetic
345
345
int rM1 = r-1 ;
346
346
int drPr = DR+r;
347
347
int rM1PdeltaR = rM1 + deltaR;
@@ -391,8 +391,8 @@ void covarianceEstimation(InputArray input_, OutputArray output_,int windowRows,
391
391
392
392
Mat temp=input_.getMat ();
393
393
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);
396
396
Mat twoChannelsbefore[] = {temp,zmat};
397
397
cv::merge (twoChannelsbefore,2 ,input);
398
398
}else {
@@ -412,4 +412,4 @@ void covarianceEstimation(InputArray input_, OutputArray output_,int windowRows,
412
412
}
413
413
414
414
} // namespace ximgproc
415
- } // namespace cv
415
+ } // namespace cv
0 commit comments