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

[casparcg] / modules / bluefish / util / memory.h

diff --git a/modules/bluefish/util/memory.h b/modules/bluefish/util/memory.h
index 9299fdb1f8f5690847f555e8b4224b8e940c53eb..3de2922800fe2929f4a0db0bfe48117d98716d61 100644 (file)
--- a/modules/bluefish/util/memory.h
+++ b/modules/bluefish/util/memory.h
@@ -1,64 +1,64 @@
-/*\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 <Windows.h>\r
-\r
-#include <BlueVelvet4.h>\r
-\r
-#include <common/page_locked_allocator.h>\r
-\r
-#include <vector>\r
-\r
-namespace caspar { namespace bluefish {\r
-       \r
-static const size_t MAX_HANC_BUFFER_SIZE = 256*1024;\r
-static const size_t MAX_VBI_BUFFER_SIZE = 36*1920*4;\r
-\r
-struct blue_dma_buffer\r
-{\r
-public:\r
-       blue_dma_buffer(int image_size, int id) \r
-               : id_(id)\r
-               , image_size_(image_size)\r
-               , hanc_size_(MAX_HANC_BUFFER_SIZE)\r
-               , image_buffer_(image_size_)\r
-               , hanc_buffer_(hanc_size_){}\r
-                       \r
-       int id() const {return id_;}\r
-\r
-       PBYTE image_data() { return image_buffer_.data(); }\r
-       PBYTE hanc_data() { return hanc_buffer_.data(); }\r
-\r
-       size_t image_size() const { return image_size_; }\r
-       size_t hanc_size() const { return hanc_size_; }\r
-\r
-private:       \r
-       int id_;\r
-       size_t image_size_;\r
-       size_t hanc_size_;\r
-       std::vector<BYTE, page_locked_allocator<BYTE>> image_buffer_;   \r
-       std::vector<BYTE, page_locked_allocator<BYTE>> hanc_buffer_;\r
-};\r
-typedef std::shared_ptr<blue_dma_buffer> blue_dma_buffer_ptr;\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 <Windows.h>
+
+#include <BlueVelvet4.h>
+
+#include <common/page_locked_allocator.h>
+
+#include <vector>
+
+namespace caspar { namespace bluefish {
+       
+static const size_t MAX_HANC_BUFFER_SIZE = 256*1024;
+static const size_t MAX_VBI_BUFFER_SIZE = 36*1920*4;
+
+struct blue_dma_buffer
+{
+public:
+       blue_dma_buffer(int image_size, int id) 
+               : id_(id)
+               , image_size_(image_size)
+               , hanc_size_(MAX_HANC_BUFFER_SIZE)
+               , image_buffer_(image_size_)
+               , hanc_buffer_(hanc_size_){}
+                       
+       int id() const {return id_;}
+
+       PBYTE image_data() { return image_buffer_.data(); }
+       PBYTE hanc_data() { return hanc_buffer_.data(); }
+
+       size_t image_size() const { return image_size_; }
+       size_t hanc_size() const { return hanc_size_; }
+
+private:       
+       int id_;
+       size_t image_size_;
+       size_t hanc_size_;
+       std::vector<BYTE, page_locked_allocator<BYTE>> image_buffer_;   
+       std::vector<BYTE, page_locked_allocator<BYTE>> hanc_buffer_;
+};
+typedef std::shared_ptr<blue_dma_buffer> blue_dma_buffer_ptr;
+
 }}
\ No newline at end of file