pyanime4k 3.0.0__tar.gz → 3.0.1__tar.gz

{pyanime4k-3.0.0 → pyanime4k-3.0.1}/.github/workflows/wheels.yml

@@ -1,13 +1,5 @@
 name: Build wheels
 on:
-  push:
-    branches: [master]
-    paths:
-    - 'src/**'
-  pull_request:
-    branches: [master]
-    paths:
-    - 'src/**'
   release:
     types: [published]
 permissions:
@@ -61,9 +53,6 @@ jobs:
         with:
           submodules: true
 
-      - name: clone Anime4KCPP
-        run: mkdir -p src/Anime4KCPP && git clone https://github.com/TianZerL/Anime4KCPP.git src/Anime4KCPP
-
       - name: Build sdist
         run: pipx run build --sdist
 

pyanime4k-3.0.1/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/Anime4KCPP"]
+	path = src/Anime4KCPP
+	url = https://github.com/TianZerL/Anime4KCPP.git

{pyanime4k-3.0.0/pyanime4k.egg-info → pyanime4k-3.0.1}/PKG-INFO

@@ -1,12 +1,17 @@
 Metadata-Version: 2.4
 Name: pyanime4k
-Version: 3.0.0
+Version: 3.0.1
 License: MIT
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: POSIX
+Classifier: Operating System :: Unix
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: numpy
 Dynamic: license-file
-Dynamic: requires-python
 
 # PyAnime4K
 
@@ -21,9 +26,10 @@ pip install pyanime4k
 You can also build the wheel by yourself.
 ```shell
 # sudo apt install ocl-icd-opencl-dev cmake build-essential
-get clone https://github.com/TianZerL/pyanime4k.git
+get clone --recurse-submodules https://github.com/TianZerL/pyanime4k.git
 cd pyanime4k
-python setup.py bdist_wheel  
+pip install scikit-build
+python setup.py bdist_wheel
 ```
 
 # Usages

{pyanime4k-3.0.0 → pyanime4k-3.0.1}/README.md

@@ -11,9 +11,10 @@ pip install pyanime4k
 You can also build the wheel by yourself.
 ```shell
 # sudo apt install ocl-icd-opencl-dev cmake build-essential
-get clone https://github.com/TianZerL/pyanime4k.git
+get clone --recurse-submodules https://github.com/TianZerL/pyanime4k.git
 cd pyanime4k
-python setup.py bdist_wheel  
+pip install scikit-build
+python setup.py bdist_wheel
 ```
 
 # Usages

{pyanime4k-3.0.0 → pyanime4k-3.0.1/pyanime4k.egg-info}/PKG-INFO

@@ -1,12 +1,17 @@
 Metadata-Version: 2.4
 Name: pyanime4k
-Version: 3.0.0
+Version: 3.0.1
 License: MIT
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: POSIX
+Classifier: Operating System :: Unix
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: numpy
 Dynamic: license-file
-Dynamic: requires-python
 
 # PyAnime4K
 
@@ -21,9 +26,10 @@ pip install pyanime4k
 You can also build the wheel by yourself.
 ```shell
 # sudo apt install ocl-icd-opencl-dev cmake build-essential
-get clone https://github.com/TianZerL/pyanime4k.git
+get clone --recurse-submodules https://github.com/TianZerL/pyanime4k.git
 cd pyanime4k
-python setup.py bdist_wheel  
+pip install scikit-build
+python setup.py bdist_wheel
 ```
 
 # Usages

pyanime4k-3.0.1/pyanime4k.egg-info/SOURCES.txt

