carotene: removed unnecessary 'register' specifier

diff --git a/3rdparty/carotene/src/colorconvert.cpp b/3rdparty/carotene/src/colorconvert.cpp
index 26ae54b..38cf75c 100644 (file)
--- a/3rdparty/carotene/src/colorconvert.cpp
+++ b/3rdparty/carotene/src/colorconvert.cpp
@@ -1087,12 +1087,12 @@ inline uint8x8x3_t convertToHSV(const uint8x8_t vR, const uint8x8_t vG, const ui
                                 const s32 hrange )
 {
     const s32 hsv_shift = 12;
-    register const f32 vsdiv_table = f32(255 << hsv_shift);
-    register f32 vhdiv_table = f32(hrange << hsv_shift);
-    register const s32 vhrange = hrange;
-    register const s32 v0 = s32(0);
-    register const s32 vshift = s32(1 << (hsv_shift-1));
-    register const s32 v6 = s32(6);
+    const f32 vsdiv_table = f32(255 << hsv_shift);
+    f32 vhdiv_table = f32(hrange << hsv_shift);
+    const s32 vhrange = hrange;
+    const s32 v0 = s32(0);
+    const s32 vshift = s32(1 << (hsv_shift-1));
+    const s32 v6 = s32(6);
 
     uint8x8_t vMin = vmin_u8(vR, vG);
     uint8x8_t vMax = vmax_u8(vR, vG);

diff --git a/3rdparty/carotene/src/pyramid.cpp b/3rdparty/carotene/src/pyramid.cpp
index 232ccf3..4aaab6d 100644 (file)
--- a/3rdparty/carotene/src/pyramid.cpp
+++ b/3rdparty/carotene/src/pyramid.cpp
@@ -680,12 +680,12 @@ void gaussianPyramidDown(const Size2D &srcSize,
     register float32x4_t vc4d64f32 asm ("q14") = vmovq_n_f32(0.0625f);   //4/4/16
     register float32x4_t vc6d64f32 asm ("q15") = vmovq_n_f32(0.09375f);  //6/4/16
 #else
-    register float32x4_t vc6d4f32  = vmovq_n_f32(1.5f);  // 6/4
-    register float32x4_t vc1d4f32  = vmovq_n_f32(0.25f); // 1/4
+    float32x4_t vc6d4f32  = vmovq_n_f32(1.5f);  // 6/4
+    float32x4_t vc1d4f32  = vmovq_n_f32(0.25f); // 1/4
 
-    register float32x4_t vc1d64f32 = vmovq_n_f32(0.015625f); //1/4/16
-    register float32x4_t vc4d64f32 = vmovq_n_f32(0.0625f);   //4/4/16
-    register float32x4_t vc6d64f32 = vmovq_n_f32(0.09375f);  //6/4/16
+    float32x4_t vc1d64f32 = vmovq_n_f32(0.015625f); //1/4/16
+    float32x4_t vc4d64f32 = vmovq_n_f32(0.0625f);   //4/4/16
+    float32x4_t vc6d64f32 = vmovq_n_f32(0.09375f);  //6/4/16
 #endif
 
     for (size_t i = 0; i < dstSize.height; ++i)

diff --git a/3rdparty/carotene/src/saturate_cast.hpp b/3rdparty/carotene/src/saturate_cast.hpp
index 98f8545..b779bfe 100644 (file)
--- a/3rdparty/carotene/src/saturate_cast.hpp
+++ b/3rdparty/carotene/src/saturate_cast.hpp
@@ -72,11 +72,11 @@ __declspec(naked) static void vcvtr_s32_f64_imp(f64 d)
 
 # if defined(__VFP_FP__) && !defined(__SOFTFP__) && !(defined _DEBUG || defined DEBUG) && !defined(__CUDACC__)
 #  define CAROTENE_ROUND_FLT(value) {                              \
-    register union { f32 f; s32 i; } result;                    \
+    union { f32 f; s32 i; } result; \
     asm ("ftosis  %0, %1 \n" : "=w" (result.f) : "w" (value) ); \
     return result.i; }
 #  define CAROTENE_ROUND_DBL(value) {                      \
-    register union {f32 f; s32 i;} __tegra_result;      \
+    union {f32 f; s32 i;} __tegra_result; \
     asm (                                               \
         "ftosid  %0, %P1\n"                             \
         : "=w" (__tegra_result.f)                       \