From 84551d93490071a970ef4aace7935097a8effc2e Mon Sep 17 00:00:00 2001 From: artemp Date: Wed, 26 Nov 2014 17:50:12 +0100 Subject: convert image_reader public interface to use CamelCase to match the rest of codebase --- include/mbgl/platform/default/image_reader.hpp | 16 +++++----- include/mbgl/platform/default/jpeg_reader.hpp | 10 +++--- include/mbgl/platform/default/png_reader.hpp | 10 +++--- platform/default/image.cpp | 4 +-- platform/default/image_reader.cpp | 8 ++--- platform/default/jpeg_reader.cpp | 42 +++++++++++++------------- platform/default/png_reader.cpp | 32 ++++++++++---------- 7 files changed, 61 insertions(+), 61 deletions(-) diff --git a/include/mbgl/platform/default/image_reader.hpp b/include/mbgl/platform/default/image_reader.hpp index a35830cf5e..985e4874cd 100644 --- a/include/mbgl/platform/default/image_reader.hpp +++ b/include/mbgl/platform/default/image_reader.hpp @@ -9,15 +9,15 @@ namespace mbgl { namespace util { -class image_reader_exception : public std::exception +class ImageReaderException : public std::exception { private: std::string message_; public: - image_reader_exception(std::string const& message) + ImageReaderException(std::string const& message) : message_(message) {} - ~image_reader_exception() throw() {} + ~ImageReaderException() throw() {} virtual const char* what() const throw() { @@ -25,17 +25,17 @@ public: } }; -struct image_reader : private noncopyable +struct ImageReader : private noncopyable { virtual unsigned width() const=0; virtual unsigned height() const=0; - virtual bool has_alpha() const=0; - virtual bool premultiplied_alpha() const=0; + virtual bool hasAlpha() const=0; + virtual bool premultipliedAlpha() const=0; virtual void read(unsigned x,unsigned y, unsigned width, unsigned height, char* image)=0; - virtual ~image_reader() {} + virtual ~ImageReader() {} }; -std::unique_ptr get_image_reader(char const* data, size_t size); +std::unique_ptr getImageReader(char const* data, size_t size); }} diff --git a/include/mbgl/platform/default/jpeg_reader.hpp b/include/mbgl/platform/default/jpeg_reader.hpp index 964e4731ee..7122f24cd2 100644 --- a/include/mbgl/platform/default/jpeg_reader.hpp +++ b/include/mbgl/platform/default/jpeg_reader.hpp @@ -14,7 +14,7 @@ extern "C" namespace mbgl { namespace util { template -class jpeg_reader : public image_reader +class JpegReader : public ImageReader { public: using source_type = T; @@ -46,12 +46,12 @@ private: unsigned width_; unsigned height_; public: - jpeg_reader(char const* data, size_t size); - ~jpeg_reader(); + JpegReader(char const* data, size_t size); + ~JpegReader(); unsigned width() const; unsigned height() const; - inline bool has_alpha() const { return false; } - inline bool premultiplied_alpha() const { return true; } + inline bool hasAlpha() const { return false; } + inline bool premultipliedAlpha() const { return true; } void read(unsigned x,unsigned y, unsigned w, unsigned h, char *image); private: void init(); diff --git a/include/mbgl/platform/default/png_reader.hpp b/include/mbgl/platform/default/png_reader.hpp index db20d85e25..66debd4fba 100644 --- a/include/mbgl/platform/default/png_reader.hpp +++ b/include/mbgl/platform/default/png_reader.hpp @@ -16,7 +16,7 @@ extern "C" namespace mbgl { namespace util { template -class png_reader : public image_reader +class PngReader : public ImageReader { using source_type = T; using input_stream = boost::iostreams::stream; @@ -44,12 +44,12 @@ private: int color_type_; bool has_alpha_; public: - png_reader(char const* data, std::size_t size); - ~png_reader(); + PngReader(char const* data, std::size_t size); + ~PngReader(); unsigned width() const; unsigned height() const; - inline bool has_alpha() const { return has_alpha_; } - bool premultiplied_alpha() const { return true; } // png_set_alpha_mode(png, PNG_ALPHA_PREMULTIPLIED, 2.2) + 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, char * image); private: void init(); diff --git a/platform/default/image.cpp b/platform/default/image.cpp index 558f33cb81..242367e889 100644 --- a/platform/default/image.cpp +++ b/platform/default/image.cpp @@ -77,13 +77,13 @@ Image::Image(std::string const& data) { try { - auto reader = get_image_reader(data.c_str(), data.size()); + auto reader = getImageReader(data.c_str(), data.size()); width = reader->width(); height = reader->height(); img = ::std::unique_ptr(new char[width * height * 4]()); reader->read(0, 0, width, height, img.get()); } - catch (image_reader_exception const& ex) + catch (ImageReaderException const& ex) { fprintf(stderr, "Image: %s\n", ex.what()); img.reset(); diff --git a/platform/default/image_reader.cpp b/platform/default/image_reader.cpp index 2e2842d19d..e80ccb6819 100644 --- a/platform/default/image_reader.cpp +++ b/platform/default/image_reader.cpp @@ -42,21 +42,21 @@ inline boost::optional type_from_bytes(char const* data, size_t siz return result_type(); } -std::unique_ptr get_image_reader(char const* data, size_t size) +std::unique_ptr getImageReader(char const* data, size_t size) { boost::optional type = type_from_bytes(data,size); if (type) { if (*type == "png") { - return std::make_unique>(data, size); + return std::make_unique>(data, size); } else if (*type == "jpeg") { - return std::make_unique>(data, size); + return std::make_unique>(data, size); } } - throw image_reader_exception("image_reader: can't determine type from input data"); + throw ImageReaderException("ImageReader: can't determine type from input data"); } }} diff --git a/platform/default/jpeg_reader.cpp b/platform/default/jpeg_reader.cpp index 18350c3e70..f89e766874 100644 --- a/platform/default/jpeg_reader.cpp +++ b/platform/default/jpeg_reader.cpp @@ -13,30 +13,30 @@ namespace mbgl { namespace util { // ctor template -jpeg_reader::jpeg_reader(char const* data, size_t size) +JpegReader::JpegReader(char const* data, size_t size) : source_(data, size), stream_(source_), width_(0), height_(0) { - if (!stream_) throw image_reader_exception("cannot open image stream"); + if (!stream_) throw ImageReaderException("cannot open image stream"); init(); } // dtor template -jpeg_reader::~jpeg_reader() {} +JpegReader::~JpegReader() {} // jpeg stream wrapper template -void jpeg_reader::init_source (j_decompress_ptr cinfo) +void JpegReader::init_source (j_decompress_ptr cinfo) { jpeg_stream_wrapper* wrap = reinterpret_cast(cinfo->src); wrap->stream->seekg(0,std::ios_base::beg); } template -boolean jpeg_reader::fill_input_buffer (j_decompress_ptr cinfo) +boolean JpegReader::fill_input_buffer (j_decompress_ptr cinfo) { jpeg_stream_wrapper* wrap = reinterpret_cast(cinfo->src); wrap->stream->read(reinterpret_cast(&wrap->buffer[0]),BUF_SIZE); @@ -47,7 +47,7 @@ boolean jpeg_reader::fill_input_buffer (j_decompress_ptr cinfo) } template -void jpeg_reader::skip(j_decompress_ptr cinfo, long count) +void JpegReader::skip(j_decompress_ptr cinfo, long count) { if (count <= 0) return; //A zero or negative skip count should be treated as a no-op. jpeg_stream_wrapper* wrap = reinterpret_cast(cinfo->src); @@ -67,20 +67,20 @@ void jpeg_reader::skip(j_decompress_ptr cinfo, long count) } template -void jpeg_reader::term (j_decompress_ptr /*cinfo*/) +void JpegReader::term (j_decompress_ptr /*cinfo*/) { // no-op } template -void jpeg_reader::attach_stream (j_decompress_ptr cinfo, input_stream* in) +void JpegReader::attach_stream (j_decompress_ptr cinfo, input_stream* in) { if (cinfo->src == 0) { cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(jpeg_stream_wrapper)); } - jpeg_reader::jpeg_stream_wrapper * src = reinterpret_cast (cinfo->src); + JpegReader::jpeg_stream_wrapper * src = reinterpret_cast (cinfo->src); src->manager.init_source = init_source; src->manager.fill_input_buffer = fill_input_buffer; src->manager.skip_input_data = skip; @@ -92,20 +92,20 @@ void jpeg_reader::attach_stream (j_decompress_ptr cinfo, input_stream* in) } template -void jpeg_reader::on_error(j_common_ptr /*cinfo*/) +void JpegReader::on_error(j_common_ptr /*cinfo*/) { } template -void jpeg_reader::on_error_message(j_common_ptr cinfo) +void JpegReader::on_error_message(j_common_ptr cinfo) { char buffer[JMSG_LENGTH_MAX]; (*cinfo->err->format_message)(cinfo, buffer); - throw image_reader_exception(std::string("JPEG Reader: libjpeg could not read image: ") + buffer); + throw ImageReaderException(std::string("JPEG Reader: libjpeg could not read image: ") + buffer); } template -void jpeg_reader::init() +void JpegReader::init() { jpeg_decompress_struct cinfo; jpeg_info_guard iguard(&cinfo); @@ -117,35 +117,35 @@ void jpeg_reader::init() attach_stream(&cinfo, &stream_); int ret = jpeg_read_header(&cinfo, TRUE); if (ret != JPEG_HEADER_OK) - throw image_reader_exception("JPEG Reader: failed to read header"); + throw ImageReaderException("JPEG Reader: failed to read header"); jpeg_start_decompress(&cinfo); width_ = cinfo.output_width; height_ = cinfo.output_height; if (cinfo.out_color_space == JCS_UNKNOWN) { - throw image_reader_exception("JPEG Reader: failed to read unknown color space"); + throw ImageReaderException("JPEG Reader: failed to read unknown color space"); } if (cinfo.output_width == 0 || cinfo.output_height == 0) { - throw image_reader_exception("JPEG Reader: failed to read image size of"); + throw ImageReaderException("JPEG Reader: failed to read image size of"); } } template -unsigned jpeg_reader::width() const +unsigned JpegReader::width() const { return width_; } template -unsigned jpeg_reader::height() const +unsigned JpegReader::height() const { return height_; } template -void jpeg_reader::read(unsigned x0, unsigned y0, unsigned w, unsigned h, char* image) +void JpegReader::read(unsigned x0, unsigned y0, unsigned w, unsigned h, char* image) { stream_.clear(); stream_.seekg(0, std::ios_base::beg); @@ -159,7 +159,7 @@ void jpeg_reader::read(unsigned x0, unsigned y0, unsigned w, unsigned h, char jpeg_create_decompress(&cinfo); attach_stream(&cinfo, &stream_); int ret = jpeg_read_header(&cinfo, TRUE); - if (ret != JPEG_HEADER_OK) throw image_reader_exception("JPEG Reader read(): failed to read header"); + if (ret != JPEG_HEADER_OK) throw ImageReaderException("JPEG Reader read(): failed to read header"); jpeg_start_decompress(&cinfo); JSAMPARRAY buffer; int row_stride; @@ -198,6 +198,6 @@ void jpeg_reader::read(unsigned x0, unsigned y0, unsigned w, unsigned h, char jpeg_finish_decompress(&cinfo); } -template class jpeg_reader; +template class JpegReader; }} diff --git a/platform/default/png_reader.cpp b/platform/default/png_reader.cpp index 507db715a4..cf96ca2363 100644 --- a/platform/default/png_reader.cpp +++ b/platform/default/png_reader.cpp @@ -18,7 +18,7 @@ namespace mbgl { namespace util { void user_error_fn(png_structp /*png_ptr*/, png_const_charp error_msg) { - throw image_reader_exception(std::string("failed to read invalid png: '") + error_msg + "'"); + throw ImageReaderException(std::string("failed to read invalid png: '") + error_msg + "'"); } void user_warning_fn(png_structp /*png_ptr*/, png_const_charp warning_msg) @@ -28,7 +28,7 @@ void user_warning_fn(png_structp /*png_ptr*/, png_const_charp warning_msg) } template -void png_reader::png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) +void PngReader::png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) { input_stream * fin = reinterpret_cast(png_get_io_ptr(png_ptr)); fin->read(reinterpret_cast(data), length); @@ -40,7 +40,7 @@ void png_reader::png_read_data(png_structp png_ptr, png_bytep data, png_size_ } template -png_reader::png_reader(char const* data, std::size_t size) +PngReader::PngReader(char const* data, std::size_t size) : source_(data,size), stream_(source_), width_(0), @@ -50,36 +50,36 @@ png_reader::png_reader(char const* data, std::size_t size) has_alpha_(false) { - if (!stream_) throw image_reader_exception("PNG reader: cannot open image stream"); + if (!stream_) throw ImageReaderException("PNG reader: cannot open image stream"); init(); } template -png_reader::~png_reader() {} +PngReader::~PngReader() {} template -void png_reader::init() +void PngReader::init() { png_byte header[8]; std::memset(header,0,8); stream_.read(reinterpret_cast(header),8); if ( stream_.gcount() != 8) { - throw image_reader_exception("PNG reader: Could not read image"); + throw ImageReaderException("PNG reader: Could not read image"); } int is_png=!png_sig_cmp(header,0,8); if (!is_png) { - throw image_reader_exception("File or stream is not a png"); + throw ImageReaderException("File or stream is not a png"); } png_structp png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING,0,0,0); if (!png_ptr) { - throw image_reader_exception("failed to allocate png_ptr"); + throw ImageReaderException("failed to allocate png_ptr"); } // catch errors in a custom way to avoid the need for setjmp @@ -88,7 +88,7 @@ void png_reader::init() png_infop info_ptr; png_struct_guard sguard(&png_ptr,&info_ptr); info_ptr = png_create_info_struct(png_ptr); - if (!info_ptr) throw image_reader_exception("failed to create info_ptr"); + if (!info_ptr) throw ImageReaderException("failed to create info_ptr"); png_set_read_fn(png_ptr, (png_voidp)&stream_, png_read_data); @@ -103,19 +103,19 @@ void png_reader::init() } template -unsigned png_reader::width() const +unsigned PngReader::width() const { return width_; } template -unsigned png_reader::height() const +unsigned PngReader::height() const { return height_; } template -void png_reader::read(unsigned x0, unsigned y0, unsigned w, unsigned h, char * image) +void PngReader::read(unsigned x0, unsigned y0, unsigned w, unsigned h, char * image) { stream_.clear(); stream_.seekg(0, std::ios_base::beg); @@ -125,7 +125,7 @@ void png_reader::read(unsigned x0, unsigned y0, unsigned w, unsigned h, char if (!png_ptr) { - throw image_reader_exception("failed to allocate png_ptr"); + throw ImageReaderException("failed to allocate png_ptr"); } // catch errors in a custom way to avoid the need for setjmp @@ -134,7 +134,7 @@ void png_reader::read(unsigned x0, unsigned y0, unsigned w, unsigned h, char png_infop info_ptr; png_struct_guard sguard(&png_ptr,&info_ptr); info_ptr = png_create_info_struct(png_ptr); - if (!info_ptr) throw image_reader_exception("failed to create info_ptr"); + if (!info_ptr) throw ImageReaderException("failed to create info_ptr"); png_set_read_fn(png_ptr, (png_voidp)&stream_, png_read_data); png_read_info(png_ptr, info_ptr); @@ -195,6 +195,6 @@ void png_reader::read(unsigned x0, unsigned y0, unsigned w, unsigned h, char png_read_end(png_ptr,0); } -template class png_reader; +template class PngReader; }} -- cgit v1.2.1