2.0.0.2:

[casparcg] / common / utility / memory.cpp

diff --git a/common/utility/memory.cpp b/common/utility/memory.cpp
index 0be280d318873aea14f9f0a3044c833adf2cb3e4..7f6d38391e265849d1a958886a9efc94f524b455 100644 (file)
--- a/common/utility/memory.cpp
+++ b/common/utility/memory.cpp
@@ -53,8 +53,11 @@ void* memcpy_SSE2(void* dest, const void* source, size_t num)
        return dest;\r
 }\r
 \r
-void* copy(void* dest, const void* source, size_t num)\r
+void* aligned_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