From 710bc535f45570428f0c7b36bb4f20744247cb38 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 24 Oct 2018 07:59:49 -0700 Subject: minui: Remove the default and copy ctors for GRSurface. As well as all the derived classes. Instances must be created with Create(). A default copy ctor would mess up the ownership of the mapped or allocated buffer in these classes, so that has been explicitly removed. Test: mmma -j bootable/recovery Test: Run recovery_unit_test on marlin. Test: `Run graphics test` on blueline. Change-Id: I69ce001a9ec9e3ac851edb6ec4d3fa11f4aaea08 --- minui/include/minui/minui.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'minui/include') diff --git a/minui/include/minui/minui.h b/minui/include/minui/minui.h index 66d992b93..d6881e9a0 100644 --- a/minui/include/minui/minui.h +++ b/minui/include/minui/minui.h @@ -24,13 +24,14 @@ #include #include +#include + // // Graphics. // class GRSurface { public: - GRSurface() = default; virtual ~GRSurface(); // Creates and returns a GRSurface instance that's sufficient for storing an image of the given @@ -58,6 +59,8 @@ class GRSurface { private: uint8_t* data_{ nullptr }; + + DISALLOW_COPY_AND_ASSIGN(GRSurface); }; struct GRFont { -- cgit v1.2.3