@@ -0,0 +1,127 @@
+.gitignore
+.gitmodules
+LICENSE
+README.md
+pyproject.toml
+setup.py
+.github/workflows/wheels.yml
+pyanime4k.egg-info/PKG-INFO
+pyanime4k.egg-info/SOURCES.txt
+pyanime4k.egg-info/dependency_links.txt
+pyanime4k.egg-info/requires.txt
+pyanime4k.egg-info/top_level.txt
+src/Anime4KCPP/.gitattributes
+src/Anime4KCPP/.gitignore
+src/Anime4KCPP/CMakeLists.txt
+src/Anime4KCPP/LICENSE-GPLv3
+src/Anime4KCPP/LICENSE-MIT
+src/Anime4KCPP/readme.md
+src/Anime4KCPP/binding/CMakeLists.txt
+src/Anime4KCPP/binding/c/CMakeLists.txt
+src/Anime4KCPP/binding/c/include/AC/Core.h
+src/Anime4KCPP/binding/c/src/Binding.cpp
+src/Anime4KCPP/binding/python/CMakeLists.txt
+src/Anime4KCPP/binding/python/src/Binding.cpp
+src/Anime4KCPP/cli/CMakeLists.txt
+src/Anime4KCPP/cli/include/Options.hpp
+src/Anime4KCPP/cli/include/ProgressBar.hpp
+src/Anime4KCPP/cli/src/Main.cpp
+src/Anime4KCPP/cli/src/Options.cpp
+src/Anime4KCPP/cli/src/ProgressBar.cpp
+src/Anime4KCPP/cmake/CheckCompiler.cmake
+src/Anime4KCPP/cmake/CheckOpenCLHPP.cmake
+src/Anime4KCPP/cmake/GenDSFilterRC.cmake
+src/Anime4KCPP/cmake/MinifierOpenCLKernel.cmake
+src/Anime4KCPP/cmake/dependency/avisynth.cmake
+src/Anime4KCPP/cmake/dependency/cli11.cmake
+src/Anime4KCPP/cmake/dependency/cuda.cmake
+src/Anime4KCPP/cmake/dependency/directshow.cmake
+src/Anime4KCPP/cmake/dependency/eigen3.cmake
+src/Anime4KCPP/cmake/dependency/ffmpeg.cmake
+src/Anime4KCPP/cmake/dependency/opencl.cmake
+src/Anime4KCPP/cmake/dependency/pybind11.cmake
+src/Anime4KCPP/cmake/dependency/qt.cmake
+src/Anime4KCPP/cmake/dependency/ruapu.cmake
+src/Anime4KCPP/cmake/dependency/stb.cmake
+src/Anime4KCPP/cmake/dependency/vapoursynth.cmake
+src/Anime4KCPP/core/CMakeLists.txt
+src/Anime4KCPP/core/include/AC/Core.hpp
+src/Anime4KCPP/core/include/AC/Specs.hpp
+src/Anime4KCPP/core/include/AC/Core/Dispatch.hpp
+src/Anime4KCPP/core/include/AC/Core/Image.hpp
+src/Anime4KCPP/core/include/AC/Core/Model.hpp
+src/Anime4KCPP/core/include/AC/Core/Parallel.hpp
+src/Anime4KCPP/core/include/AC/Core/Processor.hpp
+src/Anime4KCPP/core/include/AC/Core/Util.hpp
+src/Anime4KCPP/core/include/AC/Core/Model/ACNet.hpp
+src/Anime4KCPP/core/include/AC/Core/Model/ARNet.hpp
+src/Anime4KCPP/core/include/AC/Core/Model/Base.hpp
+src/Anime4KCPP/core/include/AC/Core/Model/Param.hpp
+src/Anime4KCPP/core/include/AC/Core/Model/Param/ACNet.p
+src/Anime4KCPP/core/include/AC/Core/Model/Param/ARNet.p
+src/Anime4KCPP/core/src/Image.cpp
+src/Anime4KCPP/core/src/ImageIO.cpp
+src/Anime4KCPP/core/src/ImageProcess.cpp
+src/Anime4KCPP/core/src/Model.cpp
+src/Anime4KCPP/core/src/Processor.cpp
+src/Anime4KCPP/core/src/cpu/CPUProcessor.cpp
+src/Anime4KCPP/core/src/cpu/Dispatch.cpp
+src/Anime4KCPP/core/src/cpu/Eigen3.cpp
+src/Anime4KCPP/core/src/cpu/Generic.cpp
+src/Anime4KCPP/core/src/cpu/arm/NEON.cpp
+src/Anime4KCPP/core/src/cpu/wasm/SIMD128.cpp
+src/Anime4KCPP/core/src/cpu/x86/AVX.cpp
+src/Anime4KCPP/core/src/cpu/x86/SSE.cpp
+src/Anime4KCPP/core/src/cuda/CUDAProcessor.cpp
+src/Anime4KCPP/core/src/cuda/Kernel.cu
+src/Anime4KCPP/core/src/opencl/Kernel.cl
+src/Anime4KCPP/core/src/opencl/OpenCLProcessor.cpp
+src/Anime4KCPP/filter/CMakeLists.txt
+src/Anime4KCPP/filter/avisynth/CMakeLists.txt
+src/Anime4KCPP/filter/avisynth/src/Filter.cpp
+src/Anime4KCPP/filter/directshow/CMakeLists.txt
+src/Anime4KCPP/filter/directshow/src/Filter.cpp
+src/Anime4KCPP/filter/vapoursynth/CMakeLists.txt
+src/Anime4KCPP/filter/vapoursynth/src/Filter.cpp
+src/Anime4KCPP/gui/CMakeLists.txt
+src/Anime4KCPP/gui/include/Config.hpp
+src/Anime4KCPP/gui/include/Logger.hpp
+src/Anime4KCPP/gui/include/MainWindow.hpp
+src/Anime4KCPP/gui/include/Upscaler.hpp
+src/Anime4KCPP/gui/languages/ac_gui_zh_CN.ts
+src/Anime4KCPP/gui/src/Config.cpp
+src/Anime4KCPP/gui/src/Logger.cpp
+src/Anime4KCPP/gui/src/MainWindow.cpp
+src/Anime4KCPP/gui/src/QtMain.cpp
+src/Anime4KCPP/gui/src/Upscaler.cpp
+src/Anime4KCPP/gui/ui/MainWindow.ui
+src/Anime4KCPP/images/Logo.ico
+src/Anime4KCPP/images/Logo.png
+src/Anime4KCPP/test/CMakeLists.txt
+src/Anime4KCPP/test/util/CMakeLists.txt
+src/Anime4KCPP/test/util/src/Channel.cpp
+src/Anime4KCPP/test/video/CMakeLists.txt
+src/Anime4KCPP/test/video/src/Resize.cpp
+src/Anime4KCPP/test/wasm/CMakeLists.txt
+src/Anime4KCPP/test/wasm/src/Web.cpp
+src/Anime4KCPP/tools/CMakeLists.txt
+src/Anime4KCPP/tools/benchmark/CMakeLists.txt
+src/Anime4KCPP/tools/benchmark/src/Benchmark.cpp
+src/Anime4KCPP/util/CMakeLists.txt
+src/Anime4KCPP/util/include/AC/Util/Channel.hpp
+src/Anime4KCPP/util/include/AC/Util/Defer.hpp
+src/Anime4KCPP/util/include/AC/Util/Stopwatch.hpp
+src/Anime4KCPP/util/include/AC/Util/ThreadLocal.hpp
+src/Anime4KCPP/util/include/AC/Util/ThreadPool.hpp
+src/Anime4KCPP/video/CMakeLists.txt
+src/Anime4KCPP/video/include/AC/Video.hpp
+src/Anime4KCPP/video/include/AC/Video/Filter.hpp
+src/Anime4KCPP/video/include/AC/Video/Pipeline.hpp
+src/Anime4KCPP/video/src/Filter.cpp
+src/Anime4KCPP/video/src/Pipeline.cpp
+src/pyanime4k/__init__.py
+src/pyanime4k/image_io.py
+src/pyanime4k/info.py
+src/pyanime4k/processor.py
+src/pyanime4k/upscale.py
+src/pyanime4k/pyac/__init__.py

