From 577b49ac1933fc1d00bc11aaba1b4ef5d70cdf4a Mon Sep 17 00:00:00 2001 From: tarsin Date: Sun, 24 Jul 2022 18:17:37 +0800 Subject: [PATCH] Drop image decode native libs --- .../src/main/jni/image/giflib/CMakeLists.txt | 27 -- native/src/main/jni/image/giflib/giflib | 1 - .../jni/image/libjpeg-turbo/CMakeLists.txt | 211 --------------- .../main/jni/image/libjpeg-turbo/jconfig.h | 37 --- .../main/jni/image/libjpeg-turbo/jconfigint.h | 63 ----- .../main/jni/image/libjpeg-turbo/jversion.h | 72 ----- .../jni/image/libjpeg-turbo/libjpeg-turbo | 1 - .../jni/image/libjpeg-turbo/neon-compat.h | 37 --- .../src/main/jni/image/libpng/CMakeLists.txt | 97 ------- native/src/main/jni/image/libpng/libpng | 1 - native/src/main/jni/image/libpng/pnglibconf.h | 246 ------------------ 11 files changed, 793 deletions(-) delete mode 100644 native/src/main/jni/image/giflib/CMakeLists.txt delete mode 160000 native/src/main/jni/image/giflib/giflib delete mode 100644 native/src/main/jni/image/libjpeg-turbo/CMakeLists.txt delete mode 100644 native/src/main/jni/image/libjpeg-turbo/jconfig.h delete mode 100644 native/src/main/jni/image/libjpeg-turbo/jconfigint.h delete mode 100644 native/src/main/jni/image/libjpeg-turbo/jversion.h delete mode 160000 native/src/main/jni/image/libjpeg-turbo/libjpeg-turbo delete mode 100644 native/src/main/jni/image/libjpeg-turbo/neon-compat.h delete mode 100644 native/src/main/jni/image/libpng/CMakeLists.txt delete mode 160000 native/src/main/jni/image/libpng/libpng delete mode 100644 native/src/main/jni/image/libpng/pnglibconf.h diff --git a/native/src/main/jni/image/giflib/CMakeLists.txt b/native/src/main/jni/image/giflib/CMakeLists.txt deleted file mode 100644 index d29f6ff59..000000000 --- a/native/src/main/jni/image/giflib/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2018 Hippo Seven -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -cmake_minimum_required(VERSION 3.4.1) -project(gif C) - -set(GIFLIB_SOURCES - giflib/dgif_lib.c - giflib/gif_hash.c - giflib/gifalloc.c - giflib/openbsd-reallocarray.c - ) -set(GIFLIB_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/giflib) - -add_library(gif STATIC ${GIFLIB_SOURCES}) -target_include_directories(gif PUBLIC ${GIFLIB_INCLUDES}) diff --git a/native/src/main/jni/image/giflib/giflib b/native/src/main/jni/image/giflib/giflib deleted file mode 160000 index df82ff438..000000000 --- a/native/src/main/jni/image/giflib/giflib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit df82ff4380596b1b52e9f8b142e2366276cde164 diff --git a/native/src/main/jni/image/libjpeg-turbo/CMakeLists.txt b/native/src/main/jni/image/libjpeg-turbo/CMakeLists.txt deleted file mode 100644 index 30d40d8e9..000000000 --- a/native/src/main/jni/image/libjpeg-turbo/CMakeLists.txt +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 2018 Hippo Seven -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -cmake_minimum_required(VERSION 3.4.1) -project(jpeg C) - -set(LIBJPEG_TURBO_SOURCES - libjpeg-turbo/jaricom.c - libjpeg-turbo/jcomapi.c - libjpeg-turbo/jdapimin.c - libjpeg-turbo/jdapistd.c - libjpeg-turbo/jdarith.c - libjpeg-turbo/jdatasrc.c - libjpeg-turbo/jdatasrc-tj.c - libjpeg-turbo/jdcoefct.c - libjpeg-turbo/jdcolor.c - libjpeg-turbo/jddctmgr.c - libjpeg-turbo/jdhuff.c - libjpeg-turbo/jdinput.c - libjpeg-turbo/jdmainct.c - libjpeg-turbo/jdmarker.c - libjpeg-turbo/jdmaster.c - libjpeg-turbo/jdmerge.c - libjpeg-turbo/jdphuff.c - libjpeg-turbo/jdpostct.c - libjpeg-turbo/jdsample.c - libjpeg-turbo/jdtrans.c - libjpeg-turbo/jerror.c - libjpeg-turbo/jfdctflt.c - libjpeg-turbo/jfdctfst.c - libjpeg-turbo/jfdctint.c - libjpeg-turbo/jidctflt.c - libjpeg-turbo/jidctfst.c - libjpeg-turbo/jidctint.c - libjpeg-turbo/jidctred.c - libjpeg-turbo/jmemmgr.c - libjpeg-turbo/jmemnobs.c - libjpeg-turbo/jquant1.c - libjpeg-turbo/jquant2.c - libjpeg-turbo/jutils.c - ) -set(LIBJPEG_TURBO_INCLUDES - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo - ) - -if (${ANDROID_ABI} STREQUAL "armeabi-v7a") - - enable_language(ASM) - - add_definitions(-DNEON_INTRINSICS) - - set(LIBJPEG_TURBO_SOURCES - ${LIBJPEG_TURBO_SOURCES} - libjpeg-turbo/simd/arm/jccolor-neon.c - libjpeg-turbo/simd/arm/jidctred-neon.c - libjpeg-turbo/simd/arm/jquanti-neon.c - libjpeg-turbo/simd/arm/jidctint-neon.c - libjpeg-turbo/simd/arm/jidctfst-neon.c - libjpeg-turbo/simd/arm/jfdctint-neon.c - libjpeg-turbo/simd/arm/jfdctfst-neon.c - libjpeg-turbo/simd/arm/jdsample-neon.c - libjpeg-turbo/simd/arm/jdmerge-neon.c - libjpeg-turbo/simd/arm/jdcolor-neon.c - libjpeg-turbo/simd/arm/jcsample-neon.c - libjpeg-turbo/simd/arm/jcphuff-neon.c - libjpeg-turbo/simd/arm/jcgray-neon.c - libjpeg-turbo/simd/arm/aarch32/jchuff-neon.c - libjpeg-turbo/simd/arm/aarch32/jsimd.c - ) - -elseif (${ANDROID_ABI} STREQUAL "arm64-v8a") - - enable_language(ASM) - - add_definitions(-DNEON_INTRINSICS) - - set(LIBJPEG_TURBO_SOURCES - ${LIBJPEG_TURBO_SOURCES} - libjpeg-turbo/simd/arm/jccolor-neon.c - libjpeg-turbo/simd/arm/jidctred-neon.c - libjpeg-turbo/simd/arm/jquanti-neon.c - libjpeg-turbo/simd/arm/jidctint-neon.c - libjpeg-turbo/simd/arm/jidctfst-neon.c - libjpeg-turbo/simd/arm/jfdctint-neon.c - libjpeg-turbo/simd/arm/jfdctfst-neon.c - libjpeg-turbo/simd/arm/jdsample-neon.c - libjpeg-turbo/simd/arm/jdmerge-neon.c - libjpeg-turbo/simd/arm/jdcolor-neon.c - libjpeg-turbo/simd/arm/jcsample-neon.c - libjpeg-turbo/simd/arm/jcphuff-neon.c - libjpeg-turbo/simd/arm/jcgray-neon.c - libjpeg-turbo/simd/arm/aarch64/jchuff-neon.c - libjpeg-turbo/simd/arm/aarch64/jsimd.c - ) - -elseif (${ANDROID_ABI} STREQUAL "x86") - - enable_language(ASM_NASM) - - set(LIBJPEG_TURBO_SOURCES - ${LIBJPEG_TURBO_SOURCES} - libjpeg-turbo/simd/i386/jsimd.c - libjpeg-turbo/simd/i386/jsimdcpu.asm - libjpeg-turbo/simd/i386/jfdctflt-3dn.asm - libjpeg-turbo/simd/i386/jidctflt-3dn.asm - libjpeg-turbo/simd/i386/jquant-3dn.asm - libjpeg-turbo/simd/i386/jccolor-mmx.asm - libjpeg-turbo/simd/i386/jcgray-mmx.asm - libjpeg-turbo/simd/i386/jcsample-mmx.asm - libjpeg-turbo/simd/i386/jdcolor-mmx.asm - libjpeg-turbo/simd/i386/jdmerge-mmx.asm - libjpeg-turbo/simd/i386/jdsample-mmx.asm - libjpeg-turbo/simd/i386/jfdctfst-mmx.asm - libjpeg-turbo/simd/i386/jfdctint-mmx.asm - libjpeg-turbo/simd/i386/jidctfst-mmx.asm - libjpeg-turbo/simd/i386/jidctint-mmx.asm - libjpeg-turbo/simd/i386/jidctred-mmx.asm - libjpeg-turbo/simd/i386/jquant-mmx.asm - libjpeg-turbo/simd/i386/jfdctflt-sse.asm - libjpeg-turbo/simd/i386/jidctflt-sse.asm - libjpeg-turbo/simd/i386/jquant-sse.asm - libjpeg-turbo/simd/i386/jccolor-sse2.asm - libjpeg-turbo/simd/i386/jcgray-sse2.asm - libjpeg-turbo/simd/i386/jchuff-sse2.asm - libjpeg-turbo/simd/i386/jcphuff-sse2.asm - libjpeg-turbo/simd/i386/jcsample-sse2.asm - libjpeg-turbo/simd/i386/jdcolor-sse2.asm - libjpeg-turbo/simd/i386/jdmerge-sse2.asm - libjpeg-turbo/simd/i386/jdsample-sse2.asm - libjpeg-turbo/simd/i386/jfdctfst-sse2.asm - libjpeg-turbo/simd/i386/jfdctint-sse2.asm - libjpeg-turbo/simd/i386/jidctflt-sse2.asm - libjpeg-turbo/simd/i386/jidctfst-sse2.asm - libjpeg-turbo/simd/i386/jidctint-sse2.asm - libjpeg-turbo/simd/i386/jidctred-sse2.asm - libjpeg-turbo/simd/i386/jquantf-sse2.asm - libjpeg-turbo/simd/i386/jquanti-sse2.asm - libjpeg-turbo/simd/i386/jccolor-avx2.asm - libjpeg-turbo/simd/i386/jcgray-avx2.asm - libjpeg-turbo/simd/i386/jcsample-avx2.asm - libjpeg-turbo/simd/i386/jdcolor-avx2.asm - libjpeg-turbo/simd/i386/jdmerge-avx2.asm - libjpeg-turbo/simd/i386/jdsample-avx2.asm - libjpeg-turbo/simd/i386/jfdctint-avx2.asm - libjpeg-turbo/simd/i386/jidctint-avx2.asm - libjpeg-turbo/simd/i386/jquanti-avx2.asm - ) - - set(CMAKE_ASM_NASM_FLAGS "-DELF -DPIC -I${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo/simd/nasm") - -elseif (${ANDROID_ABI} STREQUAL "x86_64") - - enable_language(ASM_NASM) - - set(LIBJPEG_TURBO_SOURCES - ${LIBJPEG_TURBO_SOURCES} - libjpeg-turbo/simd/x86_64/jsimd.c - libjpeg-turbo/simd/x86_64/jsimdcpu.asm - libjpeg-turbo/simd/x86_64/jfdctflt-sse.asm - libjpeg-turbo/simd/x86_64/jccolor-sse2.asm - libjpeg-turbo/simd/x86_64/jcgray-sse2.asm - libjpeg-turbo/simd/x86_64/jchuff-sse2.asm - libjpeg-turbo/simd/x86_64/jcphuff-sse2.asm - libjpeg-turbo/simd/x86_64/jcsample-sse2.asm - libjpeg-turbo/simd/x86_64/jdcolor-sse2.asm - libjpeg-turbo/simd/x86_64/jdmerge-sse2.asm - libjpeg-turbo/simd/x86_64/jdsample-sse2.asm - libjpeg-turbo/simd/x86_64/jfdctfst-sse2.asm - libjpeg-turbo/simd/x86_64/jfdctint-sse2.asm - libjpeg-turbo/simd/x86_64/jidctflt-sse2.asm - libjpeg-turbo/simd/x86_64/jidctfst-sse2.asm - libjpeg-turbo/simd/x86_64/jidctint-sse2.asm - libjpeg-turbo/simd/x86_64/jidctred-sse2.asm - libjpeg-turbo/simd/x86_64/jquantf-sse2.asm - libjpeg-turbo/simd/x86_64/jquanti-sse2.asm - libjpeg-turbo/simd/x86_64/jccolor-avx2.asm - libjpeg-turbo/simd/x86_64/jcgray-avx2.asm - libjpeg-turbo/simd/x86_64/jcsample-avx2.asm - libjpeg-turbo/simd/x86_64/jdcolor-avx2.asm - libjpeg-turbo/simd/x86_64/jdmerge-avx2.asm - libjpeg-turbo/simd/x86_64/jdsample-avx2.asm - libjpeg-turbo/simd/x86_64/jfdctint-avx2.asm - libjpeg-turbo/simd/x86_64/jidctint-avx2.asm - libjpeg-turbo/simd/x86_64/jquanti-avx2.asm - ) - - set(CMAKE_ASM_NASM_FLAGS "-D__x86_64__ -DELF -DPIC -I${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo/simd/nasm") - -else () - - set(LIBJPEG_TURBO_SOURCES - ${LIBJPEG_TURBO_SOURCES} - libjpeg-turbo/jsimd_none.c - ) - -endif () - -add_library(jpeg STATIC ${LIBJPEG_TURBO_SOURCES}) -target_include_directories(jpeg PUBLIC ${LIBJPEG_TURBO_INCLUDES}) diff --git a/native/src/main/jni/image/libjpeg-turbo/jconfig.h b/native/src/main/jni/image/libjpeg-turbo/jconfig.h deleted file mode 100644 index bf0da58fa..000000000 --- a/native/src/main/jni/image/libjpeg-turbo/jconfig.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Version ID for the JPEG library. - * Might be useful for tests like "#if JPEG_LIB_VERSION >= 60". - */ -#define JPEG_LIB_VERSION 62 - -/* libjpeg-turbo version */ -#define LIBJPEG_TURBO_VERSION 2.1.3 - -/* libjpeg-turbo version in integer form */ -#define LIBJPEG_TURBO_VERSION_NUMBER 2001003 - -/* Support arithmetic encoding */ -#define C_ARITH_CODING_SUPPORTED 1 - -/* Support arithmetic decoding */ -#define D_ARITH_CODING_SUPPORTED 1 - -/* Support in-memory source/destination managers */ -#define MEM_SRCDST_SUPPORTED 1 - -/* Use accelerated SIMD routines. */ -#define WITH_SIMD 1 - -/* - * Define BITS_IN_JSAMPLE as either - * 8 for 8-bit sample values (the usual setting) - * 12 for 12-bit sample values - * Only 8 and 12 are legal data precisions for lossy JPEG according to the - * JPEG standard, and the IJG code does not support anything else! - * We do not support run-time selection of data precision, sorry. - */ - -#define BITS_IN_JSAMPLE 8 /* use 8 or 12 */ - -/* Define if your (broken) compiler shifts signed values as if they were - unsigned. */ -/* #undef RIGHT_SHIFT_IS_UNSIGNED */ diff --git a/native/src/main/jni/image/libjpeg-turbo/jconfigint.h b/native/src/main/jni/image/libjpeg-turbo/jconfigint.h deleted file mode 100644 index 3426e1b82..000000000 --- a/native/src/main/jni/image/libjpeg-turbo/jconfigint.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2022 Tarsin Norbin - * - * This file is part of EhViewer - * - * EhViewer is free software: you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * EhViewer is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * EhViewer. If not, see . - */ - -/* libjpeg-turbo build number */ -#define BUILD "20220523" - -/* Compiler's inline keyword */ -#undef inline - -/* How to obtain function inlining. */ -#define INLINE __inline__ __attribute__((always_inline)) - -/* How to obtain thread-local storage */ -#define THREAD_LOCAL __thread - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "libjpeg-turbo" - -/* Version number of package */ -#define VERSION "2.1.3" - -/* The size of `size_t', as computed by sizeof. */ -#define SIZEOF_SIZE_T __SIZEOF_SIZE_T__ - -/* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */ -#define HAVE_BUILTIN_CTZL - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_INTRIN_H */ - -#if defined(_MSC_VER) && defined(HAVE_INTRIN_H) -#if (SIZEOF_SIZE_T == 8) -#define HAVE_BITSCANFORWARD64 -#elif (SIZEOF_SIZE_T == 4) -#define HAVE_BITSCANFORWARD -#endif -#endif - -#if defined(__has_attribute) -#if __has_attribute(fallthrough) -#define FALLTHROUGH __attribute__((fallthrough)); -#else -#define FALLTHROUGH -#endif -#else -#define FALLTHROUGH -#endif diff --git a/native/src/main/jni/image/libjpeg-turbo/jversion.h b/native/src/main/jni/image/libjpeg-turbo/jversion.h deleted file mode 100644 index eb62028ae..000000000 --- a/native/src/main/jni/image/libjpeg-turbo/jversion.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2022 Tarsin Norbin - * - * This file is part of EhViewer - * - * EhViewer is free software: you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * EhViewer is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * EhViewer. If not, see . - */ - -/* - * jversion.h - * - * This file was part of the Independent JPEG Group's software: - * Copyright (C) 1991-2020, Thomas G. Lane, Guido Vollbeding. - * libjpeg-turbo Modifications: - * Copyright (C) 2010, 2012-2022, D. R. Commander. - * For conditions of distribution and use, see the accompanying README.ijg - * file. - * - * This file contains software version identification. - */ - -#if JPEG_LIB_VERSION >= 80 - -#define JVERSION "8d 15-Jan-2012" - -#elif JPEG_LIB_VERSION >= 70 - -#define JVERSION "7 27-Jun-2009" - -#else - -#define JVERSION "6b 27-Mar-1998" - -#endif - -/* - * NOTE: It is our convention to place the authors in the following order: - * - libjpeg-turbo authors (2009-) in descending order of the date of their - * most recent contribution to the project, then in ascending order of the - * date of their first contribution to the project, then in alphabetical - * order - * - Upstream authors in descending order of the date of the first inclusion of - * their code - */ - -#define JCOPYRIGHT \ - "Copyright (C) 2009-2022 D. R. Commander\n" \ - "Copyright (C) 2015, 2020 Google, Inc.\n" \ - "Copyright (C) 2019-2020 Arm Limited\n" \ - "Copyright (C) 2015-2016, 2018 Matthieu Darbois\n" \ - "Copyright (C) 2011-2016 Siarhei Siamashka\n" \ - "Copyright (C) 2015 Intel Corporation\n" \ - "Copyright (C) 2013-2014 Linaro Limited\n" \ - "Copyright (C) 2013-2014 MIPS Technologies, Inc.\n" \ - "Copyright (C) 2009, 2012 Pierre Ossman for Cendio AB\n" \ - "Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies)\n" \ - "Copyright (C) 1999-2006 MIYASAKA Masaru\n" \ - "Copyright (C) 1991-2020 Thomas G. Lane, Guido Vollbeding" - -#define JCOPYRIGHT_SHORT \ - "Copyright (C) 1991-2022 The libjpeg-turbo Project and many others" diff --git a/native/src/main/jni/image/libjpeg-turbo/libjpeg-turbo b/native/src/main/jni/image/libjpeg-turbo/libjpeg-turbo deleted file mode 160000 index 3331f85ed..000000000 --- a/native/src/main/jni/image/libjpeg-turbo/libjpeg-turbo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3331f85edcf03db0d8baee63de92657e62e8eff4 diff --git a/native/src/main/jni/image/libjpeg-turbo/neon-compat.h b/native/src/main/jni/image/libjpeg-turbo/neon-compat.h deleted file mode 100644 index 691894a35..000000000 --- a/native/src/main/jni/image/libjpeg-turbo/neon-compat.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2020, D. R. Commander. All Rights Reserved. - * Copyright (C) 2020-2021, Arm Limited. All Rights Reserved. - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - */ - -#define HAVE_VLD1_S16_X3 -#define HAVE_VLD1_U16_X2 -#define HAVE_VLD1Q_U8_X4 - -/* Define compiler-independent count-leading-zeros and byte-swap macros */ -#if defined(_MSC_VER) && !defined(__clang__) -#define BUILTIN_CLZ(x) _CountLeadingZeros(x) -#define BUILTIN_CLZLL(x) _CountLeadingZeros64(x) -#define BUILTIN_BSWAP64(x) _byteswap_uint64(x) -#elif defined(__clang__) || defined(__GNUC__) -#define BUILTIN_CLZ(x) __builtin_clz(x) -#define BUILTIN_CLZLL(x) __builtin_clzll(x) -#define BUILTIN_BSWAP64(x) __builtin_bswap64(x) -#else -#error "Unknown compiler" -#endif diff --git a/native/src/main/jni/image/libpng/CMakeLists.txt b/native/src/main/jni/image/libpng/CMakeLists.txt deleted file mode 100644 index 54e9fe58f..000000000 --- a/native/src/main/jni/image/libpng/CMakeLists.txt +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 2018 Hippo Seven -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -cmake_minimum_required(VERSION 3.4.1) -project(png C) - -set(LIBPNG_SOURCES - libpng/png.c - libpng/pngerror.c - libpng/pngget.c - libpng/pngmem.c - libpng/pngpread.c - libpng/pngread.c - libpng/pngrio.c - libpng/pngrtran.c - libpng/pngrutil.c - libpng/pngset.c - libpng/pngtrans.c - ) - -set(LIBPNG_INCLUDES - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/libpng - ) -set(LIBPNG_DEFINITIONS) -set(LIBPNG_LIBRARIES z) - -if (${ANDROID_ABI} STREQUAL "armeabi-v7a") - - enable_language(ASM) - - set(LIBPNG_SOURCES - ${LIBPNG_SOURCES} - libpng/arm/arm_init.c - libpng/arm/filter_neon.S - ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c - ) - set(LIBPNG_INCLUDES - ${LIBPNG_INCLUDES} - ${ANDROID_NDK}/sources/android/cpufeatures - ) - set(LIBPNG_DEFINITIONS - ${LIBPNG_DEFINITIONS} - -DPNG_ARM_NEON_API_SUPPORTED - -DPNG_ARM_NEON_CHECK_SUPPORTED - -DPNG_ARM_NEON_OPT=1 - -DPNG_ARM_NEON_IMPLEMENTATION=2 - -DPNG_ARM_NEON_FILE=\"contrib/arm-neon/android-ndk.c\" - ) - set(LIBPNG_LIBRARIES - ${LIBPNG_LIBRARIES} - ) - -elseif (${ANDROID_ABI} STREQUAL "arm64-v8a") - - enable_language(ASM) - - set(LIBPNG_SOURCES - ${LIBPNG_SOURCES} - libpng/arm/arm_init.c - libpng/arm/filter_neon_intrinsics.c - libpng/arm/palette_neon_intrinsics.c - ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c - ) - set(LIBPNG_INCLUDES - ${LIBPNG_INCLUDES} - ${ANDROID_NDK}/sources/android/cpufeatures - ) - set(LIBPNG_DEFINITIONS - ${LIBPNG_DEFINITIONS} - -DPNG_ARM_NEON_API_SUPPORTED - -DPNG_ARM_NEON_CHECK_SUPPORTED - -DPNG_ARM_NEON_OPT=1 - -DPNG_ARM_NEON_IMPLEMENTATION=1 - -DPNG_ARM_NEON_FILE=\"contrib/arm-neon/android-ndk.c\" - ) - set(LIBPNG_LIBRARIES - ${LIBPNG_LIBRARIES} - ) - -endif () - -add_library(png STATIC ${LIBPNG_SOURCES}) -target_include_directories(png PUBLIC ${LIBPNG_INCLUDES}) -target_compile_definitions(png PRIVATE ${LIBPNG_DEFINITIONS}) -target_link_libraries(png PRIVATE ${LIBPNG_LIBRARIES}) diff --git a/native/src/main/jni/image/libpng/libpng b/native/src/main/jni/image/libpng/libpng deleted file mode 160000 index c81fed471..000000000 --- a/native/src/main/jni/image/libpng/libpng +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c81fed4715301b2b05cf2f554c9d1395d3e73a08 diff --git a/native/src/main/jni/image/libpng/pnglibconf.h b/native/src/main/jni/image/libpng/pnglibconf.h deleted file mode 100644 index c5c2d1e7c..000000000 --- a/native/src/main/jni/image/libpng/pnglibconf.h +++ /dev/null @@ -1,246 +0,0 @@ -/* - * Copyright 2022 Tarsin Norbin - * - * This file is part of EhViewer - * - * EhViewer is free software: you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * EhViewer is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * EhViewer. If not, see . - */ - -/* libpng 1.6.34 STANDARD API DEFINITION */ - -/* pnglibconf.h - library build configuration */ - -/* Libpng version 1.6.34 - September 29, 2017 */ - -/* Copyright (c) 1998-2017 Glenn Randers-Pehrson */ - -/* This code is released under the libpng license. */ -/* For conditions of distribution and use, see the disclaimer */ -/* and license in png.h */ - -/* pnglibconf.h */ -/* Machine generated file: DO NOT EDIT */ -/* Derived from: scripts/pnglibconf.dfa */ -#ifndef PNGLCONF_H -#define PNGLCONF_H -/* options */ -#define PNG_16BIT_SUPPORTED -#define PNG_ALIGNED_MEMORY_SUPPORTED -/*#undef PNG_ARM_NEON_API_SUPPORTED*/ -/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/ -/*#undef PNG_POWERPC_VSX_API_SUPPORTED*/ -/*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/ -#define PNG_BENIGN_ERRORS_SUPPORTED -#define PNG_BENIGN_READ_ERRORS_SUPPORTED -/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/ -#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED -#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED -#define PNG_COLORSPACE_SUPPORTED -#define PNG_CONSOLE_IO_SUPPORTED -#define PNG_CONVERT_tIME_SUPPORTED -#define PNG_EASY_ACCESS_SUPPORTED -/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/ -#define PNG_ERROR_TEXT_SUPPORTED -#define PNG_FIXED_POINT_SUPPORTED -#define PNG_FLOATING_ARITHMETIC_SUPPORTED -#define PNG_FLOATING_POINT_SUPPORTED -#define PNG_FORMAT_AFIRST_SUPPORTED -#define PNG_FORMAT_BGR_SUPPORTED -#define PNG_GAMMA_SUPPORTED -#define PNG_GET_PALETTE_MAX_SUPPORTED -#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED -#define PNG_INCH_CONVERSIONS_SUPPORTED -#define PNG_INFO_IMAGE_SUPPORTED -#define PNG_IO_STATE_SUPPORTED -#define PNG_MNG_FEATURES_SUPPORTED -#define PNG_POINTER_INDEXING_SUPPORTED -#define PNG_PROGRESSIVE_READ_SUPPORTED -#define PNG_READ_16BIT_SUPPORTED -#define PNG_READ_ALPHA_MODE_SUPPORTED -#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED -#define PNG_READ_BACKGROUND_SUPPORTED -#define PNG_READ_BGR_SUPPORTED -#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED -#define PNG_READ_COMPOSITE_NODIV_SUPPORTED -#define PNG_READ_COMPRESSED_TEXT_SUPPORTED -#define PNG_READ_EXPAND_16_SUPPORTED -#define PNG_READ_EXPAND_SUPPORTED -#define PNG_READ_FILLER_SUPPORTED -#define PNG_READ_GAMMA_SUPPORTED -#define PNG_READ_GET_PALETTE_MAX_SUPPORTED -#define PNG_READ_GRAY_TO_RGB_SUPPORTED -#define PNG_READ_INTERLACING_SUPPORTED -#define PNG_READ_INT_FUNCTIONS_SUPPORTED -#define PNG_READ_INVERT_ALPHA_SUPPORTED -#define PNG_READ_INVERT_SUPPORTED -#define PNG_READ_OPT_PLTE_SUPPORTED -#define PNG_READ_PACKSWAP_SUPPORTED -#define PNG_READ_PACK_SUPPORTED -#define PNG_READ_QUANTIZE_SUPPORTED -#define PNG_READ_RGB_TO_GRAY_SUPPORTED -#define PNG_READ_SCALE_16_TO_8_SUPPORTED -#define PNG_READ_SHIFT_SUPPORTED -#define PNG_READ_STRIP_16_TO_8_SUPPORTED -#define PNG_READ_STRIP_ALPHA_SUPPORTED -#define PNG_READ_SUPPORTED -#define PNG_READ_SWAP_ALPHA_SUPPORTED -#define PNG_READ_SWAP_SUPPORTED -#define PNG_READ_TEXT_SUPPORTED -#define PNG_READ_TRANSFORMS_SUPPORTED -#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED -#define PNG_READ_USER_CHUNKS_SUPPORTED -#define PNG_READ_USER_TRANSFORM_SUPPORTED -#define PNG_READ_bKGD_SUPPORTED -#define PNG_READ_cHRM_SUPPORTED -#define PNG_READ_eXIf_SUPPORTED -#define PNG_READ_gAMA_SUPPORTED -#define PNG_READ_hIST_SUPPORTED -#define PNG_READ_iCCP_SUPPORTED -#define PNG_READ_iTXt_SUPPORTED -#define PNG_READ_oFFs_SUPPORTED -#define PNG_READ_pCAL_SUPPORTED -#define PNG_READ_pHYs_SUPPORTED -#define PNG_READ_sBIT_SUPPORTED -#define PNG_READ_sCAL_SUPPORTED -#define PNG_READ_sPLT_SUPPORTED -#define PNG_READ_sRGB_SUPPORTED -#define PNG_READ_tEXt_SUPPORTED -#define PNG_READ_tIME_SUPPORTED -#define PNG_READ_tRNS_SUPPORTED -#define PNG_READ_zTXt_SUPPORTED -/*#undef PNG_SAVE_INT_32_SUPPORTED*/ -#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED -#define PNG_SEQUENTIAL_READ_SUPPORTED -#define PNG_SETJMP_SUPPORTED -#define PNG_SET_OPTION_SUPPORTED -#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED -#define PNG_SET_USER_LIMITS_SUPPORTED -/*#undef PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED*/ -/*#undef PNG_SIMPLIFIED_READ_BGR_SUPPORTED*/ -/*#undef PNG_SIMPLIFIED_READ_SUPPORTED*/ -/*#undef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED*/ -/*#undef PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED*/ -/*#undef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED*/ -/*#undef PNG_SIMPLIFIED_WRITE_SUPPORTED*/ -/*#undef PNG_STDIO_SUPPORTED*/ -#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED -#define PNG_TEXT_SUPPORTED -#define PNG_TIME_RFC1123_SUPPORTED -#define PNG_UNKNOWN_CHUNKS_SUPPORTED -#define PNG_USER_CHUNKS_SUPPORTED -#define PNG_USER_LIMITS_SUPPORTED -#define PNG_USER_MEM_SUPPORTED -#define PNG_USER_TRANSFORM_INFO_SUPPORTED -#define PNG_USER_TRANSFORM_PTR_SUPPORTED -#define PNG_WARNINGS_SUPPORTED -/* -#define PNG_WRITE_16BIT_SUPPORTED -#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED -#define PNG_WRITE_BGR_SUPPORTED -#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED -#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED -#define PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED -#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED -#define PNG_WRITE_FILLER_SUPPORTED -#define PNG_WRITE_FILTER_SUPPORTED -#define PNG_WRITE_FLUSH_SUPPORTED -#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED -#define PNG_WRITE_INTERLACING_SUPPORTED -#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED -#define PNG_WRITE_INVERT_ALPHA_SUPPORTED -#define PNG_WRITE_INVERT_SUPPORTED -#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED -#define PNG_WRITE_PACKSWAP_SUPPORTED -#define PNG_WRITE_PACK_SUPPORTED -#define PNG_WRITE_SHIFT_SUPPORTED -#define PNG_WRITE_SUPPORTED -#define PNG_WRITE_SWAP_ALPHA_SUPPORTED -#define PNG_WRITE_SWAP_SUPPORTED -#define PNG_WRITE_TEXT_SUPPORTED -#define PNG_WRITE_TRANSFORMS_SUPPORTED -#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED -#define PNG_WRITE_USER_TRANSFORM_SUPPORTED -#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED -#define PNG_WRITE_bKGD_SUPPORTED -#define PNG_WRITE_cHRM_SUPPORTED -#define PNG_WRITE_eXIf_SUPPORTED -#define PNG_WRITE_gAMA_SUPPORTED -#define PNG_WRITE_hIST_SUPPORTED -#define PNG_WRITE_iCCP_SUPPORTED -#define PNG_WRITE_iTXt_SUPPORTED -#define PNG_WRITE_oFFs_SUPPORTED -#define PNG_WRITE_pCAL_SUPPORTED -#define PNG_WRITE_pHYs_SUPPORTED -#define PNG_WRITE_sBIT_SUPPORTED -#define PNG_WRITE_sCAL_SUPPORTED -#define PNG_WRITE_sPLT_SUPPORTED -#define PNG_WRITE_sRGB_SUPPORTED -#define PNG_WRITE_tEXt_SUPPORTED -#define PNG_WRITE_tIME_SUPPORTED -#define PNG_WRITE_tRNS_SUPPORTED -#define PNG_WRITE_zTXt_SUPPORTED -*/ -#define PNG_bKGD_SUPPORTED -#define PNG_cHRM_SUPPORTED -#define PNG_eXIf_SUPPORTED -#define PNG_gAMA_SUPPORTED -#define PNG_hIST_SUPPORTED -#define PNG_iCCP_SUPPORTED -#define PNG_iTXt_SUPPORTED -#define PNG_oFFs_SUPPORTED -#define PNG_pCAL_SUPPORTED -#define PNG_pHYs_SUPPORTED -#define PNG_sBIT_SUPPORTED -#define PNG_sCAL_SUPPORTED -#define PNG_sPLT_SUPPORTED -#define PNG_sRGB_SUPPORTED -#define PNG_tEXt_SUPPORTED -#define PNG_tIME_SUPPORTED -#define PNG_tRNS_SUPPORTED -#define PNG_zTXt_SUPPORTED -/* end of options */ -/* apng */ -#define PNG_APNG_SUPPORTED -#define PNG_READ_APNG_SUPPORTED -/*#undef PNG_WRITE_APNG_SUPPORTED*/ -/* end of apng */ -/* settings */ -#define PNG_API_RULE 0 -#define PNG_DEFAULT_READ_MACROS 1 -#define PNG_GAMMA_THRESHOLD_FIXED 5000 -#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE -#define PNG_INFLATE_BUF_SIZE 1024 -#define PNG_LINKAGE_API extern -#define PNG_LINKAGE_CALLBACK extern -#define PNG_LINKAGE_DATA extern -#define PNG_LINKAGE_FUNCTION extern -#define PNG_MAX_GAMMA_8 11 -#define PNG_QUANTIZE_BLUE_BITS 5 -#define PNG_QUANTIZE_GREEN_BITS 5 -#define PNG_QUANTIZE_RED_BITS 5 -#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1) -#define PNG_TEXT_Z_DEFAULT_STRATEGY 0 -#define PNG_USER_CHUNK_CACHE_MAX 1000 -#define PNG_USER_CHUNK_MALLOC_MAX 8000000 -#define PNG_USER_HEIGHT_MAX 1000000 -#define PNG_USER_WIDTH_MAX 1000000 -#define PNG_ZBUF_SIZE 8192 -#define PNG_ZLIB_VERNUM 0 /* unknown */ -#define PNG_Z_DEFAULT_COMPRESSION (-1) -#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0 -#define PNG_Z_DEFAULT_STRATEGY 1 -#define PNG_sCAL_PRECISION 5 -#define PNG_sRGB_PROFILE_CHECKS 2 -/* end of settings */ -#endif /* PNGLCONF_H */