From 3c897aec161813805fad4ae3ada7565226816c17 Mon Sep 17 00:00:00 2001
From: bigbiff bigbiff <bigbiff@teamw.in>
Date: Wed, 5 Jun 2019 19:55:11 -0400
Subject: fb2png: Fix compilation in android-9.0 repos. Remove unused
 reference. Change temp variables to size_t. Update function calls for unused
 arguments. Update static functions to ignore being defined for each file that
 includes it. Change-Id: If11d4e26daee54197f369974a09ec71f27abb59b

---
 fb2png/fb.c          |  1 -
 fb2png/img_process.c | 16 ++++++++--------
 fb2png/log.h         |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/fb2png/fb.c b/fb2png/fb.c
index 2ed478902..a17f801df 100644
--- a/fb2png/fb.c
+++ b/fb2png/fb.c
@@ -48,7 +48,6 @@ static int fb_get_format(const struct fb *fb)
 {
     int ao = fb->alpha_offset;
     int ro = fb->red_offset;
-    int go = fb->green_offset;
     int bo = fb->blue_offset;
 
 #define FB_FORMAT_UNKNOWN   0
diff --git a/fb2png/img_process.c b/fb2png/img_process.c
index eb75e9a21..535ec2287 100644
--- a/fb2png/img_process.c
+++ b/fb2png/img_process.c
@@ -32,7 +32,7 @@ int rgb565_to_rgb888(const char* src, char* dst, size_t pixel)
     from = (struct rgb565 *) src;
     to = (struct rgb888 *) dst;
 
-    int i = 0;
+    size_t i = 0;
     /* traverse pixel of the row */
     while(i++ < pixel) {
 
@@ -53,7 +53,7 @@ int rgb565_to_rgb888(const char* src, char* dst, size_t pixel)
 
 int argb8888_to_rgb888(const char* src, char* dst, size_t pixel)
 {
-    int i;
+    size_t i;
     struct argb8888  *from;
     struct rgb888  *to;
 
@@ -77,7 +77,7 @@ int argb8888_to_rgb888(const char* src, char* dst, size_t pixel)
 
 int abgr8888_to_rgb888(const char* src, char* dst, size_t pixel)
 {
-    int i;
+    size_t i;
     struct abgr8888  *from;
     struct rgb888  *to;
 
@@ -101,7 +101,7 @@ int abgr8888_to_rgb888(const char* src, char* dst, size_t pixel)
 
 int bgra8888_to_rgb888(const char* src, char* dst, size_t pixel)
 {
-    int i;
+    size_t i;
     struct bgra8888  *from;
     struct rgb888  *to;
 
@@ -125,7 +125,7 @@ int bgra8888_to_rgb888(const char* src, char* dst, size_t pixel)
 
 int rgba8888_to_rgb888(const char* src, char* dst, size_t pixel)
 {
-    int i;
+    size_t i;
     struct rgba8888  *from;
     struct rgb888  *to;
 
@@ -164,19 +164,19 @@ stdio_write_func (png_structp png, png_bytep data, png_size_t size)
 }
 
 static void
-png_simple_output_flush_fn (png_structp png_ptr)
+png_simple_output_flush_fn (__attribute__((unused)) png_structp png_ptr)
 {
 }
 
 static void
-png_simple_error_callback (png_structp png,
+png_simple_error_callback (__attribute__((unused)) png_structp png,
                        png_const_charp error_msg)
 {
     E("png error: %s\n", error_msg);
 }
 
 static void
-png_simple_warning_callback (png_structp png,
+png_simple_warning_callback (__attribute__((unused)) png_structp png,
                          png_const_charp error_msg)
 {
     fprintf(stderr, "png warning: %s\n", error_msg);
diff --git a/fb2png/log.h b/fb2png/log.h
index 2b7cf8cec..a2e3f5f54 100644
--- a/fb2png/log.h
+++ b/fb2png/log.h
@@ -57,7 +57,7 @@
 
 #endif
 
-static void
+__attribute__((unused)) static void
 D(const char *msg, ...)
 {
     va_list ap;
@@ -69,7 +69,7 @@ D(const char *msg, ...)
     fflush(stdout);
 }
 
-static void
+__attribute__((unused)) static void
 E(const char *msg, ...)
 {
     va_list ap;
-- 
cgit v1.2.3