From dcab9896e845c787887de9bf5d84c3608d525add Mon Sep 17 00:00:00 2001
From: Matthew Heaney <matthewjheaney@chromium.org>
Date: Tue, 24 Sep 2013 15:13:29 -0700
Subject: Fix linker warnings for bilinear filters

The declaration of the bilinear filters specified an alignment clause
in the implementation file but not in the header.  This turned out
to be harmless, but it did cause linker warnings to be emitted when
building on Windows.

The (extern) declaration in the header was changed, to match the
declaration in the implementation.

Change-Id: I44be89b1572fe9a50fa47a42e4db9128c4897b04
---
 vp8/common/filter.c         |  2 --
 vp8/common/filter.h         |  6 ++++--
 vp8/common/x86/filter_x86.c |  2 +-
 vp8/common/x86/filter_x86.h | 10 ++++++++--
 4 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'vp8/common')

diff --git a/vp8/common/filter.c b/vp8/common/filter.c
index 1901ea3b6..25266f868 100644
--- a/vp8/common/filter.c
+++ b/vp8/common/filter.c
@@ -9,9 +9,7 @@
  */
 
 
-#include <stdlib.h>
 #include "filter.h"
-#include "vpx_ports/mem.h"
 
 DECLARE_ALIGNED(16, const short, vp8_bilinear_filters[8][2]) =
 {
diff --git a/vp8/common/filter.h b/vp8/common/filter.h
index b7591f268..ccda7c8d0 100644
--- a/vp8/common/filter.h
+++ b/vp8/common/filter.h
@@ -12,11 +12,13 @@
 #ifndef FILTER_H
 #define FILTER_H
 
+#include "vpx_ports/mem.h"
+
 #define BLOCK_HEIGHT_WIDTH 4
 #define VP8_FILTER_WEIGHT 128
 #define VP8_FILTER_SHIFT  7
 
-extern const short vp8_bilinear_filters[8][2];
-extern const short vp8_sub_pel_filters[8][6];
+extern DECLARE_ALIGNED(16, const short, vp8_bilinear_filters[8][2]);
+extern DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters[8][6]);
 
 #endif
diff --git a/vp8/common/x86/filter_x86.c b/vp8/common/x86/filter_x86.c
index ebab814f4..7f496ed7d 100644
--- a/vp8/common/x86/filter_x86.c
+++ b/vp8/common/x86/filter_x86.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vpx_ports/mem.h"
+#include "vp8/common/x86/filter_x86.h"
 
 DECLARE_ALIGNED(16, const short, vp8_bilinear_filters_x86_4[8][8]) =
 {
diff --git a/vp8/common/x86/filter_x86.h b/vp8/common/x86/filter_x86.h
index efcc4dc2a..cfadaeecb 100644
--- a/vp8/common/x86/filter_x86.h
+++ b/vp8/common/x86/filter_x86.h
@@ -11,9 +11,15 @@
 #ifndef FILTER_X86_H
 #define FILTER_X86_H
 
+#include "vpx_ports/mem.h"
+
 /* x86 assembly specific copy of vp8/common/filter.c:vp8_bilinear_filters with
  * duplicated values */
-extern const short vp8_bilinear_filters_x86_4[8][8];  /* duplicated 4x */
-extern const short vp8_bilinear_filters_x86_8[8][16]; /* duplicated 8x */
+
+/* duplicated 4x */
+extern DECLARE_ALIGNED(16, const short, vp8_bilinear_filters_x86_4[8][8]);
+
+/* duplicated 8x */
+extern DECLARE_ALIGNED(16, const short, vp8_bilinear_filters_x86_8[8][16]);
 
 #endif /* FILTER_X86_H */
-- 
cgit v1.2.3