diff --git a/CMakeLists.txt b/CMakeLists.txt index 38a98622..ff2c7c55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,7 +131,7 @@ if (LOTTIE_ASAN) endif() if (NOT LIB_INSTALL_DIR) - set (LIB_INSTALL_DIR "/usr/lib") + set (LIB_INSTALL_DIR "/usr/local/lib") endif (NOT LIB_INSTALL_DIR) #declare source and include files diff --git a/src/vector/vdrawhelper_neon.cpp b/src/vector/vdrawhelper_neon.cpp index 681eabbc..e178012f 100644 --- a/src/vector/vdrawhelper_neon.cpp +++ b/src/vector/vdrawhelper_neon.cpp @@ -2,28 +2,20 @@ #include "vdrawhelper.h" -extern "C" void pixman_composite_src_n_8888_asm_neon(int32_t w, int32_t h, - uint32_t *dst, - int32_t dst_stride, - uint32_t src); - -extern "C" void pixman_composite_over_n_8888_asm_neon(int32_t w, int32_t h, - uint32_t *dst, - int32_t dst_stride, - uint32_t src); - void memfill32(uint32_t *dest, uint32_t value, int length) { - pixman_composite_src_n_8888_asm_neon(length, 1, dest, length, value); + memset(dest, value, length); } static void color_SourceOver(uint32_t *dest, int length, uint32_t color, uint32_t const_alpha) { + int ialpha, i; if (const_alpha != 255) color = BYTE_MUL(color, const_alpha); - pixman_composite_over_n_8888_asm_neon(length, 1, dest, length, color); + ialpha = 255 - vAlpha(color); + for (i = 0; i < length; ++i) dest[i] = color + BYTE_MUL(dest[i], ialpha); } void RenderFuncTable::neon()