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-10 09:44:37 +01:00
parent ef64b4937c
commit 917d346093
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/mapnik/tiff_io.hpp
View file

@ -268,6 +268,8 @@ void set_tiff_config(TIFF* output, tiff_config & config)
template <typename T1, typename T2> template <typename T1, typename T2>
void save_as_tiff(T1 & file, T2 const& image, tiff_config & config) void save_as_tiff(T1 & file, T2 const& image, tiff_config & config)
{ {
using pixel_type = typename T2::pixel_type;
const int width = image.width(); const int width = image.width();
const int height = image.height(); const int height = image.height();
@ -309,16 +311,14 @@ void save_as_tiff(T1 & file, T2 const& image, tiff_config & config)
TIFFSetField(output, TIFFTAG_ROWSPERSTRIP, 1); TIFFSetField(output, TIFFTAG_ROWSPERSTRIP, 1);
int next_scanline = 0; int next_scanline = 0;
typename T2::pixel_type * row = reinterpret_cast<typename T2::pixel_type*>(::operator new(image.getRowSize())); std::unique_ptr<pixel_type[]> row (new pixel_type[image.getRowSize()]);
while (next_scanline < height) while (next_scanline < height)
{ {
memcpy(row, image.getRow(next_scanline), image.getRowSize()); memcpy(row.get(), image.getRow(next_scanline), image.getRowSize());
//typename T2::pixel_type * row = const_cast<typename T2::pixel_type *>(image.getRow(next_scanline)); //typename T2::pixel_type * row = const_cast<typename T2::pixel_type *>(image.getRow(next_scanline));
TIFFWriteScanline(output, row, next_scanline, 0); TIFFWriteScanline(output, row.get(), next_scanline, 0);
++next_scanline; ++next_scanline;
} }
::operator delete(row);
} }
else else
{ {
@ -326,11 +326,10 @@ void save_as_tiff(T1 & file, T2 const& image, tiff_config & config)
TIFFSetField(output, TIFFTAG_TILELENGTH, height); TIFFSetField(output, TIFFTAG_TILELENGTH, height);
TIFFSetField(output, TIFFTAG_TILEDEPTH, 1); TIFFSetField(output, TIFFTAG_TILEDEPTH, 1);
// Process as tiles // Process as tiles
typename T2::pixel_type * image_data = reinterpret_cast<typename T2::pixel_type*>(::operator new(image.getSize())); std::unique_ptr<pixel_type[]> image_data (new pixel_type[image.getSize()]);
memcpy(image_data, image.getData(), image.getSize()); memcpy(image_data.get(), image.getData(), image.getSize());
//typename T2::pixel_type * image_data = const_cast<typename T2::pixel_type *>(image.getData()); //typename T2::pixel_type * image_data = const_cast<typename T2::pixel_type *>(image.getData());
TIFFWriteTile(output, image_data, 0, 0, 0, 0); TIFFWriteTile(output, image_data.get(), 0, 0, 0, 0);
::operator delete(image_data);
} }
// TODO - handle palette images // TODO - handle palette images
// std::vector<mapnik::rgb> const& palette // std::vector<mapnik::rgb> const& palette