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

fix sprite.cpp compile on linux - refs #27

Browse Source
This commit is contained in:
Dane Springmeyer
2014-02-03 23:02:02 +00:00
parent 4a7ccfdeee
commit 5b783f4eb1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/style/sprite.cpp
View File

@@ -124,7 +124,7 @@ void Sprite::loadImage(const std::string& data) {
Buffer buffer(data);
if (buffer.length < 8 || !png_check_sig((png_const_bytep)buffer.data, 8)) {
if (buffer.length < 8 || !png_check_sig((const png_bytep)buffer.data, 8)) {
fprintf(stderr, "image is not a valid PNG image\n");
return;
}
@@ -140,7 +140,7 @@ void Sprite::loadImage(const std::string& data) {
try {
png_set_read_fn(png, (png_voidp)&buffer, readCallback);
png_read_info(png, info);
png_get_IHDR(png, info, &width, &height, &depth, &color, &interlace, NULL, NULL);
png_get_IHDR(png, info, (png_uint_32*)&width, (png_uint_32*)&height, &depth, &color, &interlace, NULL, NULL);
bool alpha = (color & PNG_COLOR_MASK_ALPHA) || png_get_valid(png, info, PNG_INFO_tRNS);
// From http://trac.mapnik.org/browser/trunk/src/png_reader.cpp