2.0 image_mixer: Refactored, core: Fixed destruction proxy usage.

[casparcg] / core / mixer / image / image_kernel.h

diff --git a/core/mixer/image/image_kernel.h b/core/mixer/image/image_kernel.h
index 6b0fd32ef7355d5bd8385579a3fa8c825173a483..2af0d5bcf60bb4326bf2f18809bc0e3b5484acf6 100644 (file)
--- a/core/mixer/image/image_kernel.h
+++ b/core/mixer/image/image_kernel.h
@@ -24,7 +24,7 @@
 #include <common/memory/safe_ptr.h>\r
 \r
 #include <core/producer/frame/pixel_format.h>\r
-#include <core/producer/frame/image_transform.h>\r
+#include <core/producer/frame/frame_transform.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
@@ -37,9 +37,10 @@ struct render_item
 {\r
        pixel_format_desc                                               pix_desc;\r
        std::vector<safe_ptr<device_buffer>>    textures;\r
-       image_transform                                                 transform;\r
-       const void*                                                             tag;\r
+       frame_transform                                                 transform;\r
        blend_mode::type                                                blend_mode;\r
+\r
+       render_item() : blend_mode(blend_mode::normal){}\r
 };\r
 \r
 bool operator==(const render_item& lhs, const render_item& rhs);\r