From 66de69c1fe39dbebdfcf4a49a0554374d54d70b4 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Thu, 19 Mar 2015 20:39:10 -0700
Subject: [PATCH] dsp/dec*.c: rework WEBP_USE_<arch> ifdef

add a dummy init rather than repeating the '#ifdef WEBP_USE_...'
pattern.

Change-Id: I319bc7714f36b8a3d8b35f6474e5592a439aaf24
---
 src/dsp/dec_mips32.c      | 11 +++++++----
 src/dsp/dec_mips_dsp_r2.c | 11 +++++++----
 src/dsp/dec_neon.c        | 11 +++++++----
 src/dsp/dec_sse2.c        | 12 +++++++-----
 src/dsp/dec_sse41.c       | 14 +++++++++++---
 5 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/src/dsp/dec_mips32.c b/src/dsp/dec_mips32.c
index 65944df8..edd5e93f 100644
--- a/src/dsp/dec_mips32.c
+++ b/src/dsp/dec_mips32.c
@@ -555,15 +555,12 @@ static void TransformTwo(const int16_t* in, uint8_t* dst, int do_two) {
   }
 }
 
-#endif  // WEBP_USE_MIPS32
-
 //------------------------------------------------------------------------------
 // Entry point
 
 extern void VP8DspInitMIPS32(void);
 
 WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitMIPS32(void) {
-#if defined(WEBP_USE_MIPS32)
   VP8InitClipTables();
 
   VP8Transform = TransformTwo;
@@ -581,5 +578,11 @@ WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitMIPS32(void) {
   VP8SimpleHFilter16 = SimpleHFilter16;
   VP8SimpleVFilter16i = SimpleVFilter16i;
   VP8SimpleHFilter16i = SimpleHFilter16i;
-#endif  // WEBP_USE_MIPS32
 }
+
+#else  // !WEBP_USE_MIPS32
+
+extern void VP8DspInitMIPS32(void);
+WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitMIPS32(void) {}
+
+#endif  // WEBP_USE_MIPS32
diff --git a/src/dsp/dec_mips_dsp_r2.c b/src/dsp/dec_mips_dsp_r2.c
index 55da0fff..ecd2fa33 100644
--- a/src/dsp/dec_mips_dsp_r2.c
+++ b/src/dsp/dec_mips_dsp_r2.c
@@ -950,15 +950,12 @@ TRUE_MOTION(dst, 16)
 #undef CLIP_8B_TO_DST
 #undef CLIPPING
 
-#endif  // WEBP_USE_MIPS_DSP_R2
-
 //------------------------------------------------------------------------------
 // Entry point
 
 extern void VP8DspInitMIPSdspR2(void);
 
 WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitMIPSdspR2(void) {
-#if defined(WEBP_USE_MIPS_DSP_R2)
   VP8TransformDC = TransformDC;
   VP8TransformAC3 = TransformAC3;
   VP8Transform = TransformTwo;
@@ -988,5 +985,11 @@ WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitMIPSdspR2(void) {
   VP8PredChroma8[5] = DC8uvNoLeft;
 
   VP8PredLuma16[1] = TrueMotion16;
-#endif
 }
+
+#else  // !WEBP_USE_MIPS_DSP_R2
+
+extern void VP8DspInitMIPSdspR2(void);
+WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitMIPSdspR2(void) {}
+
+#endif  // WEBP_USE_MIPS_DSP_R2
diff --git a/src/dsp/dec_neon.c b/src/dsp/dec_neon.c
index 19a32828..2e3a2770 100644
--- a/src/dsp/dec_neon.c
+++ b/src/dsp/dec_neon.c
@@ -1444,15 +1444,12 @@ static void DC8uvNoLeft(uint8_t* dst) { DC8(dst, 1, 0); }
 
 static void TM8uv(uint8_t* dst) { TrueMotion(dst, 8); }
 
-#endif   // WEBP_USE_NEON
-
 //------------------------------------------------------------------------------
 // Entry point
 
 extern void VP8DspInitNEON(void);
 
 WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitNEON(void) {
-#if defined(WEBP_USE_NEON)
   VP8Transform = TransformTwo;
   VP8TransformAC3 = TransformAC3;
   VP8TransformDC = TransformDC;
@@ -1485,5 +1482,11 @@ WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitNEON(void) {
   VP8PredChroma8[1] = TM8uv;
   VP8PredChroma8[4] = DC8uvNoTop;
   VP8PredChroma8[5] = DC8uvNoLeft;
-#endif   // WEBP_USE_NEON
 }
+
+#else  // !WEBP_USE_NEON
+
+extern void VP8DspInitNEON(void);
+WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitNEON(void) {}
+
+#endif  // WEBP_USE_NEON
diff --git a/src/dsp/dec_sse2.c b/src/dsp/dec_sse2.c
index 5661a66d..37ae01eb 100644
--- a/src/dsp/dec_sse2.c
+++ b/src/dsp/dec_sse2.c
@@ -1229,15 +1229,12 @@ static void DC8uvNoTopLeft(uint8_t* dst) {    // DC with nothing
   Put8x8uv(0x80, dst);
 }
 
-#endif   // WEBP_USE_SSE2
-
 //------------------------------------------------------------------------------
 // Entry point
 
 extern void VP8DspInitSSE2(void);
 
 WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitSSE2(void) {
-#if defined(WEBP_USE_SSE2)
   VP8Transform = Transform;
 #if defined(USE_TRANSFORM_AC3)
   VP8TransformAC3 = TransformAC3;
@@ -1279,6 +1276,11 @@ WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitSSE2(void) {
   VP8PredChroma8[4] = DC8uvNoTop;
   VP8PredChroma8[5] = DC8uvNoLeft;
   VP8PredChroma8[6] = DC8uvNoTopLeft;
-
-#endif   // WEBP_USE_SSE2
 }
+
+#else  // !WEBP_USE_SSE2
+
+extern void VP8DspInitSSE2(void);
+WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitSSE2(void) {}
+
+#endif  // WEBP_USE_SSE2
diff --git a/src/dsp/dec_sse41.c b/src/dsp/dec_sse41.c
index 4ae52fec..23c4e3a7 100644
--- a/src/dsp/dec_sse41.c
+++ b/src/dsp/dec_sse41.c
@@ -28,11 +28,19 @@ static void HE16(uint8_t* dst) {     // horizontal
     dst += BPS;
   }
 }
-#endif   // WEBP_USE_SSE41
+
+//------------------------------------------------------------------------------
+// Entry point
 
 extern void VP8DspInitSSE41(void);
+
 WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitSSE41(void) {
-#if defined(WEBP_USE_SSE41)
   VP8PredLuma16[3] = HE16;
-#endif   // WEBP_USE_SSE41
 }
+
+#else  // !WEBP_USE_SSE41
+
+extern void VP8DspInitSSE41(void);
+WEBP_TSAN_IGNORE_FUNCTION void VP8DspInitSSE41(void) {}
+
+#endif  // WEBP_USE_SSE41