sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

+ better naming

Browse source
This commit is contained in:
artemp 2013-05-13 10:26:04 +01:00
parent 677a0a68c6
commit dbcffe6179
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/png_reader.cpp
View file

@ -42,7 +42,7 @@ template <typename T>
class png_reader : public image_reader class png_reader : public image_reader
{ {
typedef T source_type; typedef T source_type;
typedef boost::iostreams::stream<source_type> ifstream; typedef boost::iostreams::stream<source_type> input_stream;
struct png_struct_guard struct png_struct_guard
{ {
@ -61,14 +61,14 @@ class png_reader : public image_reader
private: private:
source_type source_; source_type source_;
ifstream stream_; input_stream stream_;
unsigned width_; unsigned width_;
unsigned height_; unsigned height_;
int bit_depth_; int bit_depth_;
int color_type_; int color_type_;
public: public:
explicit png_reader(std::string const& file_name); explicit png_reader(std::string const& file_name);
explicit png_reader(char const* data, std::size_t size); png_reader(char const* data, std::size_t size);
~png_reader(); ~png_reader();
unsigned width() const; unsigned width() const;
unsigned height() const; unsigned height() const;
@ -110,7 +110,7 @@ void user_warning_fn(png_structp png_ptr, png_const_charp warning_msg)
template <typename T> template <typename T>
void png_reader<T>::png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) void png_reader<T>::png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
{ {
ifstream * fin = reinterpret_cast<ifstream*>(png_get_io_ptr(png_ptr)); input_stream * fin = reinterpret_cast<input_stream*>(png_get_io_ptr(png_ptr));
fin->read(reinterpret_cast<char*>(data), length); fin->read(reinterpret_cast<char*>(data), length);
if (fin->gcount() != length) if (fin->gcount() != length)
{ {
@ -128,7 +128,7 @@ png_reader<T>::png_reader(std::string const& file_name)
color_type_(0) color_type_(0)
{ {
if (!stream_) throw image_reader_exception("cannot open image file "+ file_name); if (!stream_) throw image_reader_exception("PNG reader: cannot open file "+ file_name);
init(); init();
} }