From 9cf163e6732de5dce5b1d3b4ff7cbe19ba3a094b Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 7 Nov 2018 10:15:50 -0800 Subject: minui: GRSurface manages data with std::unique_ptr. Test: Run recovery_unit_test on marlin. Test: `Run graphics test` on taimen. Change-Id: I34bd862049900b0030f2840a92a7fa3e02fa2c10 --- minui/resources.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'minui/resources.cpp') diff --git a/minui/resources.cpp b/minui/resources.cpp index 9027bc668..c7af1904d 100644 --- a/minui/resources.cpp +++ b/minui/resources.cpp @@ -46,24 +46,19 @@ std::unique_ptr GRSurface::Create(int width, int height, int row_byte auto result = std::unique_ptr(new GRSurface(width, height, row_bytes, pixel_bytes)); result->data_size_ = (data_size + kSurfaceDataAlignment - 1) / kSurfaceDataAlignment * kSurfaceDataAlignment; - result->data_ = static_cast(aligned_alloc(kSurfaceDataAlignment, result->data_size_)); - if (result->data_ == nullptr) return nullptr; + result->data_.reset( + static_cast(aligned_alloc(kSurfaceDataAlignment, result->data_size_))); + if (!result->data_) return nullptr; return result; } std::unique_ptr GRSurface::Clone() const { auto result = GRSurface::Create(width, height, row_bytes, pixel_bytes, data_size_); - memcpy(result->data_, data_, data_size_); + if (!result) return nullptr; + memcpy(result->data(), data(), data_size_); return result; } -GRSurface::~GRSurface() { - if (data_ != nullptr) { - free(data_); - data_ = nullptr; - } -} - PngHandler::PngHandler(const std::string& name) { std::string res_path = g_resource_dir + "/" + name + ".png"; png_fp_.reset(fopen(res_path.c_str(), "rbe")); -- cgit v1.2.3