From d326c7700746de78faa4ec5f538dd8d489abcd06 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Mon, 30 Mar 2015 16:28:53 +0300
Subject: [PATCH] fix build (related to PR #3814)

---
 modules/photo/src/fast_nlmeans_denoising_invoker.hpp         | 4 ++--
 modules/photo/src/fast_nlmeans_denoising_invoker_commons.hpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/photo/src/fast_nlmeans_denoising_invoker.hpp b/modules/photo/src/fast_nlmeans_denoising_invoker.hpp
index 6e74acf03..cfa9826ae 100644
--- a/modules/photo/src/fast_nlmeans_denoising_invoker.hpp
+++ b/modules/photo/src/fast_nlmeans_denoising_invoker.hpp
@@ -224,9 +224,9 @@ void FastNlMeansDenoisingInvoker<T, IT, UIT, D, WT>::operator() (const Range& ra
 
             // calc weights
             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;
-            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;
 
             for (int y = 0; y < search_window_size_; y++)
diff --git a/modules/photo/src/fast_nlmeans_denoising_invoker_commons.hpp b/modules/photo/src/fast_nlmeans_denoising_invoker_commons.hpp
index 2322919ef..d8eb34417 100644
--- a/modules/photo/src/fast_nlmeans_denoising_invoker_commons.hpp
+++ b/modules/photo/src/fast_nlmeans_denoising_invoker_commons.hpp
@@ -66,7 +66,7 @@ template <typename ET, int n> struct pixelInfo_<Vec<ET, n> >
 
 template <typename T> struct pixelInfo: public pixelInfo_<T>
 {
-    using typename pixelInfo_<T>::sampleType;
+    typedef typename pixelInfo_<T>::sampleType sampleType;
 
     static inline sampleType sampleMax()
     {