Fix ARMv7 build for DwaCompressor, too. (AcademySoftwareFoundation#1368)

To fix AcademySoftwareFoundation#1367. Signed-off-by: Matthias Andree <matthias.andree@gmx.de>
cary-ilm · Mar 26, 2023 · b3637c4 · b3637c4
1 parent 5b7ab17
commit b3637c4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/lib/OpenEXR/ImfDwaCompressor.cpp b/src/lib/OpenEXR/ImfDwaCompressor.cpp
@@ -2888,7 +2888,7 @@ DwaCompressor::initializeFuncs()
         fromHalfZigZag       = fromHalfZigZag_f16c;
     } 
 
-#ifdef IMF_HAVE_NEON
+#ifdef IMF_HAVE_NEON_AARCH64
     {
         convertFloatToHalf64 = convertFloatToHalf64_neon;
         fromHalfZigZag       = fromHalfZigZag_neon;

diff --git a/src/lib/OpenEXR/ImfDwaCompressorSimd.h b/src/lib/OpenEXR/ImfDwaCompressorSimd.h
@@ -395,7 +395,7 @@ convertFloatToHalf64_scalar (unsigned short* dst, float* src)
         dst[i] = ((half) src[i]).bits ();
 }
 
-#ifdef IMF_HAVE_NEON
+#ifdef IMF_HAVE_NEON_AARCH64
 
 void
 convertFloatToHalf64_neon (unsigned short* dst, float* src)
@@ -821,7 +821,7 @@ fromHalfZigZag_f16c (unsigned short* src, float* dst)
 #endif /* defined IMF_HAVE_GCC_INLINEASM_X86_64 */
 }
 
-#ifdef IMF_HAVE_NEON
+#ifdef IMF_HAVE_NEON_AARCH64
 
 
 void
@@ -856,7 +856,7 @@ fromHalfZigZag_neon(unsigned short* __restrict__ src, float* __restrict__ dst)
     }
 }
 
-#endif // IMF_HAVE_NEON
+#endif // IMF_HAVE_NEON_AARCH64
 
 //
 // Inverse 8x8 DCT, only inverting the DC. This assumes that

diff --git a/src/test/OpenEXRTest/testDwaCompressorSimd.cpp b/src/test/OpenEXRTest/testDwaCompressorSimd.cpp
@@ -401,7 +401,7 @@ testFloatToHalf()
         }
     }
 
-#ifdef IMF_HAVE_NEON
+#ifdef IMF_HAVE_NEON_AARCH64
     {
         cout << "      convertFloatToHalf64_neon()" << endl;
         for (int iter = 0; iter < numIter; ++iter)
@@ -430,7 +430,7 @@ testFloatToHalf()
             }
         }
     }
-    #endif // IMF_HAVE_NEON
+    #endif // IMF_HAVE_NEON_AARCH64
 }
 
 //
@@ -516,8 +516,8 @@ testFromHalfZigZag()
         } // iter
     }     // f16c
 
-#ifdef IMF_HAVE_NEON
-    {
+#ifdef IMF_HAVE_NEON_AARCH64
+     {
         const int            numIter = 1000000;
         Rand48               rand48 (0);
         half                 h;
@@ -553,7 +553,7 @@ testFromHalfZigZag()
         } // iter
     }     // neon
 
-#endif // IMF_HAVE_NEON
+#endif // IMF_HAVE_NEON_AARCH64
 }