pyanime4k-3.0.1/pyanime4k.egg-info/requires.txt

@@ -0,0 +1 @@
+numpy

{pyanime4k-3.0.0 → pyanime4k-3.0.1}/pyproject.toml

@@ -1,17 +1,24 @@
 [build-system]
-requires = ["setuptools>=42", "scikit-build>=0.13", "cmake>=3.19", "numpy"]
+requires = ["setuptools>=42", "scikit-build>=0.13", "cmake>=3.19"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyanime4k"
-version = "3.0.0"
+version = "3.0.1"
 license = {text = "MIT"}
 requires-python = ">=3.8"
 readme = "README.md"
+dependencies = ["numpy"]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: MacOS",
+    "Operating System :: POSIX",
+    "Operating System :: Unix",
+]
 
 [tool.cibuildwheel]
 skip = ["pp*", "*win32", "*i686", "*musllinux*"]
 
 [tool.cibuildwheel.linux]
-before-all = "yum install -y ocl-icd ocl-icd-devel && mkdir -p src/Anime4KCPP && git clone https://github.com/TianZerL/Anime4KCPP.git src/Anime4KCPP"
-test-command = "echo 'installed'"
+before-all = "yum install -y ocl-icd ocl-icd-devel"

{pyanime4k-3.0.0 → pyanime4k-3.0.1}/setup.py

