diff --git a/.idea/misc.xml b/.idea/misc.xml index 54d5acd..5c9f89f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt index c59a225..8bfff53 100644 --- a/app/src/main/cpp/CMakeLists.txt +++ b/app/src/main/cpp/CMakeLists.txt @@ -40,17 +40,17 @@ set(CMAKE_CXX_FLAGS "-Wall -Wextra ${CMAKE_CXX_FLAGS}") #set(CMAKE_CXX_FLAGS_RELEASE "-O2 -Os -DNDEBUG") #TODO check that the definitions are all needed. Do they have impact outside of our code? -if(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7-a) +if (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7-a) add_definitions(-DARCH_ARM_USE_INTRINSICS -DARCH_ARM_HAVE_VFP) set(ASM_SOURCES - Blur_neon.S) -endif() + Blur_neon.S) +endif () -if(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) +if (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) add_definitions(-DARCH_ARM_USE_INTRINSICS -DARCH_ARM64_USE_INTRINSICS -DARCH_ARM64_HAVE_NEON) set(ASM_SOURCES - Blur_advsimd.S) -endif() + Blur_advsimd.S) +endif () # TODO add also for x86 # Creates and names a library, sets it as either STATIC @@ -59,16 +59,16 @@ endif() # Gradle automatically packages shared libraries with your APK. add_library(# Sets the name of the library. - renderscript-toolkit - # Sets the library as a shared library. - SHARED - # Provides a relative path to your source file(s). - Blur.cpp - JniEntryPoints.cpp - RenderScriptToolkit.cpp - TaskProcessor.cpp - Utils.cpp - ${ASM_SOURCES}) + renderscript-toolkit + # Sets the library as a shared library. + SHARED + # Provides a relative path to your source file(s). + Blur.cpp + JniEntryPoints.cpp + RenderScriptToolkit.cpp + TaskProcessor.cpp + Utils.cpp + ${ASM_SOURCES}) # Searches for a specified prebuilt library and stores the path as a # variable. Because CMake includes system libraries in the search path by @@ -77,23 +77,23 @@ add_library(# Sets the name of the library. # completing its build. find_library(# Sets the name of the path variable. - log-lib - # Specifies the name of the NDK library that - # you want CMake to locate. - log ) + log-lib + # Specifies the name of the NDK library that + # you want CMake to locate. + log) # Specifies libraries CMake should link to your target library. You # can link multiple libraries, such as libraries you define in this # build script, prebuilt third-party libraries, or system libraries. target_link_libraries(# Specifies the target library. - renderscript-toolkit + renderscript-toolkit - cpufeatures - jnigraphics - # Links the target library to the log library - # included in the NDK. - ${log-lib} ) + cpufeatures + jnigraphics + # Links the target library to the log library + # included in the NDK. + ${log-lib}) include(AndroidNdkModules) android_ndk_import_module_cpufeatures() diff --git a/app/src/main/cpp/README.md b/app/src/main/cpp/README.md index ca1560f..0746c1d 100644 --- a/app/src/main/cpp/README.md +++ b/app/src/main/cpp/README.md @@ -3,17 +3,20 @@ Taken from https://github.com/android/renderscript-intrinsics-replacement-toolkit with changes from https://github.com/Wesley-Ong/renderscript-intrinsics-replacement-toolkit and the following modifications: -* [Remove all functions but blur](https://github.com/Wesley-Ong/renderscript-intrinsics-replacement-toolkit/commit/254feae0d250cbc6768f18933f8db3e91cb249dc) (by Wesley-Ong) -* Update Gradle/Gradle wrapper -* Update Java -* Update Kotlin -* Update Kotlin libraries -* Update SDK -* Update NDK -* Set minSdkVersion to 29 -* Set targetSdkVersion to 33 -* Remove unused dependencies -* Move namespace declaration into build.gradle + +* [Remove all functions but blur](https://github.com/Wesley-Ong/renderscript-intrinsics-replacement-toolkit/commit/254feae0d250cbc6768f18933f8db3e91cb249dc) ( + by Wesley-Ong) +* Update Gradle/Gradle wrapper +* Update Java +* Update Kotlin +* Update Kotlin libraries +* Update SDK +* Update NDK +* Set minSdkVersion to 29 +* Set targetSdkVersion to 33 +* Remove unused dependencies +* Move namespace declaration into build.gradle +* Add function to blur a bitmap multiple times ``` diff --git a/app/src/main/java/com/google/android/renderscript/README.md b/app/src/main/java/com/google/android/renderscript/README.md index ca1560f..0746c1d 100644 --- a/app/src/main/java/com/google/android/renderscript/README.md +++ b/app/src/main/java/com/google/android/renderscript/README.md @@ -3,17 +3,20 @@ Taken from https://github.com/android/renderscript-intrinsics-replacement-toolkit with changes from https://github.com/Wesley-Ong/renderscript-intrinsics-replacement-toolkit and the following modifications: -* [Remove all functions but blur](https://github.com/Wesley-Ong/renderscript-intrinsics-replacement-toolkit/commit/254feae0d250cbc6768f18933f8db3e91cb249dc) (by Wesley-Ong) -* Update Gradle/Gradle wrapper -* Update Java -* Update Kotlin -* Update Kotlin libraries -* Update SDK -* Update NDK -* Set minSdkVersion to 29 -* Set targetSdkVersion to 33 -* Remove unused dependencies -* Move namespace declaration into build.gradle + +* [Remove all functions but blur](https://github.com/Wesley-Ong/renderscript-intrinsics-replacement-toolkit/commit/254feae0d250cbc6768f18933f8db3e91cb249dc) ( + by Wesley-Ong) +* Update Gradle/Gradle wrapper +* Update Java +* Update Kotlin +* Update Kotlin libraries +* Update SDK +* Update NDK +* Set minSdkVersion to 29 +* Set targetSdkVersion to 33 +* Remove unused dependencies +* Move namespace declaration into build.gradle +* Add function to blur a bitmap multiple times ```