From 598bc92401caa6db676a58553e8008fefcc2e5d7 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@leithalweapon.geek.nz>
Date: Sat, 8 Nov 2014 01:05:03 +1100
Subject: [PATCH] Make image.cpp use Log functions

---
 include/mbgl/platform/event.hpp |  2 ++
 platform/default/image.cpp      | 12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/mbgl/platform/event.hpp b/include/mbgl/platform/event.hpp
index 2aa4aa0c9..3361e55ce 100644
--- a/include/mbgl/platform/event.hpp
+++ b/include/mbgl/platform/event.hpp
@@ -32,6 +32,7 @@ enum class Event : uint8_t {
     Database,
     HttpRequest,
     Sprite,
+    Image,
 };
 
 MBGL_DEFINE_ENUM_CLASS(EventClass, Event, {
@@ -44,6 +45,7 @@ MBGL_DEFINE_ENUM_CLASS(EventClass, Event, {
     { Event::Database, "Database" },
     { Event::HttpRequest, "HttpRequest" },
     { Event::Sprite, "Sprite" },
+    { Event::Image, "Image" },
     { Event(-1), "Unknown" },
 });
 
diff --git a/platform/default/image.cpp b/platform/default/image.cpp
index 68d178691..8368982d7 100644
--- a/platform/default/image.cpp
+++ b/platform/default/image.cpp
@@ -1,4 +1,5 @@
 #include <mbgl/util/image.hpp>
+#include <mbgl/platform/log.hpp>
 
 #include <png.h>
 
@@ -15,14 +16,14 @@ std::string compress_png(int width, int height, void *rgba) {
     png_voidp error_ptr = 0;
     png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, error_ptr, NULL, NULL);
     if (!png_ptr) {
-        fprintf(stderr, "Couldn't create png_ptr\n");
+        Log::Error(Event::Image, "Couldn't create png_ptr");
         return "";
     }
 
     png_infop info_ptr = png_create_info_struct(png_ptr);
     if (!png_ptr) {
         png_destroy_write_struct(&png_ptr, (png_infopp)0);
-        fprintf(stderr, "Couldn't create info_ptr\n");
+        Log::Error(Event::Image, "Couldn't create info_ptr");
         return "";
     }
 
@@ -80,18 +81,19 @@ void readCallback(png_structp png, png_bytep data, png_size_t length) {
 }
 
 void errorHandler(png_structp, png_const_charp error_msg) {
+    Log::Error(Event::Image, "PNG: %s", error_msg);
     throw std::runtime_error(error_msg);
 }
 
 void warningHandler(png_structp, png_const_charp error_msg) {
-    fprintf(stderr, "PNG: %s\n", error_msg);
+    Log::Warning(Event::General, "PNG: %s", error_msg);
 }
 
 Image::Image(const std::string &data) {
     Buffer buffer(data);
 
     if (buffer.length < 8 || !png_check_sig((const png_bytep)buffer.data, 8)) {
-        fprintf(stderr, "image is not a valid PNG image\n");
+        Log::Error(Event::Image, "image is not a valid PNG image");
         return;
     }
 
@@ -164,7 +166,7 @@ Image::Image(const std::string &data) {
 
         png_destroy_read_struct(&png, &info, nullptr);
     } catch (std::exception& e) {
-        fprintf(stderr, "loading PNG failed: %s\n", e.what());
+        Log::Error(Event::Image, "loading PNG failed: %s", e.what());
         png_destroy_read_struct(&png, &info, nullptr);
         if (img) {
             img.reset();