2.0. - Removed alpha-mode.

[casparcg] / core / producer / frame / image_transform.cpp

diff --git a/core/producer/frame/image_transform.cpp b/core/producer/frame/image_transform.cpp
index 3aaee6d08d4d5e93a5355c831ec3adc940c8f440..357b1524eafea739ad60862272b9e9869d0554d9 100644 (file)
--- a/core/producer/frame/image_transform.cpp
+++ b/core/producer/frame/image_transform.cpp
@@ -36,7 +36,6 @@ image_transform::image_transform()
        , is_key_(false)\r
        , deinterlace_(false)\r
        , blend_mode_(image_transform::blend_mode::normal)\r
-       , alpha_mode_(image_transform::alpha_mode::normal)\r
 {\r
        std::fill(fill_translation_.begin(), fill_translation_.end(), 0.0);\r
        std::fill(fill_scale_.begin(), fill_scale_.end(), 1.0);\r
@@ -169,21 +168,10 @@ image_transform::blend_mode::type image_transform::get_blend_mode() const
        return blend_mode_;\r
 }\r
 \r
-void image_transform::set_alpha_mode(image_transform::alpha_mode::type value)\r
-{\r
-       alpha_mode_ = value;\r
-}\r
-\r
-image_transform::alpha_mode::type image_transform::get_alpha_mode() const\r
-{\r
-       return alpha_mode_;\r
-}\r
-\r
 image_transform& image_transform::operator*=(const image_transform &other)\r
 {\r
        opacity_                                *= other.opacity_;      \r
        blend_mode_                              = std::max(blend_mode_, other.blend_mode_);\r
-       alpha_mode_                              = std::max(alpha_mode_, other.alpha_mode_);\r
        gain_                                   *= other.gain_;\r
        brightness_                             *= other.brightness_;\r
        contrast_                               *= other.contrast_;\r
@@ -227,7 +215,6 @@ image_transform tween(double time, const image_transform& source, const image_tr
        \r
        image_transform result; \r
        result.set_blend_mode           (std::max(source.get_blend_mode(), dest.get_blend_mode()));\r
-       result.set_alpha_mode           (std::max(source.get_alpha_mode(), dest.get_alpha_mode()));\r
        result.set_is_key                       (source.get_is_key() | dest.get_is_key());\r
        result.set_deinterlace          (source.get_deinterlace() | dest.get_deinterlace());\r
        result.set_gain                         (do_tween(time, source.get_gain(), dest.get_gain(), duration, tweener));\r
@@ -320,14 +307,6 @@ image_transform::blend_mode::type get_blend_mode(const std::wstring& str)
        return image_transform::blend_mode::normal;\r
 }\r
 \r
-image_transform::alpha_mode::type get_alpha_mode(const std::wstring& str)\r
-{\r
-       if(boost::iequals(str, L"normal"))\r
-               return image_transform::alpha_mode::normal;\r
-\r
-       return image_transform::alpha_mode::normal;\r
-}\r
-\r
 bool operator<(const image_transform& lhs, const image_transform& rhs)\r
 {\r
        return memcmp(&lhs, &rhs, sizeof(image_transform)) < 0;\r