mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 04:00:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cv::calcHist

Browse Source
This commit is contained in:
Ilya Lavrenov 2014-04-09 16:04:21 +04:00
parent 7b366df822
commit 18ef25ec30
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1190,6 +1190,26 @@ void cv::calcHist( const Mat* images, int nimages, const int* channels,
Mat hist = _hist.getMat(), ihist = hist; Mat hist = _hist.getMat(), ihist = hist;
ihist.flags = (ihist.flags & ~CV_MAT_TYPE_MASK)|CV_32S; ihist.flags = (ihist.flags & ~CV_MAT_TYPE_MASK)|CV_32S;
#ifdef HAVE_IPP
if (nimages == 1 && images[0].type() == CV_8UC1 && dims == 1 && channels &&
channels[0] == 0 && mask.empty() && images[0].dims <= 2 &&
!accumulate && uniform)
{
hist.setTo(Scalar::all(0));
AutoBuffer<Ipp32s> levels(histSize[0] + 1);
IppStatus status =
ippiHistogramEven_8u_C1R(
(const Ipp8u *)images[0].data, (int)images[0].step, ippiSize(images[0].size()),
(Ipp32s *)ihist.data, (Ipp32s *)levels, histSize[0] + 1, (Ipp32s)ranges[0][0], (Ipp32s)ranges[0][1]);
if (status >= 0)
{
ihist.convertTo(hist, CV_32F);
return;
}
}
#endif
if( !accumulate || histdata != hist.data ) if( !accumulate || histdata != hist.data )
hist = Scalar(0.); hist = Scalar(0.);
else else
@ -1477,7 +1497,7 @@ void cv::calcHist( InputArrayOfArrays images, const std::vector<int>& channels,
CV_OCL_RUN(images.total() == 1 && channels.size() == 1 && images.channels(0) == 1 && CV_OCL_RUN(images.total() == 1 && channels.size() == 1 && images.channels(0) == 1 &&
channels[0] == 0 && images.isUMatVector() && mask.empty() && !accumulate && channels[0] == 0 && images.isUMatVector() && mask.empty() && !accumulate &&
histSize.size() == 1 && histSize[0] == BINS && ranges.size() == 2 && histSize.size() == 1 && histSize[0] == BINS && ranges.size() == 2 &&
ranges[0] == 0 && ranges[1] == 256, ranges[0] == 0 && ranges[1] == BINS,
ocl_calcHist(images, hist)) ocl_calcHist(images, hist))
int i, dims = (int)histSize.size(), rsz = (int)ranges.size(), csz = (int)channels.size(); int i, dims = (int)histSize.size(), rsz = (int)ranges.size(), csz = (int)channels.size();