From 1e350b7ea485117cadc413d4d41062cf3c3c43a1 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 5 Nov 2015 15:05:43 -0800 Subject: [core] Reorganize sprite related files --- include/mbgl/annotation/sprite_image.hpp | 40 -------------------------------- include/mbgl/sprite/sprite_image.hpp | 40 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 include/mbgl/annotation/sprite_image.hpp create mode 100644 include/mbgl/sprite/sprite_image.hpp (limited to 'include') diff --git a/include/mbgl/annotation/sprite_image.hpp b/include/mbgl/annotation/sprite_image.hpp deleted file mode 100644 index 7d8ea0501c..0000000000 --- a/include/mbgl/annotation/sprite_image.hpp +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef MBGL_ANNOTATIONS_SPRITE_IMAGE -#define MBGL_ANNOTATIONS_SPRITE_IMAGE - -#include -#include - -#include -#include -#include - -namespace mbgl { - -class SpriteImage : private util::noncopyable { -public: - SpriteImage( - uint16_t width, uint16_t height, float pixelRatio, std::string&& data, bool sdf = false); - - // Logical dimensions of the sprite image. - const uint16_t width; - const uint16_t height; - - // Pixel ratio of the sprite image. - const float pixelRatio; - - // Physical dimensions of the sprite image. - const uint16_t pixelWidth; - const uint16_t pixelHeight; - - // A string of an RGBA8 representation of the sprite. It must have exactly - // (width * ratio) * (height * ratio) * 4 (RGBA) bytes. The scan lines may - // not have gaps between them (i.e. stride == 0). - const std::string data; - - // Whether this image should be interpreted as a signed distance field icon. - const bool sdf; -}; - -} - -#endif diff --git a/include/mbgl/sprite/sprite_image.hpp b/include/mbgl/sprite/sprite_image.hpp new file mode 100644 index 0000000000..f36ec5e286 --- /dev/null +++ b/include/mbgl/sprite/sprite_image.hpp @@ -0,0 +1,40 @@ +#ifndef MBGL_SPRITE_IMAGE +#define MBGL_SPRITE_IMAGE + +#include +#include + +#include +#include +#include + +namespace mbgl { + +class SpriteImage : private util::noncopyable { +public: + SpriteImage( + uint16_t width, uint16_t height, float pixelRatio, std::string&& data, bool sdf = false); + + // Logical dimensions of the sprite image. + const uint16_t width; + const uint16_t height; + + // Pixel ratio of the sprite image. + const float pixelRatio; + + // Physical dimensions of the sprite image. + const uint16_t pixelWidth; + const uint16_t pixelHeight; + + // A string of an RGBA8 representation of the sprite. It must have exactly + // (width * ratio) * (height * ratio) * 4 (RGBA) bytes. The scan lines may + // not have gaps between them (i.e. stride == 0). + const std::string data; + + // Whether this image should be interpreted as a signed distance field icon. + const bool sdf; +}; + +} + +#endif -- cgit v1.2.1