@@ -28,19 +28,8 @@ def main():
         pyac_cmake_args.append("-DAC_CORE_WITH_CUDA=ON")
 
     setup(
-        name="pyanime4k",
-        version="3.0.0",
         packages=["pyanime4k", "pyanime4k.pyac"],
         package_dir={"pyanime4k": "src/pyanime4k", "pyanime4k.pyac": "src/pyanime4k/pyac"},
-        license="MIT",
-        python_requires=">=3.8",
-        classifiers=[
-            "Programming Language :: Python :: 3",
-            "Operating System :: Microsoft :: Windows",
-            "Operating System :: MacOS",
-            "Operating System :: POSIX",
-            "Operating System :: Unix",
-        ],
         cmake_args=pyac_cmake_args,
         cmake_source_dir="src/Anime4KCPP",
         cmake_install_dir="src/pyanime4k",

{pyanime4k-3.0.0/src/Anime4kCPP → pyanime4k-3.0.1/src/Anime4KCPP}/CMakeLists.txt

@@ -37,7 +37,7 @@ option(AC_CORE_WITH_WASM_SIMD128 "build core with wasm simd128" ${AC_COMPILER_SU
 option(AC_CORE_WITH_OPENCL "build core with opencl" OFF)
 option(AC_CORE_WITH_CUDA "build core with cuda" OFF)
 option(AC_CORE_ENABLE_FAST_MATH "enable fast math for core" OFF)
-option(AC_CORE_ENABLE_IMAGE_IO "enable image file read and write for core" ON)
+option(AC_CORE_DISABLE_IMAGE_IO "disable image file read and write for core" OFF)
 option(AC_BUILD_CLI "build cli" ON)
 option(AC_BUILD_GUI "build gui" OFF)
 option(AC_BUILD_VIDEO "build video module" OFF)
@@ -61,7 +61,6 @@ if(AC_PRESET_RELEASE)
     set(AC_CORE_WITH_OPENCL ON)
     set(AC_CORE_WITH_CUDA ON)
     set(AC_CORE_ENABLE_FAST_MATH ON)
-    set(AC_CORE_ENABLE_IMAGE_IO ON)
     set(AC_BUILD_CLI ON)
     set(AC_BUILD_GUI ON)
     set(AC_BUILD_VIDEO ON)

{pyanime4k-3.0.0/src/Anime4kCPP → pyanime4k-3.0.1/src/Anime4KCPP}/binding/c/include/AC/Core.h

@@ -38,7 +38,13 @@ enum ac_imread_flag
 
 CAC_API ac_image* ac_image_create(int w, int h, int c, int element_type, void* data, int stride);
 CAC_API ac_image* ac_image_create_empty(void);
+CAC_API ac_image* ac_image_from(int w, int h, int c, int element_type, const void* data, int stride);
+CAC_API ac_image* ac_image_clone(const ac_image* image);
 CAC_API void ac_image_destroy(ac_image* image);
+CAC_API void ac_image_data_create(ac_image* image, int w, int h, int c, int element_type, int stride);
+CAC_API void ac_image_map(ac_image* image, int w, int h, int c, int element_type, void* data, int stride);
+CAC_API void ac_image_data_from(ac_image* image, int w, int h, int c, int element_type, const void* data, int stride);
+CAC_API void ac_image_to(const ac_image* image, void* data, int stride);
 CAC_API int ac_image_width(const ac_image* image);
 CAC_API int ac_image_height(const ac_image* image);
 CAC_API int ac_image_channels(const ac_image* image);
@@ -69,8 +75,10 @@ CAC_API const char* ac_processor_info(int processor_type);
 CAC_API int ac_processor_type(const char* processor_type_name);
 CAC_API const char* ac_processor_type_name(int processor_type);
 
-CAC_API void ac_imread(const char* filename, int flag, ac_image* image);
+#ifndef AC_CORE_DISABLE_IMAGE_IO
+CAC_API ac_image* ac_imread(const char* filename, int flag);
 CAC_API int ac_imwrite(const char* filename, const ac_image* image);
+#endif
 
 CAC_API void ac_resize(const ac_image* src, ac_image* dst, double fx, double fy);
 CAC_API void ac_rgb2yuv(const ac_image* rgb, ac_image* yuv);

{pyanime4k-3.0.0/src/Anime4kCPP → pyanime4k-3.0.1/src/Anime4KCPP}/binding/c/src/Binding.cpp

@@ -21,10 +21,36 @@ ac_image* ac_image_create_empty(void)
 {
     return new ac_image{};
 }
+ac_image* ac_image_from(const int w, const int h, const int c, const int element_type, const void* const data, const int stride)
+{
+    auto image = new ac_image{};
+    image->object.from(w, h, c, element_type, data, stride);
+    return image;
+}
+ac_image* ac_image_clone(const ac_image* const image)
+{
+    return new ac_image{ image->object.clone() };
+}
 void ac_image_destroy(ac_image* const image)
 {
     delete image;
 }
+void ac_image_data_create(ac_image* image, int w, int h, int c, int element_type, int stride)
+{
+    image->object.create(w, h, c, element_type, stride);
+}
+void ac_image_map(ac_image* image, int w, int h, int c, int element_type, void* data, int stride)
+{
+    image->object.map(w, h, c, element_type, data, stride);
+}
+void ac_image_data_from(ac_image* image, int w, int h, int c, int element_type, const void* data, int stride)
+{
+    image->object.from(w, h, c, element_type, data, stride);
+}
+void ac_image_to(const ac_image* const image, void* const data, const int stride)
+{
+    image->object.to(data, stride);
+}
 int ac_image_width(const ac_image* const image)
 {
     return image->object.width();
@@ -149,10 +175,10 @@ const char* ac_processor_type_name(const int processor_type)
     return ac::core::Processor::type(processor_type);
 }
 
-#ifdef AC_CORE_ENABLE_IMAGE_IO
-void ac_imread(const char* const filename, const int flag, ac_image* const image)
+#ifndef AC_CORE_DISABLE_IMAGE_IO
+ac_image* ac_imread(const char* const filename, const int flag)
 {
-    image->object = ac::core::imread(filename, flag);
+    return new ac_image{ ac::core::imread(filename, flag) };
 }
 int ac_imwrite(const char* const filename, const ac_image* const image)
 {

{pyanime4k-3.0.0/src/Anime4kCPP → pyanime4k-3.0.1/src/Anime4KCPP}/cli/CMakeLists.txt

@@ -26,6 +26,10 @@ target_compile_definitions(ac_cli PRIVATE
     $<$<TARGET_EXISTS:ac_video>:AC_CLI_ENABLE_VIDEO>
 )
 
+if(EMSCRIPTEN)
+    target_link_options(ac_cli PRIVATE -sNODERAWFS=1) # allow access to files on disk in NodeJS
+endif()
+
 ac_check_enable_static_crt(ac_cli)
 
 install(

{pyanime4k-3.0.0/src/Anime4kCPP → pyanime4k-3.0.1/src/Anime4KCPP}/cmake/dependency/opencl.cmake

@@ -48,7 +48,7 @@ if(NOT TARGET dep::opencl)
     message(STATUS "dep: opencl target version ${dep_opencl_TARGET_VERSION}.")
     target_compile_definitions(dep_opencl INTERFACE
         CL_HPP_TARGET_OPENCL_VERSION=${dep_opencl_TARGET_VERSION}
-        CL_HPP_MINIMUM_OPENCL_VERSION=110
+        CL_HPP_MINIMUM_OPENCL_VERSION=110 # set minimum version 110 to prevent compilation errors in certain versions of OpenCL HPP
     )
     add_library(dep::opencl ALIAS dep_opencl)
 endif()

{pyanime4k-3.0.0/src/Anime4kCPP → pyanime4k-3.0.1/src/Anime4KCPP}/core/CMakeLists.txt

@@ -116,7 +116,9 @@ target_compile_definitions(ac PUBLIC
     $<$<BOOL:${AC_CORE_WITH_WASM_SIMD128}>:AC_CORE_WITH_WASM_SIMD128>
     $<$<BOOL:${AC_CORE_WITH_OPENCL}>:AC_CORE_WITH_OPENCL>
     $<$<BOOL:${AC_CORE_WITH_CUDA}>:AC_CORE_WITH_CUDA>
-    $<$<BOOL:${AC_CORE_ENABLE_IMAGE_IO}>:AC_CORE_ENABLE_IMAGE_IO>
+    $<$<BOOL:${AC_CORE_DISABLE_IMAGE_IO}>:AC_CORE_DISABLE_IMAGE_IO>
+
+    AC_CORE_MALLOC_ALIGN=$<IF:$<BOOL:${AC_CORE_WITH_AVX}>,32,16>
 
     AC_CORE_VERSION_STR="${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
     AC_CORE_FEATURES="$<JOIN:${AC_CORE_FEATURE_LIST}, >"
@@ -130,6 +132,10 @@ if(AC_CORE_ENABLE_FAST_MATH)
     endif()
 endif()
 
+if(EMSCRIPTEN)
+    target_link_options(ac PUBLIC -sALLOW_MEMORY_GROWTH=1 -sINITIAL_MEMORY=64MB)
+endif()
+
 ac_check_disable_flags(ac)
 ac_check_enable_static_crt(ac)
 ac_check_disable_pic(ac)

{pyanime4k-3.0.0/src/Anime4kCPP → pyanime4k-3.0.1/src/Anime4KCPP}/core/include/AC/Core/Image.hpp

@@ -95,7 +95,7 @@ namespace ac::core
     };
 
     AC_EXPORT Image imdecode(const void* buffer, int size, int flag) noexcept;
-#ifdef AC_CORE_ENABLE_IMAGE_IO
+#ifndef AC_CORE_DISABLE_IMAGE_IO
     AC_EXPORT Image imread(const char* filename, int flag) noexcept;
     AC_EXPORT bool imwrite(const char* filename, const Image& image) noexcept;
 #endif
@@ -116,7 +116,7 @@ public:
 public:
     AC_EXPORT Image() noexcept;
     AC_EXPORT Image(int w, int h, int c, ElementType elementType, int stride = 0);
-    AC_EXPORT Image(int w, int h, int c, ElementType elementType, void* data, int stride);
+    AC_EXPORT Image(int w, int h, int c, ElementType elementType, void* data, int stride = 0);
     AC_EXPORT Image(const Image&) noexcept;
     AC_EXPORT Image(Image&&) noexcept;
     AC_EXPORT ~Image() noexcept;
@@ -124,6 +124,10 @@ public:
     AC_EXPORT Image& operator=(Image&&) noexcept;
 
     AC_EXPORT void create(int w, int h, int c, ElementType elementType, int stride = 0);
+    AC_EXPORT void map(int w, int h, int c, ElementType elementType, void* data, int stride = 0) noexcept;
+    AC_EXPORT void from(int w, int h, int c, ElementType elementType, const void* data, int stride = 0);
+    AC_EXPORT void to(void* data, int stride = 0) const noexcept;
+    AC_EXPORT Image clone() const;
 
 public:
     int width() const noexcept { return w; }

{pyanime4k-3.0.0/src/Anime4kCPP → pyanime4k-3.0.1/src/Anime4KCPP}/core/include/AC/Core/Parallel.hpp

@@ -4,7 +4,6 @@
 #if defined(AC_CORE_PARALLEL_PPL)
 #   include <ppl.h>
 #elif defined(AC_CORE_PARALLEL_OPENMP)
-#   include <omp.h>
 #else
 #   include "AC/Util/ThreadPool.hpp"
 #endif

pyanime4k-3.0.1/src/Anime4KCPP/core/src/Image.cpp

@@ -0,0 +1,111 @@
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+
+#include "AC/Core/Image.hpp"
+#include "AC/Core/Util.hpp"
+
+#ifndef AC_CORE_MALLOC_ALIGN
+#   define AC_CORE_MALLOC_ALIGN 32
+#endif
+#ifndef AC_CORE_STRIDE_ALIGN
+#   define AC_CORE_STRIDE_ALIGN 4
+#endif
+
+namespace ac::core::detail
+{
+    template <typename T>
+    inline constexpr T* alignPtr(T* const ptr, const int n) noexcept
+    {
+        return reinterpret_cast<T*>(align(reinterpret_cast<std::uintptr_t>(ptr), n));
+    }
+
+    inline static void* alignedAlloc(const std::size_t size) noexcept
+    {
+        auto buffer = static_cast<void**>(std::malloc(size + sizeof(void*) + AC_CORE_MALLOC_ALIGN));
+        if (!buffer) return nullptr;
+        void** ptr = alignPtr(buffer + 1, AC_CORE_MALLOC_ALIGN);
+        ptr[-1] = static_cast<void*>(buffer);
+        return ptr;
+    }
+    inline static void alignedFree(void* const ptr) noexcept
+    {
+        if (ptr) std::free(static_cast<void**>(ptr)[-1]);
+    }
+}
+
+struct ac::core::Image::ImageData
+{
+    void* data;
+
+    ImageData(const int size) noexcept : data(detail::alignedAlloc(size)) {}
+    ~ImageData() noexcept
+    {
+        detail::alignedFree(data);
+    }
+};
+
+ac::core::Image::Image() noexcept : Image(0, 0, 0, UInt8, nullptr, 0) {}
+ac::core::Image::Image(const int w, const int h, const int c, const ElementType elementType, const int stride) : Image(w, h, c, elementType, nullptr, stride) {}
+ac::core::Image::Image(const int w, const int h, const int c, const ElementType elementType, void* const data, const int stride) :
+    w(0), h(0), c(0), elementType(UInt8), pitch(0), pixels(nullptr), dptr(nullptr)
+{
+    if (data) map(w, h, c, elementType, data, stride);
+    else create(w, h, c, elementType, stride);
+}
+ac::core::Image::Image(const Image&) noexcept = default;
+ac::core::Image::Image(Image&&) noexcept = default;
+ac::core::Image::~Image() noexcept = default;
+ac::core::Image& ac::core::Image::operator=(const Image&) noexcept = default;
+ac::core::Image& ac::core::Image::operator=(Image&&) noexcept = default;
+
+void ac::core::Image::create(const int w, const int h, const int c, const ElementType elementType, const int stride)
+{
+    int lineSize = w * c * (elementType & 0xff);
+    if (!(h > 0 && lineSize > 0)) return;
+    int pitch = stride >= lineSize ? stride : align(lineSize, AC_CORE_STRIDE_ALIGN);
+    int size = h * pitch;
+    this->w = w;
+    this->h = h;
+    this->c = c;
+    this->elementType = elementType;
+    this->pitch = pitch;
+    this->dptr = std::make_shared<ImageData>(size);
+    this->pixels = this->dptr->data;
+}
+void ac::core::Image::map(const int w, const int h, const int c, const ElementType elementType, void* const data, const int stride) noexcept
+{
+    int lineSize = w * c * (elementType & 0xff);
+    if (!(h > 0 && lineSize > 0) || !data) return;
+    int pitch = stride >= lineSize ? stride : lineSize;
+    this->w = w;
+    this->h = h;
+    this->c = c;
+    this->elementType = elementType;
+    this->pitch = pitch;
+    this->dptr = nullptr;
+    this->pixels = data;
+}
+void ac::core::Image::from(const int w, const int h, const int c, const ElementType elementType, const void* const data, const int stride)
+{
+    int lineSize = w * c * (elementType & 0xff);
+    if (!(h > 0 && lineSize > 0) || !data) return;
+    int pitch = stride >= lineSize ? stride : lineSize;
+    create(w, h, c, elementType);
+    auto src = static_cast<const std::uint8_t*>(data);
+    for (int i = 0; i < h; i++) std::memcpy(line(i), src + i * pitch, lineSize);
+}
+void ac::core::Image::to(void* const data, const int stride) const noexcept
+{
+    int lineSize = width() * pixelSize();
+    if (!(height() > 0 && lineSize > 0) || !data) return;
+    int pitch = stride >= lineSize ? stride : lineSize;
+    auto dst = static_cast<std::uint8_t*>(data);
+    for (int i = 0; i < height(); i++) std::memcpy(dst + i * pitch, line(i), lineSize);
+}
+ac::core::Image ac::core::Image::clone() const
+{
+    Image dst{};
+    dst.from(width(), height(), channels(), type(), ptr(), stride());
+    return dst;
+}

{pyanime4k-3.0.0/src/Anime4kCPP → pyanime4k-3.0.1/src/Anime4KCPP}/core/src/ImageIO.cpp

@@ -2,15 +2,15 @@
 #include <cstdint>
 #include <cstring>
 
-#ifndef AC_CORE_ENABLE_IMAGE_IO
+#ifdef AC_CORE_DISABLE_IMAGE_IO
 #   define STBI_NO_STDIO
-#   define STBI_WRITE_NO_STDIO
+#else
+#   define STB_IMAGE_WRITE_IMPLEMENTATION
+#   include "stb_image_write.h"
 #endif
 
 #define STB_IMAGE_IMPLEMENTATION
 #include "stb_image.h"
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
 
 #include "AC/Core/Image.hpp"
 
@@ -21,14 +21,13 @@ ac::core::Image ac::core::imdecode(const void* const buffer, const int size, con
     std::uint8_t* data = stbi_load_from_memory(static_cast<const std::uint8_t*>(buffer), size, &w, &h, &c, flag);
     if (data)
     {
-        image.create(w, h, c, ac::core::Image::UInt8);
-        std::memcpy(image.ptr(), data, image.size());
+        image.from(w, h, c, ac::core::Image::UInt8, data);
         stbi_image_free(data);
     }
     return image;
 }
 
-#ifdef AC_CORE_ENABLE_IMAGE_IO
+#ifndef AC_CORE_DISABLE_IMAGE_IO
 ac::core::Image ac::core::imread(const char* const filename, const int flag) noexcept
 {
     Image image{};
@@ -36,8 +35,7 @@ ac::core::Image ac::core::imread(const char* const filename, const int flag) noe
     std::uint8_t* data = stbi_load(filename, &w, &h, &c, flag);
     if (data)
     {
-        image.create(w, h, c, ac::core::Image::UInt8);
-        std::memcpy(image.ptr(), data, image.size());
+        image.from(w, h, c, ac::core::Image::UInt8, data);
         stbi_image_free(data);
     }
     return image;