From eeec66f307cf2f29468aa6d8bae2b26efaec3098 Mon Sep 17 00:00:00 2001 From: David Capello Date: Mon, 19 Nov 2018 23:35:45 -0300 Subject: [PATCH] Minor change ImageRef::reset(nullptr) -> reset() --- src/app/file/file.cpp | 6 +++--- src/app/util/expand_cel_canvas.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/file/file.cpp b/src/app/file/file.cpp index 6b0d068f9..6e1192ab4 100644 --- a/src/app/file/file.cpp +++ b/src/app/file/file.cpp @@ -594,7 +594,7 @@ void FileOp::operate(IFileOpProgress* progress) } old_image = m_seq.image.get(); - m_seq.image.reset(NULL); + m_seq.image.reset(); m_seq.last_cel = NULL; }; @@ -792,7 +792,7 @@ void FileOp::operate(IFileOpProgress* progress) m_filename = *m_seq.filename_list.begin(); // Destroy the image - m_seq.image.reset(NULL); + m_seq.image.reset(); } // Direct save to a file. else { @@ -1173,7 +1173,7 @@ FileOp::FileOp(FileOpType type, Context* context) , m_embeddedColorProfile(false) { m_seq.palette = nullptr; - m_seq.image.reset(nullptr); + m_seq.image.reset(); m_seq.progress_offset = 0.0f; m_seq.progress_fraction = 0.0f; m_seq.frame = frame_t(0); diff --git a/src/app/util/expand_cel_canvas.cpp b/src/app/util/expand_cel_canvas.cpp index 19250000f..2f71666d3 100644 --- a/src/app/util/expand_cel_canvas.cpp +++ b/src/app/util/expand_cel_canvas.cpp @@ -241,7 +241,7 @@ void ExpandCelCanvas::rollback() static_cast(m_layer)->removeCel(m_cel); delete m_cel; - m_celImage.reset(NULL); + m_celImage.reset(); } m_closed = true;