git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

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

diff --git a/core/producer/frame/image_transform.cpp b/core/producer/frame/image_transform.cpp
index 357b1524eafea739ad60862272b9e9869d0554d9..23ba503ab17d960328f8a04d487a5cc5589f9224 100644 (file)
--- a/core/producer/frame/image_transform.cpp
+++ b/core/producer/frame/image_transform.cpp
@@ -34,7 +34,7 @@ image_transform::image_transform()
        , contrast_(1.0)\r
        , saturation_(1.0)\r
        , is_key_(false)\r
-       , deinterlace_(false)\r
+       , is_atomic_(false)\r
        , blend_mode_(image_transform::blend_mode::normal)\r
 {\r
        std::fill(fill_translation_.begin(), fill_translation_.end(), 0.0);\r
@@ -148,14 +148,14 @@ std::array<double, 2> image_transform::get_clip_scale() const
        return clip_scale_;\r
 }\r
 \r
-void image_transform::set_deinterlace(bool value)\r
+void image_transform::set_is_atomic(bool value)\r
 {\r
-       deinterlace_ = value;\r
+       is_atomic_ = value;\r
 }\r
 \r
-bool image_transform::get_deinterlace() const\r
+bool image_transform::get_is_atomic() const\r
 {\r
-       return deinterlace_;\r
+       return is_atomic_;\r
 }\r
 \r
 void image_transform::set_blend_mode(image_transform::blend_mode::type value)\r
@@ -185,7 +185,7 @@ image_transform& image_transform::operator*=(const image_transform &other)
 \r
        levels_.gamma                   *= other.levels_.gamma;\r
 \r
-       deinterlace_                    |= other.deinterlace_;\r
+       is_atomic_                              |= other.is_atomic_;\r
        is_key_                                 |= other.is_key_;\r
        fill_translation_[0]    += other.fill_translation_[0]*fill_scale_[0];\r
        fill_translation_[1]    += other.fill_translation_[1]*fill_scale_[1];\r
@@ -216,7 +216,7 @@ image_transform tween(double time, const image_transform& source, const image_tr
        image_transform result; \r
        result.set_blend_mode           (std::max(source.get_blend_mode(), dest.get_blend_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_is_atomic            (source.get_is_atomic() | dest.get_is_atomic());\r
        result.set_gain                         (do_tween(time, source.get_gain(), dest.get_gain(), duration, tweener));\r
        result.set_brightness           (do_tween(time, source.get_brightness(), dest.get_brightness(), duration, tweener));\r
        result.set_contrast                     (do_tween(time, source.get_contrast(), dest.get_contrast(), duration, tweener));\r