From 9edb0cee37877792684356dd50f92d2db5c7a74e Mon Sep 17 00:00:00 2001
From: Vincent Rabaud <vrabaud@google.com>
Date: Tue, 26 Mar 2024 15:01:41 +0100
Subject: [PATCH] Use proper C++ types again.

This is necessary to get https://github.com/opencv/opencv/pull/25248 working.
This was missed in 5300337197b7f580c96101953606e5f78890103c
---
 modules/xphoto/src/norm2.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/xphoto/src/norm2.hpp b/modules/xphoto/src/norm2.hpp
index 205827d4650..1f26ef9c4be 100644
--- a/modules/xphoto/src/norm2.hpp
+++ b/modules/xphoto/src/norm2.hpp
@@ -59,10 +59,10 @@ template <class T> struct same_as<T, T> : ttype {};   // is_same
 
 
 template <typename _Tp> struct is_norm2_type :
-    int_const<bool, !same_as<_Tp,   char>::value
+    int_const<bool, !same_as<_Tp,   int8_t>::value
                  && !same_as<_Tp,  uint8_t>::value
-                 && !same_as<_Tp, ushort>::value
-                 && !same_as<_Tp,   uint>::value>{};
+                 && !same_as<_Tp, uint16_t>::value
+                 && !same_as<_Tp, uint32_t>::value>{};
 
 template <typename _Tp, int cn> static inline typename iftype< is_norm2_type<_Tp>::value, _Tp >::
     type norm2(cv::Vec<_Tp, cn> a, cv::Vec<_Tp, cn> b) { return (a - b).dot(a - b); }