From fc805cc41c43e8ca628216254c23ee2aab1f6d4f Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 19 Nov 2014 16:56:53 +0100
Subject: [PATCH] image-readers: move concrete implementations headers into
 platform/default

---
 include/mbgl/{util => platform/default}/image_reader.hpp | 0
 include/mbgl/{util => platform/default}/jpeg_reader.hpp  | 2 +-
 include/mbgl/{util => platform/default}/png_reader.hpp   | 2 +-
 platform/default/image.cpp                               | 3 ++-
 platform/default/image_reader.cpp                        | 6 +++---
 platform/default/jpeg_reader.cpp                         | 2 +-
 platform/default/png_reader.cpp                          | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)
 rename include/mbgl/{util => platform/default}/image_reader.hpp (100%)
 rename include/mbgl/{util => platform/default}/jpeg_reader.hpp (97%)
 rename include/mbgl/{util => platform/default}/png_reader.hpp (96%)

diff --git a/include/mbgl/util/image_reader.hpp b/include/mbgl/platform/default/image_reader.hpp
similarity index 100%
rename from include/mbgl/util/image_reader.hpp
rename to include/mbgl/platform/default/image_reader.hpp
diff --git a/include/mbgl/util/jpeg_reader.hpp b/include/mbgl/platform/default/jpeg_reader.hpp
similarity index 97%
rename from include/mbgl/util/jpeg_reader.hpp
rename to include/mbgl/platform/default/jpeg_reader.hpp
index 77356007d..964e4731e 100644
--- a/include/mbgl/util/jpeg_reader.hpp
+++ b/include/mbgl/platform/default/jpeg_reader.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_UTIL_JPEG_READER_HPP
 #define MBGL_UTIL_JPEG_READER_HPP
 
-#include "image_reader.hpp"
+#include <mbgl/platform/default/image_reader.hpp>
 
 // jpeg
 extern "C"
diff --git a/include/mbgl/util/png_reader.hpp b/include/mbgl/platform/default/png_reader.hpp
similarity index 96%
rename from include/mbgl/util/png_reader.hpp
rename to include/mbgl/platform/default/png_reader.hpp
index 3d6e1db51..f6b5aaf9c 100644
--- a/include/mbgl/util/png_reader.hpp
+++ b/include/mbgl/platform/default/png_reader.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_UTIL_PNG_READER_HPP
 #define MBGL_UTIL_PNG_READER_HPP
 
-#include "mbgl/util/image_reader.hpp"
+#include <mbgl/platform/default/image_reader.hpp>
 
 extern "C"
 {
diff --git a/platform/default/image.cpp b/platform/default/image.cpp
index ca8b10348..c5e4ae82c 100644
--- a/platform/default/image.cpp
+++ b/platform/default/image.cpp
@@ -8,7 +8,8 @@
 #include <cstdlib>
 #include <stdexcept>
 #include <cstring>
-#include <mbgl/util/image_reader.hpp>
+
+#include <mbgl/platform/default/image_reader.hpp>
 
 // Check png library version.
 const static bool png_version_check = []() {
diff --git a/platform/default/image_reader.cpp b/platform/default/image_reader.cpp
index 86dae78fb..2e2842d19 100644
--- a/platform/default/image_reader.cpp
+++ b/platform/default/image_reader.cpp
@@ -1,6 +1,6 @@
-#include "mbgl/util/image_reader.hpp"
-#include "mbgl/util/png_reader.hpp"
-#include "mbgl/util/jpeg_reader.hpp"
+#include <mbgl/platform/default/image_reader.hpp>
+#include <mbgl/platform/default/png_reader.hpp>
+#include <mbgl/platform/default/jpeg_reader.hpp>
 
 #include <boost/optional.hpp>
 #include <boost/iostreams/device/array.hpp>
diff --git a/platform/default/jpeg_reader.cpp b/platform/default/jpeg_reader.cpp
index b722c08fa..18350c3e7 100644
--- a/platform/default/jpeg_reader.cpp
+++ b/platform/default/jpeg_reader.cpp
@@ -1,4 +1,4 @@
-#include "mbgl/util/jpeg_reader.hpp"
+#include <mbgl/platform/default/jpeg_reader.hpp>
 
 // boost
 #include <boost/iostreams/device/file.hpp>
diff --git a/platform/default/png_reader.cpp b/platform/default/png_reader.cpp
index 4d0abce04..e9f38a9d3 100644
--- a/platform/default/png_reader.cpp
+++ b/platform/default/png_reader.cpp
@@ -1,4 +1,4 @@
-#include "mbgl/util/png_reader.hpp"
+#include <mbgl/platform/default/png_reader.hpp>
 #include <iostream>
 extern "C"
 {