diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-12 19:10:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-13 16:00:36 +0300 |
| commit | 3866161da855d2b35ac48ef55958bcb567d4a740 (patch) | |
| tree | e019dee67c4149dbaecae6bd2c60972e3fadcacb /intern/cycles/render/denoising.h | |
| parent | 2a9c8da709593b5b6187002797d9bb4363440bd5 (diff) | |
Fix T61457, T61489, T61482: build errors and memory warning in Cycles.
For OIIO 2.x we must use unique_ptr. This also required updating the
guarded allocator for std::move to work. Since C++11 construct/destroy
have a default implementation that also works this case, so we just
leave it out.
Diffstat (limited to 'intern/cycles/render/denoising.h')
| -rw-r--r-- | intern/cycles/render/denoising.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/render/denoising.h b/intern/cycles/render/denoising.h index 15e690a2f45..85a1c7d0391 100644 --- a/intern/cycles/render/denoising.h +++ b/intern/cycles/render/denoising.h @@ -24,6 +24,7 @@ #include "util/util_string.h" #include "util/util_vector.h" +#include "util/util_unique_ptr.h" #include <OpenImageIO/imageio.h> @@ -84,7 +85,7 @@ struct DenoiseImageLayer { vector<int> input_to_image_channel; /* input_to_image_channel of the secondary frames, if any are used. */ - vector<vector<int> > neighbor_input_to_image_channel; + vector<vector<int>> neighbor_input_to_image_channel; /* Write i-th channel of the processing output to output_to_image_channel[i]-th channel of the file. */ vector<int> output_to_image_channel; @@ -116,8 +117,8 @@ public: array<float> pixels; /* Image file handles */ - ImageInput *in; - vector<ImageInput*> in_neighbors; + unique_ptr<ImageInput> in; + vector<unique_ptr<ImageInput>> in_neighbors; /* Render layers */ vector<DenoiseImageLayer> layers; |