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

[casparcg] / core / mixer / image / blend_modes.h

diff --git a/core/mixer/image/blend_modes.h b/core/mixer/image/blend_modes.h
index cdf044f33b9c41e70aef62157c9dd68d54fa9305..8d57fa9208ce6104c71b5983a7545c1826a10f56 100644 (file)
--- a/core/mixer/image/blend_modes.h
+++ b/core/mixer/image/blend_modes.h
@@ -1,69 +1,69 @@
-/*\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/enum_class.h>\r
-\r
-namespace caspar { namespace core {\r
-               \r
-struct blend_mode_def\r
-{\r
-       enum type\r
-       {\r
-               normal = 0,\r
-               lighten,\r
-               darken,\r
-               multiply,\r
-               average,\r
-               add,\r
-               subtract,\r
-               difference,\r
-               negation,\r
-               exclusion,\r
-               screen,\r
-               overlay,\r
-               soft_light,\r
-               hard_light,\r
-               color_dodge,\r
-               color_burn,\r
-               linear_dodge,\r
-               linear_burn,\r
-               linear_light,\r
-               vivid_light,\r
-               pin_light,\r
-               hard_mix,\r
-               reflect,\r
-               glow,\r
-               phoenix,\r
-               contrast,\r
-               saturation,\r
-               color,\r
-               luminosity,\r
-               mix,\r
-               blend_mode_count \r
-       };\r
-};\r
-typedef enum_class<blend_mode_def> blend_mode;\r
-\r
-blend_mode get_blend_mode(const std::wstring& str);\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/enum_class.h>
+
+namespace caspar { namespace core {
+               
+struct blend_mode_def
+{
+       enum type
+       {
+               normal = 0,
+               lighten,
+               darken,
+               multiply,
+               average,
+               add,
+               subtract,
+               difference,
+               negation,
+               exclusion,
+               screen,
+               overlay,
+               soft_light,
+               hard_light,
+               color_dodge,
+               color_burn,
+               linear_dodge,
+               linear_burn,
+               linear_light,
+               vivid_light,
+               pin_light,
+               hard_mix,
+               reflect,
+               glow,
+               phoenix,
+               contrast,
+               saturation,
+               color,
+               luminosity,
+               mix,
+               blend_mode_count 
+       };
+};
+typedef enum_class<blend_mode_def> blend_mode;
+
+blend_mode get_blend_mode(const std::wstring& str);
+
 }}
\ No newline at end of file