set svn:eol-style native on .h and .cpp files

[casparcg] / accelerator / ogl / image / image_mixer.h

diff --git a/accelerator/ogl/image/image_mixer.h b/accelerator/ogl/image/image_mixer.h
index 6411672a96a1bc6c59418610b7d9fc37ed7f5fd8..12b3105bb27cc7a7752da6866f374a936463a22a 100644 (file)
--- a/accelerator/ogl/image/image_mixer.h
+++ b/accelerator/ogl/image/image_mixer.h
@@ -1,76 +1,76 @@
-/*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
-*\r
-* This file is part of CasparCG (www.casparcg.com).\r
-*\r
-* CasparCG is free software: you can redistribute it and/or modify\r
-* it under the terms of the GNU General Public License as published by\r
-* the Free Software Foundation, either version 3 of the License, or\r
-* (at your option) any later version.\r
-*\r
-* CasparCG is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-* GNU General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU General Public License\r
-* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-* Author: Robert Nagy, ronag89@gmail.com\r
-*/\r
-\r
-#pragma once\r
-\r
-#include <common/forward.h>\r
-#include <common/memory.h>\r
-#include <common/future_fwd.h>\r
-\r
-#include <core/mixer/image/blend_modes.h>\r
-#include <core/mixer/image/image_mixer.h>\r
-\r
-#include <core/frame/frame_visitor.h>\r
-#include <core/video_format.h>\r
-\r
-FORWARD2(caspar, core, class frame);\r
-FORWARD2(caspar, core, struct pixel_format_desc);\r
-FORWARD2(caspar, core, struct video_format_desc);\r
-FORWARD2(caspar, core, class mutable_frame);\r
-FORWARD2(caspar, core, struct frame_transform);\r
-\r
-namespace caspar { namespace accelerator { namespace ogl {\r
-       \r
-class image_mixer sealed : public core::image_mixer\r
-{\r
-       image_mixer(const image_mixer&);\r
-       image_mixer& operator=(const image_mixer&);\r
-public:\r
-\r
-       // Static Members\r
-       \r
-       // Constructors\r
-\r
-       image_mixer(const spl::shared_ptr<class device>& ogl);\r
-       ~image_mixer();\r
-\r
-       // Methods\r
-                       \r
-       boost::unique_future<array<const std::uint8_t>> operator()(const core::video_format_desc& format_desc) override;                \r
-       core::mutable_frame create_frame(const void* tag, const core::pixel_format_desc& desc) override;\r
-\r
-       // core::image_mixer\r
-       \r
-       void begin_layer(core::blend_mode blend_mode) override;\r
-       void end_layer() override;\r
-\r
-       void push(const core::frame_transform& frame) override;\r
-       void visit(const core::const_frame& frame) override;\r
-       void pop() override;\r
-                       \r
-       // Properties\r
-\r
-private:\r
-       struct impl;\r
-       spl::unique_ptr<impl> impl_;\r
-};\r
-\r
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+
+#pragma once
+
+#include <common/forward.h>
+#include <common/memory.h>
+#include <common/future_fwd.h>
+
+#include <core/mixer/image/blend_modes.h>
+#include <core/mixer/image/image_mixer.h>
+
+#include <core/frame/frame_visitor.h>
+#include <core/video_format.h>
+
+FORWARD2(caspar, core, class frame);
+FORWARD2(caspar, core, struct pixel_format_desc);
+FORWARD2(caspar, core, struct video_format_desc);
+FORWARD2(caspar, core, class mutable_frame);
+FORWARD2(caspar, core, struct frame_transform);
+
+namespace caspar { namespace accelerator { namespace ogl {
+       
+class image_mixer sealed : public core::image_mixer
+{
+       image_mixer(const image_mixer&);
+       image_mixer& operator=(const image_mixer&);
+public:
+
+       // Static Members
+       
+       // Constructors
+
+       image_mixer(const spl::shared_ptr<class device>& ogl);
+       ~image_mixer();
+
+       // Methods
+                       
+       boost::unique_future<array<const std::uint8_t>> operator()(const core::video_format_desc& format_desc) override;                
+       core::mutable_frame create_frame(const void* tag, const core::pixel_format_desc& desc) override;
+
+       // core::image_mixer
+       
+       void begin_layer(core::blend_mode blend_mode) override;
+       void end_layer() override;
+
+       void push(const core::frame_transform& frame) override;
+       void visit(const core::const_frame& frame) override;
+       void pop() override;
+                       
+       // Properties
+
+private:
+       struct impl;
+       spl::unique_ptr<impl> impl_;
+};
+
 }}}
\ No newline at end of file