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

Merge pull request #3888 from alalek:fix_build

Browse Source
This commit is contained in:
Alexander Alekhin 2015-03-30 15:52:05 +00:00
commit 13a9d4a61f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/photo/src/fast_nlmeans_denoising_invoker.hpp
View File

@ -224,9 +224,9 @@ void FastNlMeansDenoisingInvoker<T, IT, UIT, D, WT>::operator() (const Range& ra
// calc weights // calc weights
IT estimation[pixelInfo<T>::channels], weights_sum[pixelInfo<WT>::channels]; IT estimation[pixelInfo<T>::channels], weights_sum[pixelInfo<WT>::channels];
for (size_t channel_num = 0; channel_num < pixelInfo<T>::channels; channel_num++) for (int channel_num = 0; channel_num < pixelInfo<T>::channels; channel_num++)
estimation[channel_num] = 0; estimation[channel_num] = 0;
for (size_t channel_num = 0; channel_num < pixelInfo<WT>::channels; channel_num++) for (int channel_num = 0; channel_num < pixelInfo<WT>::channels; channel_num++)
weights_sum[channel_num] = 0; weights_sum[channel_num] = 0;
for (int y = 0; y < search_window_size_; y++) for (int y = 0; y < search_window_size_; y++)

2
modules/photo/src/fast_nlmeans_denoising_invoker_commons.hpp
View File

@ -66,7 +66,7 @@ template <typename ET, int n> struct pixelInfo_<Vec<ET, n> >
template <typename T> struct pixelInfo: public pixelInfo_<T> template <typename T> struct pixelInfo: public pixelInfo_<T>
{ {
using typename pixelInfo_<T>::sampleType; typedef typename pixelInfo_<T>::sampleType sampleType;
static inline sampleType sampleMax() static inline sampleType sampleMax()
{ {