From d0dc041275ae9b0eae64a5776159bfbcdba35bc5 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Sun, 19 Jan 2020 11:24:51 +0100 Subject: [PATCH] Another default operator= and copy constructor --- libraries/image/src/image/Image.h | 2 +- libraries/shared/src/shared/MediaTypeLibrary.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/image/src/image/Image.h b/libraries/image/src/image/Image.h index dd39383dfb..14aa12d11a 100644 --- a/libraries/image/src/image/Image.h +++ b/libraries/image/src/image/Image.h @@ -59,7 +59,7 @@ namespace image { Image() : _dims(0,0) {} Image(int width, int height, Format format); Image(const QImage& data) : _packedData(data), _dims(data.width(), data.height()), _format((Format)data.format()) {} - + Image(const Image &other) = default; void operator=(const QImage& other) { _packedData = other; _floatData.clear(); diff --git a/libraries/shared/src/shared/MediaTypeLibrary.h b/libraries/shared/src/shared/MediaTypeLibrary.h index c87da01fa1..d4931c1601 100644 --- a/libraries/shared/src/shared/MediaTypeLibrary.h +++ b/libraries/shared/src/shared/MediaTypeLibrary.h @@ -48,6 +48,7 @@ public: webMediaTypes(mediaType.webMediaTypes), fileSignatures(mediaType.fileSignatures) { } + MediaType& operator=(const MediaType&) = default; static MediaType NONE;