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

fixed sparse histogram update (ticket #526)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-11-10 21:23:04 +00:00
parent e15a2ea95a
commit 79ca6d8995
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/imgproc/src/histogram.cpp
View File

@ -754,17 +754,19 @@ static void calcHist( const Mat* images, int nimages, const int* channels,
const Mat& mask, SparseMat& hist, int dims, const int* histSize, const Mat& mask, SparseMat& hist, int dims, const int* histSize,
const float** ranges, bool uniform, bool accumulate, bool keepInt ) const float** ranges, bool uniform, bool accumulate, bool keepInt )
{ {
SparseMatIterator it;
size_t i, N; size_t i, N;
if( !accumulate ) if( !accumulate )
hist.create(dims, histSize, CV_32F); hist.create(dims, histSize, CV_32F);
else else
{
SparseMatIterator it = hist.begin();
for( i = 0, N = hist.nzcount(); i < N; i++, ++it ) for( i = 0, N = hist.nzcount(); i < N; i++, ++it )
{ {
int* value = (int*)it.ptr; Cv32suf* val = (Cv32suf*)it.ptr;
*value = cvRound(*(const float*)value); val->i = cvRound(val->f);
} }
}
vector<uchar*> ptrs; vector<uchar*> ptrs;
vector<int> deltas; vector<int> deltas;
@ -783,11 +785,14 @@ static void calcHist( const Mat* images, int nimages, const int* channels,
calcSparseHist_<float>(ptrs, deltas, imsize, hist, dims, ranges, _uniranges, uniform ); calcSparseHist_<float>(ptrs, deltas, imsize, hist, dims, ranges, _uniranges, uniform );
if( !keepInt ) if( !keepInt )
{
SparseMatIterator it = hist.begin();
for( i = 0, N = hist.nzcount(); i < N; i++, ++it ) for( i = 0, N = hist.nzcount(); i < N; i++, ++it )
{ {
int* value = (int*)it.ptr; Cv32suf* val = (Cv32suf*)it.ptr;
*(float*)value = (float)*value; val->f = (float)val->i;
} }
}
} }