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

further cleanup png struct handling - refs #1783

Browse source
This commit is contained in:
Dane Springmeyer 2013-04-09 17:43:15 -07:00
parent 97eda69015
commit 6e29ceb55f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/png_reader.cpp
View file

@ -153,6 +153,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");
png_set_read_fn(png_ptr, (png_voidp)fp, png_read_data);
@ -198,6 +199,7 @@ void png_reader::read(unsigned x0, unsigned y0,image_data_32& image)
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");
png_set_read_fn(png_ptr, (png_voidp)fp, png_read_data);
png_read_info(png_ptr, info_ptr);
@ -258,6 +260,5 @@ void png_reader::read(unsigned x0, unsigned y0,image_data_32& image)
//END
}
png_read_end(png_ptr,0);
png_destroy_read_struct(&png_ptr, &info_ptr,0);
}
}