2.0.0.2:

[casparcg] / common / utility / memory.cpp

diff --git a/common/utility/memory.cpp b/common/utility/memory.cpp
index 7f6d38391e265849d1a958886a9efc94f524b455..704dc7044450c6cf968cc762cfb8c38c79609738 100644 (file)
--- a/common/utility/memory.cpp
+++ b/common/utility/memory.cpp
@@ -9,7 +9,7 @@
 \r
 namespace caspar { namespace common {\r
        \r
-void* memcpy_SSE2(void* dest, const void* source, size_t num)\r
+void* aligned_memcpy(void* dest, const void* source, size_t num)\r
 {      \r
        __asm\r
        {\r
@@ -53,14 +53,14 @@ void* memcpy_SSE2(void* dest, const void* source, size_t num)
        return dest;\r
 }\r
 \r
-void* aligned_memcpy(void* dest, const void* source, size_t num)\r
+void* aligned_parallel_memcpy(void* dest, const void* source, size_t num)\r
 {      \r
        if(num < 128)\r
                return memcpy(dest, source, num);\r
 \r
        tbb::parallel_for(tbb::blocked_range<size_t>(0, num/128), [&](const tbb::blocked_range<size_t>& r)\r
        {\r
-               memcpy_SSE2(reinterpret_cast<char*>(dest) + r.begin()*128, reinterpret_cast<const char*>(source) + r.begin()*128, r.size()*128);\r
+               aligned_memcpy(reinterpret_cast<char*>(dest) + r.begin()*128, reinterpret_cast<const char*>(source) + r.begin()*128, r.size()*128);\r
        }, tbb::affinity_partitioner());\r
 \r
        return dest;\r