Fix hwy, HWY only static

Author: awxkee

avif-coder/src/main/cpp/CMakeLists.txt

@@ -52,11 +52,7 @@ if (ANDROID_ABI STREQUAL arm64-v8a)
     add_definitions("-DHAVE_NEON=1")
 endif ()
 
-#add_definitions(-DHWY_COMPILE_ONLY_STATIC)
-
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    add_definitions(-DHWY_COMPILE_ONLY_STATIC)
-endif ()
+add_definitions(-DHWY_COMPILE_ONLY_STATIC)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

avif-coder/src/main/cpp/colorspace/HDRTransferAdapter.cpp

@@ -867,16 +867,16 @@ namespace coder::HWY_NAMESPACE {
 
         if (halfFloats) {
             auto ptr16 = reinterpret_cast<uint16_t *>(data + y * stride);
-            HWY_DYNAMIC_DISPATCH(ProcessF16Row)(reinterpret_cast<uint16_t *>(ptr16), width,
-                                                gammaCorrection, function, curveToneMapper,
-                                                conversion, gamma, useChromaticAdaptation);
+            ProcessF16Row(reinterpret_cast<uint16_t *>(ptr16), width,
+                          gammaCorrection, function, curveToneMapper,
+                          conversion, gamma, useChromaticAdaptation);
         } else {
             auto ptr16 = reinterpret_cast<uint8_t *>(data + y * stride);
-            HWY_DYNAMIC_DISPATCH(ProcessUSRow)(reinterpret_cast<uint8_t *>(ptr16),
-                                               width,
-                                               (float) maxColors, gammaCorrection, function,
-                                               curveToneMapper, conversion, gamma,
-                                               useChromaticAdaptation);
+            ProcessUSRow(reinterpret_cast<uint8_t *>(ptr16),
+                         width,
+                         (float) maxColors, gammaCorrection, function,
+                         curveToneMapper, conversion, gamma,
+                         useChromaticAdaptation);
         }
     }