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

use RAII for resource management

Browse source
This commit is contained in:
artemp 2014-12-05 18:00:27 +01:00
parent fc0894634c
commit ce605e3982
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/tiff_reader.cpp
View file

@ -485,7 +485,7 @@ void tiff_reader<T>::read_tiled(unsigned x0,unsigned y0,image_data_rgba8& image)
TIFF* tif = open(stream_); TIFF* tif = open(stream_);
if (tif) if (tif)
{ {
uint32* buf = (uint32*)_TIFFmalloc(tile_width_*tile_height_*sizeof(uint32)); std::unique_ptr<uint32[]> buf(new uint32_t[tile_width_*tile_height_]);
int width=image.width(); int width=image.width();
int height=image.height(); int height=image.height();
@ -507,7 +507,7 @@ void tiff_reader<T>::read_tiled(unsigned x0,unsigned y0,image_data_rgba8& image)
for (int x=start_x;x<end_x;x+=tile_width_) for (int x=start_x;x<end_x;x+=tile_width_)
{ {
if (!TIFFReadRGBATile(tif,x,y,buf)) if (!TIFFReadRGBATile(tif,x,y,buf.get()))
{ {
MAPNIK_LOG_ERROR(tiff_reader) << "TIFFReadRGBATile failed"; MAPNIK_LOG_ERROR(tiff_reader) << "TIFFReadRGBATile failed";
break; break;
@ -523,7 +523,6 @@ void tiff_reader<T>::read_tiled(unsigned x0,unsigned y0,image_data_rgba8& image)
} }
} }
} }
_TIFFfree(buf);
} }
} }
@ -533,8 +532,7 @@ void tiff_reader<T>::read_stripped(unsigned x0,unsigned y0,image_data_rgba8& ima
TIFF* tif = open(stream_); TIFF* tif = open(stream_);
if (tif) if (tif)
{ {
uint32* buf = (uint32*)_TIFFmalloc(width_*rows_per_strip_*sizeof(uint32)); std::unique_ptr<uint32[]> buf(new uint32_t[width_*rows_per_strip_]);
int width=image.width(); int width=image.width();
int height=image.height(); int height=image.height();
@ -551,7 +549,7 @@ void tiff_reader<T>::read_stripped(unsigned x0,unsigned y0,image_data_rgba8& ima
ty0 = std::max(y0,y)-y; ty0 = std::max(y0,y)-y;
ty1 = std::min(height+y0,y+rows_per_strip_)-y; ty1 = std::min(height+y0,y+rows_per_strip_)-y;
if (!TIFFReadRGBAStrip(tif,y,buf)) if (!TIFFReadRGBAStrip(tif,y,buf.get()))
{ {
MAPNIK_LOG_ERROR(tiff_reader) << "TIFFReadRGBAStrip failed"; MAPNIK_LOG_ERROR(tiff_reader) << "TIFFReadRGBAStrip failed";
break; break;
@ -566,7 +564,6 @@ void tiff_reader<T>::read_stripped(unsigned x0,unsigned y0,image_data_rgba8& ima
++row; ++row;
} }
} }
_TIFFfree(buf);
} }
} }