use unique_ptr for automatic deallocation

This commit is contained in:
Konstantin Käfer
2014-10-29 16:00:09 -04:00
parent b3e0f75e4a
commit 414ccaaf93
2 changed files with 13 additions and 15 deletions

View File

@@ -2,8 +2,7 @@
#define MBGL_UTIL_IMAGE
#include <string>
#include <cstring>
#include <stdexcept>
#include <memory>
namespace mbgl {
namespace util {
@@ -14,9 +13,8 @@ std::string compress_png(int width, int height, void *rgba, bool flip = false);
class Image {
public:
Image(const std::string &img, bool flip = false);
~Image();
inline const char *getData() const { return img; }
inline const char *getData() const { return img.get(); }
inline uint32_t getWidth() const { return width; }
inline uint32_t getHeight() const { return height; }
@@ -25,7 +23,7 @@ private:
uint32_t width = 0, height = 0;
// the raw image data
char *img = nullptr;
std::unique_ptr<char[]> img;
};

View File

@@ -1,12 +1,17 @@
#include <mbgl/util/image.hpp>
#include <mbgl/util/std.hpp>
#include <png.h>
#include <cassert>
#include <cstdlib>
#include <stdexcept>
std::string mbgl::util::compress_png(int width, int height, void *rgba, bool flip) {
namespace mbgl {
namespace util {
std::string compress_png(int width, int height, void *rgba, bool flip) {
png_voidp error_ptr = 0;
png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, error_ptr, NULL, NULL);
if (!png_ptr) {
@@ -54,9 +59,6 @@ std::string mbgl::util::compress_png(int width, int height, void *rgba, bool fli
}
using namespace mbgl::util;
struct Buffer {
Buffer(const std::string& data_)
: data(data_.data()), length(data_.size()) {}
@@ -139,9 +141,9 @@ Image::Image(const std::string &data, bool flip) {
png_size_t rowbytes = png_get_rowbytes(png, info);
assert(width * 4 == rowbytes);
img = static_cast<char*>(::operator new(width * height * 4));
img = ::std::unique_ptr<char[]>(new char[width * height * 4]());
char *surface = img;
char *surface = img.get();
assert(surface);
struct ptrs {
@@ -163,14 +165,12 @@ Image::Image(const std::string &data, bool flip) {
fprintf(stderr, "loading PNG failed: %s\n", e.what());
png_destroy_read_struct(&png, &info, nullptr);
if (img) {
::operator delete(img);
img = nullptr;
img.reset();
}
width = 0;
height = 0;
}
}
Image::~Image() {
::operator delete(img),img = nullptr;
}
}