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

Remove inline sorting algorithms from core headers

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-28 16:12:13 +04:00
parent 20534c9beb
commit cc6bdfb045
19 changed files with 139 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/haartraining/cvhaartraining.cpp
View File

@@ -1088,7 +1088,7 @@ CvIntHaarClassifier* icvCreateCARTStageClassifier( CvHaarTrainingData* data,
numpos++;
}
}
icvSort_32f( eval.data.fl, numpos, 0 );
std::sort(eval.data.fl, eval.data.fl + numpos);
threshold = eval.data.fl[(int) ((1.0F - minhitrate) * numpos)];
numneg = 0;
@@ -2291,7 +2291,7 @@ static CvMat* icvGetUsedValues( CvHaarTrainingData* training_data,
feature_idx->data.i[total++] = cart->compidx[j];
}
}
icvSort_32s( feature_idx->data.i, total, 0 );
std::sort(feature_idx->data.i, feature_idx->data.i + total);
last = 0;
for( i = 1; i < total; i++ )