Merge pull request opencv#9707 from woodychow:fix_undistortrectifymap_avx2

alalek · alalek · commit 7475d23fec4b · 2017-09-26T16:42:47.000Z
diff --git a/modules/imgproc/src/undistort.avx2.cpp b/modules/imgproc/src/undistort.avx2.cpp
@@ -161,16 +161,8 @@ int initUndistortRectifyMapLine_AVX(float* m1f, float* m2f, short* m1, ushort* m
             __u = _mm256_mul_pd(__u, _mm256_set1_pd(INTER_TAB_SIZE));
             __v = _mm256_mul_pd(__v, _mm256_set1_pd(INTER_TAB_SIZE));
 
-            __m128 __u_float = _mm256_cvtpd_ps(__u);
-            __m128 __v_float = _mm256_cvtpd_ps(__v);
-            _mm256_zeroupper();
-            static const __m128 __int_max = _mm_set1_ps((float)(std::numeric_limits<int>::max()));
-            static const __m128 __int_min = _mm_set1_ps((float)(std::numeric_limits<int>::min()));
-            __u_float = _mm_max_ps(_mm_min_ps(__u_float, __int_max), __int_min);
-            __v_float = _mm_max_ps(_mm_min_ps(__v_float, __int_max), __int_min);
-
-            __m128i __iu = _mm_cvtps_epi32(__u_float);
-            __m128i __iv = _mm_cvtps_epi32(__v_float);
+            __m128i __iu = _mm256_cvtpd_epi32(__u);
+            __m128i __iv = _mm256_cvtpd_epi32(__v);
 
             static const __m128i __INTER_TAB_SIZE_m1 = _mm_set1_epi32(INTER_TAB_SIZE - 1);
             __m128i __m2 = _mm_add_epi32(
@@ -192,6 +184,8 @@ int initUndistortRectifyMapLine_AVX(float* m1f, float* m2f, short* m1, ushort* m
         }
     }
 
+    _mm256_zeroupper();
+
     return j;
 }
 
