]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 22 Aug 2011 07:25:12 +0000 (07:25 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 22 Aug 2011 07:25:12 +0000 (07:25 +0000)
modules/image/producer/image_scroll_producer.cpp

index c722ae9b288e95dc3f7fab9b69ffdfaac834e80c..6e888e59fbee8769761c63b296eea2137bb2b406 100644 (file)
@@ -167,7 +167,7 @@ struct image_scroll_producer : public core::frame_producer
                        for(size_t n = 0; n < frames_.size(); ++n)\r
                        {\r
                                frames_[n]->get_frame_transform().fill_translation[0] = start_offset_[0];\r
-                               frames_[n]->get_frame_transform().fill_translation[0] = start_offset_[1] -0.5*(n+1) + delta_ * 0.5/static_cast<double>(format_desc_.height);\r
+                               frames_[n]->get_frame_transform().fill_translation[1] = start_offset_[1] - (n+1) + delta_ * 0.5/static_cast<double>(format_desc_.height);\r
                        }\r
                }\r
                else\r
@@ -177,7 +177,7 @@ struct image_scroll_producer : public core::frame_producer
 \r
                        for(size_t n = 0; n < frames_.size(); ++n)\r
                        {\r
-                               frames_[n]->get_frame_transform().fill_translation[0] = start_offset_[0] -0.5*(n+1) + delta_ * 0.5/static_cast<double>(format_desc_.height);                            \r
+                               frames_[n]->get_frame_transform().fill_translation[0] = start_offset_[0] - (n+1) + delta_ * 0.5/static_cast<double>(format_desc_.width);                                \r
                                frames_[n]->get_frame_transform().fill_translation[1] = start_offset_[1];\r
                        }\r
                }\r
@@ -200,12 +200,12 @@ struct image_scroll_producer : public core::frame_producer
                if(height_ > format_desc_.height)\r
                {\r
                        auto length = (height_ - format_desc_.height);\r
-                       return (length/std::abs(speed_) + length % std::abs(delta_));\r
+                       return length/std::abs(speed_);// + length % std::abs(delta_));\r
                }\r
                else\r
                {\r
                        auto length = (width_ - format_desc_.width);\r
-                       auto result = (length/std::abs(speed_) + length % std::abs(delta_));\r
+                       auto result = length/std::abs(speed_);// + length % std::abs(delta_));\r
                        return result;\r
                }\r
        }\r