diff options
| -rw-r--r-- | include/mbgl/platform/default/image_reader.hpp (renamed from include/mbgl/util/image_reader.hpp) | 0 | ||||
| -rw-r--r-- | include/mbgl/platform/default/jpeg_reader.hpp (renamed from include/mbgl/util/jpeg_reader.hpp) | 2 | ||||
| -rw-r--r-- | include/mbgl/platform/default/png_reader.hpp (renamed from include/mbgl/util/png_reader.hpp) | 2 | ||||
| -rw-r--r-- | platform/default/image.cpp | 3 | ||||
| -rw-r--r-- | platform/default/image_reader.cpp | 6 | ||||
| -rw-r--r-- | platform/default/jpeg_reader.cpp | 2 | ||||
| -rw-r--r-- | platform/default/png_reader.cpp | 2 |
7 files changed, 9 insertions, 8 deletions
diff --git a/include/mbgl/util/image_reader.hpp b/include/mbgl/platform/default/image_reader.hpp index a35830cf5e..a35830cf5e 100644 --- a/include/mbgl/util/image_reader.hpp +++ b/include/mbgl/platform/default/image_reader.hpp diff --git a/include/mbgl/util/jpeg_reader.hpp b/include/mbgl/platform/default/jpeg_reader.hpp index 77356007d8..964e4731ee 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 index 3d6e1db51e..f6b5aaf9cf 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 8d0374c64c..558f33cb81 100644 --- a/platform/default/image.cpp +++ b/platform/default/image.cpp @@ -7,7 +7,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 86dae78fba..2e2842d19d 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 b722c08fa1..18350c3e70 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 4d0abce04c..e9f38a9d3d 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" { |