diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-11-23 16:35:32 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-11-23 17:28:44 -0800 |
| commit | 6ff3ef55f8406d45d24cb5b280fc19b888c2138e (patch) | |
| tree | 8e216120d36e27ed4538a108e19159573e4477a9 /include | |
| parent | 36081f6486201d9bd316f3a8ceb5a38ad2e97310 (diff) | |
| download | qtlocation-mapboxgl-6ff3ef55f8406d45d24cb5b280fc19b888c2138e.tar.gz | |
[core] Remove unused
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/platform/default/image_reader.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/platform/default/jpeg_reader.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/platform/default/png_reader.hpp | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/include/mbgl/platform/default/image_reader.hpp b/include/mbgl/platform/default/image_reader.hpp index 8e293d8be3..e46bb08ea2 100644 --- a/include/mbgl/platform/default/image_reader.hpp +++ b/include/mbgl/platform/default/image_reader.hpp @@ -29,9 +29,7 @@ struct ImageReader : private noncopyable { virtual unsigned width() const=0; virtual unsigned height() const=0; - virtual bool hasAlpha() const=0; - virtual bool premultipliedAlpha() const=0; - virtual void read(unsigned x, unsigned y, unsigned width, unsigned height, uint8_t* image)=0; + virtual std::unique_ptr<uint8_t[]> read()=0; virtual ~ImageReader() {} }; diff --git a/include/mbgl/platform/default/jpeg_reader.hpp b/include/mbgl/platform/default/jpeg_reader.hpp index d877005354..2f988374c3 100644 --- a/include/mbgl/platform/default/jpeg_reader.hpp +++ b/include/mbgl/platform/default/jpeg_reader.hpp @@ -55,9 +55,7 @@ public: ~JpegReader(); unsigned width() const; unsigned height() const; - inline bool hasAlpha() const { return false; } - inline bool premultipliedAlpha() const { return true; } - void read(unsigned x, unsigned y, unsigned w, unsigned h, uint8_t* image); + std::unique_ptr<uint8_t[]> read(); private: void init(); static void on_error(j_common_ptr cinfo); diff --git a/include/mbgl/platform/default/png_reader.hpp b/include/mbgl/platform/default/png_reader.hpp index 9d6af91daa..c869e78ea4 100644 --- a/include/mbgl/platform/default/png_reader.hpp +++ b/include/mbgl/platform/default/png_reader.hpp @@ -53,9 +53,7 @@ public: ~PngReader(); unsigned width() const; unsigned height() const; - inline bool hasAlpha() const { return has_alpha_; } - bool premultipliedAlpha() const { return true; } // png_set_alpha_mode(png, PNG_ALPHA_PREMULTIPLIED, 2.2) - void read(unsigned x,unsigned y, unsigned width, unsigned height, uint8_t* image); + std::unique_ptr<uint8_t[]> read(); private: void init(); static void png_read_data(png_structp png_ptr, png_bytep data, png_size_t length); |