tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix linux build

Browse Source
This commit is contained in:
artemp
2014-11-14 11:26:59 +01:00
committed by Leith Bade
parent 0a532cc420
commit 447bec6281
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/default/jpeg_reader.cpp
View File

@@ -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<boost::iostreams::array_source>(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<T>::height() const
}
template <typename T>
void jpeg_reader<T>::read(unsigned x0, unsigned y0, unsigned width, unsigned height, char* image)
void jpeg_reader<T>::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<T>::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<unsigned int[]> out_row(new unsigned int[w]);
unsigned row = 0;

4
platform/default/png_reader.cpp
View File

@@ -74,8 +74,8 @@ image_reader* create_png_reader2(char const * data, std::size_t size)
return new png_reader<boost::iostreams::array_source>(data, size);
}
const bool registered = register_image_reader("png",create_png_reader);
const bool registered2 = register_image_reader("png", create_png_reader2);
const static bool registered = register_image_reader("png",create_png_reader);
const static bool registered2 = register_image_reader("png", create_png_reader2);
}