diff options
author | Martijn Berger <martijn.berger@gmail.com> | 2015-03-29 23:12:22 +0300 |
---|---|---|
committer | Martijn Berger <martijn.berger@gmail.com> | 2015-03-29 23:12:40 +0300 |
commit | f01456aaa4a87cd76feaef50ec822340197f9eda (patch) | |
tree | 5e4147b31def6462158b2ecd269df55ea1679c53 /intern/cycles/render/image.h | |
parent | 70d9c013257906d3e894907b92e693d1ccebd7fd (diff) |
Optionally use c++11 stuff instead of boost in cycles where possible. We do and continue to depend on boost though
Reviewers: dingto, sergey
Reviewed By: sergey
Subscribers: #cycles
Differential Revision: https://developer.blender.org/D1185
Diffstat (limited to 'intern/cycles/render/image.h')
-rw-r--r-- | intern/cycles/render/image.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 2f5dcb6efd5..1045b4532e4 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -73,9 +73,9 @@ public: bool need_update; - boost::function<void(const string &filename, void *data, bool &is_float, int &width, int &height, int &depth, int &channels)> builtin_image_info_cb; - boost::function<bool(const string &filename, void *data, unsigned char *pixels)> builtin_image_pixels_cb; - boost::function<bool(const string &filename, void *data, float *pixels)> builtin_image_float_pixels_cb; + function<void(const string &filename, void *data, bool &is_float, int &width, int &height, int &depth, int &channels)> builtin_image_info_cb; + function<bool(const string &filename, void *data, unsigned char *pixels)> builtin_image_pixels_cb; + function<bool(const string &filename, void *data, float *pixels)> builtin_image_float_pixels_cb; struct Image { string filename; |