Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / render / image.h
index 5d4e99401b23f03ebd5b7460f2371f47c09f34ba..d7fc31e3ab1d5d024f5fe43725c2635942f4e39d 100644 (file)
@@ -23,6 +23,7 @@
 #include "util/util_image.h"
 #include "util/util_string.h"
 #include "util/util_thread.h"
+#include "util/util_unique_ptr.h"
 #include "util/util_vector.h"
 
 CCL_NAMESPACE_BEGIN
@@ -145,8 +146,7 @@ private:
        vector<Image*> images[IMAGE_DATA_NUM_TYPES];
        void *osl_texture_system;
 
-       bool file_load_image_generic(Image *img,
-                                    ImageInput **in);
+       bool file_load_image_generic(Image *img, unique_ptr<ImageInput> *in);
 
        template<TypeDesc::BASETYPE FileFormat,
                 typename StorageType,