2.0.0.2:

[casparcg] / core / frame / gpu_composite_frame.cpp

diff --git a/core/frame/gpu_composite_frame.cpp b/core/frame/gpu_composite_frame.cpp
index 917fb1f3428703d32ab4a5fe3a6b75cd4c6dcc69..9ee2951ea7084a92e4946e4c92e0db621e5b2a5c 100644 (file)
--- a/core/frame/gpu_composite_frame.cpp
+++ b/core/frame/gpu_composite_frame.cpp
@@ -37,11 +37,11 @@ struct gpu_composite_frame::implementation : boost::noncopyable
                boost::range::for_each(frames_, std::mem_fn(&gpu_frame::end_read));     \r
        }\r
 \r
-       void draw()\r
+       void draw(const gpu_frame_transform_ptr& transform)\r
        {\r
                glPushMatrix();\r
                glTranslated(self_->x()*2.0, self_->y()*2.0, 0.0);\r
-               boost::range::for_each(frames_, std::mem_fn(&gpu_frame::draw));\r
+               boost::range::for_each(frames_, std::bind(&gpu_frame::draw, std::placeholders::_1, transform));\r
                glPopMatrix();\r
        }\r
                \r
@@ -69,7 +69,7 @@ struct gpu_composite_frame::implementation : boost::noncopyable
                }\r
        }\r
 \r
-       unsigned char* data()\r
+       unsigned char* data(size_t index)\r
        {\r
                BOOST_THROW_EXCEPTION(invalid_operation());\r
        }\r
@@ -87,8 +87,8 @@ void gpu_composite_frame::begin_write(){impl_->begin_write();}
 void gpu_composite_frame::end_write(){impl_->end_write();}     \r
 void gpu_composite_frame::begin_read(){impl_->begin_read();}\r
 void gpu_composite_frame::end_read(){impl_->end_read();}\r
-void gpu_composite_frame::draw(){impl_->draw();}\r
-unsigned char* gpu_composite_frame::data(){return impl_->data();}\r
+void gpu_composite_frame::draw(const gpu_frame_transform_ptr& transform){impl_->draw(transform);}\r
+unsigned char* gpu_composite_frame::data(size_t index){return impl_->data(index);}\r
 void gpu_composite_frame::add(const gpu_frame_ptr& frame){impl_->add(frame);}\r
 \r
 gpu_frame_ptr gpu_composite_frame::interlace(const gpu_frame_ptr& frame1,\r