From b62da09cbfd118b432b179f0a56304c31bf69b7f Mon Sep 17 00:00:00 2001 From: artemp Date: Fri, 14 Nov 2014 11:26:59 +0100 Subject: fix linux build --- platform/default/jpeg_reader.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'platform/default/jpeg_reader.cpp') diff --git a/platform/default/jpeg_reader.cpp b/platform/default/jpeg_reader.cpp index 3f69337927..c838b2821c 100644 --- a/platform/default/jpeg_reader.cpp +++ b/platform/default/jpeg_reader.cpp @@ -61,7 +61,7 @@ public: unsigned height() const; inline bool has_alpha() const { return false; } inline bool premultiplied_alpha() const { return true; } - void read(unsigned x,unsigned y, unsigned width, unsigned height, char *image); + void read(unsigned x,unsigned y, unsigned w, unsigned h, char *image); private: void init(); static void on_error(j_common_ptr cinfo); @@ -85,8 +85,8 @@ image_reader* create_jpeg_reader2(char const* data, size_t size) return new jpeg_reader(data, size); } -const bool registered = register_image_reader("jpeg",create_jpeg_reader); -const bool registered2 = register_image_reader("jpeg",create_jpeg_reader2); +const static bool registered = register_image_reader("jpeg",create_jpeg_reader); +const static bool registered2 = register_image_reader("jpeg",create_jpeg_reader2); } // ctors @@ -234,7 +234,7 @@ unsigned jpeg_reader::height() const } template -void jpeg_reader::read(unsigned x0, unsigned y0, unsigned width, unsigned height, char* image) +void jpeg_reader::read(unsigned x0, unsigned y0, unsigned w, unsigned h, char* image) { stream_.clear(); stream_.seekg(0, std::ios_base::beg); @@ -256,8 +256,8 @@ void jpeg_reader::read(unsigned x0, unsigned y0, unsigned width, unsigned hei row_stride = cinfo.output_width * cinfo.output_components; buffer = (*cinfo.mem->alloc_sarray) ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1); - unsigned w = std::min(width,width_ - x0); - unsigned h = std::min(height,height_ - y0); + w = std::min(w,width_ - x0); + h = std::min(h,height_ - y0); const std::unique_ptr out_row(new unsigned int[w]); unsigned row = 0; -- cgit v1.2.1