From 6c347bbb0ccf255ba9a36970170c7f3ff913bad4 Mon Sep 17 00:00:00 2001
From: skal <pascal.massimino@gmail.com>
Date: Mon, 21 Jul 2014 14:11:58 +0200
Subject: [PATCH] move WebPPictureInit to picture.c

Change-Id: I4b8c352cfd47256d0c3827334a6942c1caf742f6
---
 src/enc/picture.c | 23 +++++++++++++++++++++++
 src/enc/webpenc.c | 26 --------------------------
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/enc/picture.c b/src/enc/picture.c
index 121af3b3..9a66fbe7 100644
--- a/src/enc/picture.c
+++ b/src/enc/picture.c
@@ -21,6 +21,29 @@
 // WebPPicture
 //------------------------------------------------------------------------------
 
+static int DummyWriter(const uint8_t* data, size_t data_size,
+                       const WebPPicture* const picture) {
+  // The following are to prevent 'unused variable' error message.
+  (void)data;
+  (void)data_size;
+  (void)picture;
+  return 1;
+}
+
+int WebPPictureInitInternal(WebPPicture* picture, int version) {
+  if (WEBP_ABI_IS_INCOMPATIBLE(version, WEBP_ENCODER_ABI_VERSION)) {
+    return 0;   // caller/system version mismatch!
+  }
+  if (picture != NULL) {
+    memset(picture, 0, sizeof(*picture));
+    picture->writer = DummyWriter;
+    WebPEncodingSetError(picture, VP8_ENC_OK);
+  }
+  return 1;
+}
+
+//------------------------------------------------------------------------------
+
 static void WebPPictureResetBufferARGB(WebPPicture* const picture) {
   picture->memory_argb_ = NULL;
   picture->argb = NULL;
diff --git a/src/enc/webpenc.c b/src/enc/webpenc.c
index 7aeb8411..6171b10d 100644
--- a/src/enc/webpenc.c
+++ b/src/enc/webpenc.c
@@ -33,31 +33,6 @@ int WebPGetEncoderVersion(void) {
   return (ENC_MAJ_VERSION << 16) | (ENC_MIN_VERSION << 8) | ENC_REV_VERSION;
 }
 
-//------------------------------------------------------------------------------
-// WebPPicture
-//------------------------------------------------------------------------------
-
-static int DummyWriter(const uint8_t* data, size_t data_size,
-                       const WebPPicture* const picture) {
-  // The following are to prevent 'unused variable' error message.
-  (void)data;
-  (void)data_size;
-  (void)picture;
-  return 1;
-}
-
-int WebPPictureInitInternal(WebPPicture* picture, int version) {
-  if (WEBP_ABI_IS_INCOMPATIBLE(version, WEBP_ENCODER_ABI_VERSION)) {
-    return 0;   // caller/system version mismatch!
-  }
-  if (picture != NULL) {
-    memset(picture, 0, sizeof(*picture));
-    picture->writer = DummyWriter;
-    WebPEncodingSetError(picture, VP8_ENC_OK);
-  }
-  return 1;
-}
-
 //------------------------------------------------------------------------------
 // VP8Encoder
 //------------------------------------------------------------------------------
@@ -399,4 +374,3 @@ int WebPEncode(const WebPConfig* config, WebPPicture* pic) {
 
   return ok;
 }
-