[opencv] 104/251: photo: crash workaround for MSVC 2015 32-bit

Nobuhiro Iwamatsu iwamatsu at moszumanska.debian.org
Sun Aug 27 23:27:31 UTC 2017


This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 3.3.0
in repository opencv.

commit 1ff6c758ecb3552c6269784c990ea5cb3bfee763
Author: Alexander Alekhin <alexander.alekhin at intel.com>
Date:   Tue Jul 18 16:04:35 2017 +0300

    photo: crash workaround for MSVC 2015 32-bit
---
 modules/photo/src/fast_nlmeans_denoising_invoker.hpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/photo/src/fast_nlmeans_denoising_invoker.hpp b/modules/photo/src/fast_nlmeans_denoising_invoker.hpp
index cfa9826..b875ebc 100644
--- a/modules/photo/src/fast_nlmeans_denoising_invoker.hpp
+++ b/modules/photo/src/fast_nlmeans_denoising_invoker.hpp
@@ -205,6 +205,10 @@ void FastNlMeansDenoisingInvoker<T, IT, UIT, D, WT>::operator() (const Range& ra
                         const T * b_up_ptr = extended_src_.ptr<T>(start_by - template_window_half_size_ - 1 + y);
                         const T * b_down_ptr = extended_src_.ptr<T>(start_by + template_window_half_size_ + y);
 
+// MSVC 2015 generates unaligned destination for "movaps" instruction for 32-bit builds
+#if defined _MSC_VER && _MSC_VER == 1900 && !defined _WIN64
+#pragma loop(no_vector)
+#endif
                         for (int x = 0; x < search_window_size; x++)
                         {
                             // remove from current pixel sum column sum with index "first_col_num"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git



More information about the debian-science-commits mailing list