diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-13 16:32:32 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-13 16:32:32 +0300 |
commit | b8cb08fa56ac3c0f831f91d925083742e442c97a (patch) | |
tree | 300b9f616efc05103b64b51108724e21dbcd3a76 /intern/cycles/app | |
parent | 5b6cb2de9afb958bec0cec8058a4ef5292141001 (diff) | |
parent | 2947882bb1dbc457182a9cb653770c5956417840 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/app')
-rw-r--r-- | intern/cycles/app/cycles_standalone.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index 1ec8d18f410..ff2e0156b1a 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -32,6 +32,7 @@ #include "util/util_string.h" #include "util/util_time.h" #include "util/util_transform.h" +#include "util/util_unique_ptr.h" #include "util/util_version.h" #ifdef WITH_CYCLES_STANDALONE_GUI @@ -92,7 +93,7 @@ static bool write_render(const uchar *pixels, int w, int h, int channels) string msg = string_printf("Writing image %s", options.output_path.c_str()); session_print(msg); - ImageOutput *out = ImageOutput::create(options.output_path); + unique_ptr<ImageOutput> out = unique_ptr<ImageOutput>(ImageOutput::create(options.output_path)); if(!out) { return false; } @@ -110,7 +111,6 @@ static bool write_render(const uchar *pixels, int w, int h, int channels) AutoStride); out->close(); - delete out; return true; } |