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

[casparcg] / core / frame / draw_frame.h

diff --git a/core/frame/draw_frame.h b/core/frame/draw_frame.h
index b353ffe6dfc0cd03d641cf27cb163283981760b6..6f188a858abcd5606ecf895a4f51d11b3bd5b75f 100644 (file)
--- a/core/frame/draw_frame.h
+++ b/core/frame/draw_frame.h
@@ -1,82 +1,82 @@
-/*\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 "frame_visitor.h"\r
-\r
-#include <core/video_format.h>\r
-\r
-#include <common/memory.h>\r
-\r
-#include <vector>\r
-\r
-namespace caspar { namespace core {\r
-       \r
-struct frame_transform;\r
-\r
-class draw_frame sealed\r
-{\r
-public:                \r
-       // Static Members\r
-\r
-       static draw_frame interlace(draw_frame frame1, draw_frame frame2, core::field_mode mode);\r
-       static draw_frame over(draw_frame frame1, draw_frame frame2);\r
-       static draw_frame mask(draw_frame fill, draw_frame key);\r
-       static draw_frame still(draw_frame frame);\r
-       static draw_frame push(draw_frame frame);\r
-               \r
-       static const draw_frame& empty();\r
-       static const draw_frame& late();\r
-\r
-       // Constructors\r
-\r
-       draw_frame();\r
-       draw_frame(const draw_frame& other);\r
-       draw_frame(draw_frame&& other); \r
-       explicit draw_frame(class const_frame&& frame);\r
-       explicit draw_frame(class mutable_frame&& frame);\r
-       explicit draw_frame(std::vector<draw_frame> frames);\r
-\r
-       ~draw_frame();\r
-       \r
-       // Methods\r
-\r
-       draw_frame& operator=(draw_frame other);\r
-\r
-       void swap(draw_frame& other);   \r
-       \r
-       void accept(frame_visitor& visitor) const;\r
-\r
-       bool operator==(const draw_frame& other) const;\r
-       bool operator!=(const draw_frame& other) const;\r
-\r
-       // Properties\r
-\r
-       const core::frame_transform&    transform() const;\r
-       core::frame_transform&                  transform();                    \r
-private:\r
-       struct impl;\r
-       spl::unique_ptr<impl> impl_;\r
-};\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 "frame_visitor.h"
+
+#include <core/video_format.h>
+
+#include <common/memory.h>
+
+#include <vector>
+
+namespace caspar { namespace core {
+       
+struct frame_transform;
+
+class draw_frame sealed
+{
+public:                
+       // Static Members
+
+       static draw_frame interlace(draw_frame frame1, draw_frame frame2, core::field_mode mode);
+       static draw_frame over(draw_frame frame1, draw_frame frame2);
+       static draw_frame mask(draw_frame fill, draw_frame key);
+       static draw_frame still(draw_frame frame);
+       static draw_frame push(draw_frame frame);
+               
+       static const draw_frame& empty();
+       static const draw_frame& late();
+
+       // Constructors
+
+       draw_frame();
+       draw_frame(const draw_frame& other);
+       draw_frame(draw_frame&& other); 
+       explicit draw_frame(class const_frame&& frame);
+       explicit draw_frame(class mutable_frame&& frame);
+       explicit draw_frame(std::vector<draw_frame> frames);
+
+       ~draw_frame();
+       
+       // Methods
+
+       draw_frame& operator=(draw_frame other);
+
+       void swap(draw_frame& other);   
+       
+       void accept(frame_visitor& visitor) const;
+
+       bool operator==(const draw_frame& other) const;
+       bool operator!=(const draw_frame& other) const;
+
+       // Properties
+
+       const core::frame_transform&    transform() const;
+       core::frame_transform&                  transform();                    
+private:
+       struct impl;
+       spl::unique_ptr<impl> impl_;
+};
+       
+
 }}
\ No newline at end of file