From d5e5ad6356d53e77513f684da0b47cb3da12912e Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Mon, 16 Jul 2012 22:12:59 -0700
Subject: [PATCH] move decode_vp8.h from webp/ to dec/

the functions contained in it are now private

Change-Id: Ief6c81b32ae3f6d97052edac625716e5b909e66e
---
 makefile.unix                  | 2 +-
 src/Makefile.am                | 1 -
 src/dec/Makefile.am            | 2 +-
 src/{webp => dec}/decode_vp8.h | 2 +-
 src/dec/webpi.h                | 2 +-
 src/dsp/Makefile.am            | 2 +-
 src/dsp/yuv.h                  | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)
 rename src/{webp => dec}/decode_vp8.h (99%)

diff --git a/makefile.unix b/makefile.unix
index a33753d9..ae72a504 100644
--- a/makefile.unix
+++ b/makefile.unix
@@ -140,6 +140,7 @@ HDRS_INSTALLED = \
     src/webp/types.h \
 
 HDRS = \
+    src/dec/decode_vp8.h \
     src/dec/vp8i.h \
     src/dec/vp8li.h \
     src/dec/webpi.h \
@@ -157,7 +158,6 @@ HDRS = \
     src/utils/quant_levels.h \
     src/utils/rescaler.h \
     src/utils/thread.h \
-    src/webp/decode_vp8.h \
     src/webp/format_constants.h \
     src/webp/mux.h \
     $(HDRS_INSTALLED) \
diff --git a/src/Makefile.am b/src/Makefile.am
index ff4638a9..ab55b676 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,6 @@ libwebpinclude_HEADERS += webp/decode.h
 libwebpinclude_HEADERS += webp/encode.h
 libwebpinclude_HEADERS += webp/types.h
 noinst_HEADERS =
-noinst_HEADERS += webp/decode_vp8.h
 noinst_HEADERS += webp/format_constants.h
 
 libwebp_la_LIBADD =
diff --git a/src/dec/Makefile.am b/src/dec/Makefile.am
index 43516b62..06142063 100644
--- a/src/dec/Makefile.am
+++ b/src/dec/Makefile.am
@@ -4,6 +4,7 @@ noinst_LTLIBRARIES = libwebpdecode.la
 libwebpdecode_la_SOURCES =
 libwebpdecode_la_SOURCES += alpha.c
 libwebpdecode_la_SOURCES += buffer.c
+libwebpdecode_la_SOURCES += decode_vp8.h
 libwebpdecode_la_SOURCES += frame.c
 libwebpdecode_la_SOURCES += idec.c
 libwebpdecode_la_SOURCES += io.c
@@ -21,7 +22,6 @@ libwebpdecodeinclude_HEADERS =
 libwebpdecodeinclude_HEADERS += ../webp/decode.h
 libwebpdecodeinclude_HEADERS += ../webp/types.h
 noinst_HEADERS =
-noinst_HEADERS += ../webp/decode_vp8.h
 noinst_HEADERS += ../webp/format_constants.h
 
 libwebpdecode_la_CPPFLAGS = $(USE_EXPERIMENTAL_CODE)
diff --git a/src/webp/decode_vp8.h b/src/dec/decode_vp8.h
similarity index 99%
rename from src/webp/decode_vp8.h
rename to src/dec/decode_vp8.h
index 63cb95a3..12c77bcb 100644
--- a/src/webp/decode_vp8.h
+++ b/src/dec/decode_vp8.h
@@ -12,7 +12,7 @@
 #ifndef WEBP_WEBP_DECODE_VP8_H_
 #define WEBP_WEBP_DECODE_VP8_H_
 
-#include "./decode.h"
+#include "../webp/decode.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/src/dec/webpi.h b/src/dec/webpi.h
index 527a3888..44e57444 100644
--- a/src/dec/webpi.h
+++ b/src/dec/webpi.h
@@ -17,7 +17,7 @@ extern "C" {
 #endif
 
 #include "../utils/rescaler.h"
-#include "../webp/decode_vp8.h"
+#include "./decode_vp8.h"
 
 //------------------------------------------------------------------------------
 // WebPDecParams: Decoding output parameters. Transient internal object.
diff --git a/src/dsp/Makefile.am b/src/dsp/Makefile.am
index 2ff6a388..c9dd7a55 100644
--- a/src/dsp/Makefile.am
+++ b/src/dsp/Makefile.am
@@ -18,8 +18,8 @@ libwebpdsp_la_SOURCES += yuv.h
 
 libwebpdspinclude_HEADERS = ../webp/types.h
 noinst_HEADERS =
+noinst_HEADERS += ../dec/decode_vp8.h
 noinst_HEADERS += ../webp/decode.h
-noinst_HEADERS += ../webp/decode_vp8.h
 
 libwebpdsp_la_LDFLAGS = -lm
 libwebpdsp_la_CPPFLAGS = $(USE_EXPERIMENTAL_CODE)
diff --git a/src/dsp/yuv.h b/src/dsp/yuv.h
index cf9f4d76..c662af67 100644
--- a/src/dsp/yuv.h
+++ b/src/dsp/yuv.h
@@ -12,7 +12,7 @@
 #ifndef WEBP_DSP_YUV_H_
 #define WEBP_DSP_YUV_H_
 
-#include "../webp/decode_vp8.h"
+#include "../dec/decode_vp8.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {