From a8204745e51ab28628d555c9665edde63e48d755 Mon Sep 17 00:00:00 2001 From: Jon Hermansen Date: Tue, 22 Jul 2025 16:10:38 -0400 Subject: [PATCH 1/2] treewide: remove packages which depend on freeimage freeimage support was dropped in 608422bd4ba43, so these no longer build. Removing the most obvious dependents of the library. --- pkgs/by-name/ar/arrayfire/no-assets.patch | 35 --- pkgs/by-name/ar/arrayfire/no-download.patch | 31 --- pkgs/by-name/ar/arrayfire/package.nix | 248 ------------------ .../001-add-nixpkgs-retroarch-cores.patch | 12 - .../em/emulationstation-de/package.nix | 74 ------ pkgs/by-name/em/emulationstation/package.nix | 87 ------ pkgs/by-name/em/emulationstation/sources.nix | 35 --- pkgs/by-name/fo/forge/no-download-glad.patch | 31 --- pkgs/by-name/fo/forge/package.nix | 86 ------ pkgs/by-name/ga/gamecube-tools/package.nix | 33 --- pkgs/by-name/pe/perceptualdiff/package.nix | 31 --- pkgs/by-name/pg/pgf_graphics/package.nix | 43 --- pkgs/by-name/po/posterazor/package.nix | 58 ---- pkgs/by-name/ru/rucksack/package.nix | 37 --- pkgs/by-name/tr/trenchbroom/package.nix | 175 ------------ pkgs/top-level/aliases.nix | 10 + 16 files changed, 10 insertions(+), 1016 deletions(-) delete mode 100644 pkgs/by-name/ar/arrayfire/no-assets.patch delete mode 100644 pkgs/by-name/ar/arrayfire/no-download.patch delete mode 100644 pkgs/by-name/ar/arrayfire/package.nix delete mode 100644 pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch delete mode 100644 pkgs/by-name/em/emulationstation-de/package.nix delete mode 100644 pkgs/by-name/em/emulationstation/package.nix delete mode 100644 pkgs/by-name/em/emulationstation/sources.nix delete mode 100644 pkgs/by-name/fo/forge/no-download-glad.patch delete mode 100644 pkgs/by-name/fo/forge/package.nix delete mode 100644 pkgs/by-name/ga/gamecube-tools/package.nix delete mode 100644 pkgs/by-name/pe/perceptualdiff/package.nix delete mode 100644 pkgs/by-name/pg/pgf_graphics/package.nix delete mode 100644 pkgs/by-name/po/posterazor/package.nix delete mode 100644 pkgs/by-name/ru/rucksack/package.nix delete mode 100644 pkgs/by-name/tr/trenchbroom/package.nix diff --git a/pkgs/by-name/ar/arrayfire/no-assets.patch b/pkgs/by-name/ar/arrayfire/no-assets.patch deleted file mode 100644 index b8820f8aa55b..000000000000 --- a/pkgs/by-name/ar/arrayfire/no-assets.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 12d6e557c..cc004555d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -321,11 +321,6 @@ if(NOT TARGET nonstd::span-lite) - - endif() - --af_dep_check_and_populate(${assets_prefix} -- URI https://github.com/arrayfire/assets.git -- REF master --) --set(ASSETS_DIR ${${assets_prefix}_SOURCE_DIR}) - - # when crosscompiling use the bin2cpp file from the native bin directory - if(CMAKE_CROSSCOMPILING) -@@ -473,18 +468,6 @@ install(FILES ${ArrayFire_BINARY_DIR}/include/af/version.h - DESTINATION "${AF_INSTALL_INC_DIR}/af/" - COMPONENT headers) - --# install the examples irrespective of the AF_BUILD_EXAMPLES value --# only the examples source files are installed, so the installation of these --# source files does not depend on AF_BUILD_EXAMPLES --# when AF_BUILD_EXAMPLES is OFF, the examples source is installed without --# building the example executables --install(DIRECTORY examples/ #NOTE The slash at the end is important -- DESTINATION ${AF_INSTALL_EXAMPLE_DIR} -- COMPONENT examples) -- --install(DIRECTORY ${ASSETS_DIR}/examples/ #NOTE The slash at the end is important -- DESTINATION ${AF_INSTALL_EXAMPLE_DIR} -- COMPONENT examples) - - install(DIRECTORY "${ArrayFire_SOURCE_DIR}/LICENSES/" - DESTINATION LICENSES diff --git a/pkgs/by-name/ar/arrayfire/no-download.patch b/pkgs/by-name/ar/arrayfire/no-download.patch deleted file mode 100644 index f7903e74112d..000000000000 --- a/pkgs/by-name/ar/arrayfire/no-download.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeModules/AFconfigure_deps_vars.cmake b/CMakeModules/AFconfigure_deps_vars.cmake -index aac332f5a..e9e711159 100644 ---- a/CMakeModules/AFconfigure_deps_vars.cmake -+++ b/CMakeModules/AFconfigure_deps_vars.cmake -@@ -94,7 +94,7 @@ macro(af_dep_check_and_populate dep_prefix) - URL ${adcp_args_URI} - URL_HASH ${adcp_args_REF} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild" -@@ -104,7 +104,7 @@ macro(af_dep_check_and_populate dep_prefix) - QUIET - URL ${adcp_args_URI} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild" -@@ -116,7 +116,7 @@ macro(af_dep_check_and_populate dep_prefix) - GIT_REPOSITORY ${adcp_args_URI} - GIT_TAG ${adcp_args_REF} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild" diff --git a/pkgs/by-name/ar/arrayfire/package.nix b/pkgs/by-name/ar/arrayfire/package.nix deleted file mode 100644 index 0cc0623a995d..000000000000 --- a/pkgs/by-name/ar/arrayfire/package.nix +++ /dev/null @@ -1,248 +0,0 @@ -{ - blas, - boost, - clblast, - cmake, - config, - cudaPackages, - fetchFromGitHub, - fftw, - fftwFloat, - fmt_9, - forge, - freeimage, - gtest, - lapack, - lib, - libGL, - mesa, - ocl-icd, - opencl-clhpp, - pkg-config, - python3, - span-lite, - stdenv, - # NOTE: We disable tests by default, because they cannot be run easily on - # non-NixOS systems when either CUDA or OpenCL support is enabled (CUDA and - # OpenCL need access to drivers that are installed outside of Nix on - # non-NixOS systems). - doCheck ? false, - cpuSupport ? true, - cudaSupport ? config.cudaSupport, - # OpenCL needs mesa which is broken on Darwin - openclSupport ? !stdenv.hostPlatform.isDarwin, - # This argument lets one run CUDA & OpenCL tests on non-NixOS systems by - # telling Nix where to find the drivers. If you know the version of the - # Nvidia driver that is installed on your system, you can do: - # - # arrayfire.override { - # nvidiaComputeDrivers = - # callPackage - # (prev.linuxPackages.nvidiaPackages.mkDriver { - # version = cudaVersion; # our driver version - # sha256_64bit = cudaHash; # sha256 of the .run binary - # useGLVND = false; - # useProfiles = false; - # useSettings = false; - # usePersistenced = false; - # ... - # }) - # { libsOnly = true; }; - # } - nvidiaComputeDrivers ? null, - fetchpatch, -}: - -# ArrayFire compiles with 64-bit BLAS, but some tests segfault or throw -# exceptions, which means that it isn't really supported yet... -assert blas.isILP64 == false; - -stdenv.mkDerivation rec { - pname = "arrayfire"; - version = "3.9.0"; - - src = fetchFromGitHub { - owner = "arrayfire"; - repo = "arrayfire"; - rev = "v3.9.0"; - hash = "sha256-80fxdkaeAQ5u0X/UGPaI/900cdkZ/vXNcOn5tkZ+C3Y="; - }; - - # We cannot use the clfft from Nixpkgs because ArrayFire maintain a fork - # of clfft where they've modified the CMake build system, and the - # CMakeLists.txt of ArrayFire assumes that we're using that fork. - # - # This can be removed once ArrayFire upstream their changes. - clfft = fetchFromGitHub { - owner = "arrayfire"; - repo = "clfft"; - rev = "760096b37dcc4f18ccd1aac53f3501a83b83449c"; - sha256 = "sha256-vJo1YfC2AJIbbRj/zTfcOUmi0Oj9v64NfA9MfK8ecoY="; - }; - glad = fetchFromGitHub { - owner = "arrayfire"; - repo = "glad"; - rev = "ef8c5508e72456b714820c98e034d9a55b970650"; - sha256 = "sha256-u9Vec7XLhE3xW9vzM7uuf+b18wZsh/VMtGbB6nMVlno="; - }; - threads = fetchFromGitHub { - owner = "arrayfire"; - repo = "threads"; - rev = "4d4a4f0384d1ac2f25b2c4fc1d57b9e25f4d6818"; - sha256 = "sha256-qqsT9woJDtQvzuV323OYXm68pExygYs/+zZNmg2sN34="; - }; - test-data = fetchFromGitHub { - owner = "arrayfire"; - repo = "arrayfire-data"; - rev = "a5f533d7b864a4d8f0dd7c9aaad5ff06018c4867"; - sha256 = "sha256-AWzhsrDXyZrQN2bd0Ng/XlE8v02x7QWTiFTyaAuRXSw="; - }; - # ArrayFire fails to compile with newer versions of spdlog, so we can't use - # the one in Nixpkgs. Once they upgrade, we can switch to using spdlog from - # Nixpkgs. - spdlog = fetchFromGitHub { - owner = "gabime"; - repo = "spdlog"; - rev = "v1.9.2"; - hash = "sha256-GSUdHtvV/97RyDKy8i+ticnSlQCubGGWHg4Oo+YAr8Y="; - }; - - cmakeFlags = [ - "-DBUILD_TESTING=ON" - # We do not build examples, because building tests already takes long enough... - "-DAF_BUILD_EXAMPLES=OFF" - # No need to build forge, because it's a separate package - "-DAF_BUILD_FORGE=OFF" - "-DAF_COMPUTE_LIBRARY='FFTW/LAPACK/BLAS'" - # Prevent ArrayFire from trying to download some matrices from the Internet - "-DAF_TEST_WITH_MTX_FILES=OFF" - # Have to use the header-only version, because we're not using the version - # from Nixpkgs. Otherwise, libaf.so won't be able to find the shared - # library, because ArrayFire's CMake files do not run the install step of - # spdlog. - "-DAF_WITH_SPDLOG_HEADER_ONLY=ON" - (if cpuSupport then "-DAF_BUILD_CPU=ON" else "-DAF_BUILD_CPU=OFF") - (if openclSupport then "-DAF_BUILD_OPENCL=ON" else "-DAF_BUILD_OPENCL=OFF") - (if cudaSupport then "-DAF_BUILD_CUDA=ON" else "-DAF_BUILD_CUDA=OFF") - ] - ++ lib.optionals cudaSupport [ - # ArrayFire use deprecated FindCUDA in their CMake files, so we help CMake - # locate cudatoolkit. - "-DCUDA_LIBRARIES_PATH=${cudaPackages.cudatoolkit}/lib" - ]; - - # ArrayFire have a repo with assets for the examples. Since we don't build - # the examples anyway, remove the dependency on assets. - patches = [ - ./no-assets.patch - ./no-download.patch - # Fix for newer opencl-clhpp. Remove with the next release. - (fetchpatch { - url = "https://github.com/arrayfire/arrayfire/pull/3562.patch"; - hash = "sha256-AdWlpcRTn9waNAaVpZfK6sJ/xBQLiBC4nBeEYiGNN50"; - }) - ]; - - postPatch = '' - mkdir -p ./extern/af_glad-src - mkdir -p ./extern/af_threads-src - mkdir -p ./extern/af_test_data-src - mkdir -p ./extern/ocl_clfft-src - mkdir -p ./extern/spdlog-src - cp -R --no-preserve=mode,ownership ${glad}/* ./extern/af_glad-src/ - cp -R --no-preserve=mode,ownership ${threads}/* ./extern/af_threads-src/ - cp -R --no-preserve=mode,ownership ${test-data}/* ./extern/af_test_data-src/ - cp -R --no-preserve=mode,ownership ${clfft}/* ./extern/ocl_clfft-src/ - cp -R --no-preserve=mode,ownership ${spdlog}/* ./extern/spdlog-src/ - - # libaf.so (the unified backend) tries to load the right shared library at - # runtime, and the search paths are hard-coded... We tweak them to point to - # the installation directory in the Nix store. - substituteInPlace src/api/unified/symbol_manager.cpp \ - --replace '"/opt/arrayfire-3/lib/",' \ - "\"$out/lib/\", \"/opt/arrayfire-3/lib/\"," - ''; - - inherit doCheck; - checkPhase = - let - LD_LIBRARY_PATH = builtins.concatStringsSep ":" ( - [ - "${forge}/lib" - "${freeimage}/lib" - ] - ++ lib.optional cudaSupport "${cudaPackages.cudatoolkit}/lib64" - # On non-NixOS systems, help the tests find Nvidia drivers - ++ lib.optional (nvidiaComputeDrivers != null) "${nvidiaComputeDrivers}/lib" - ); - ctestFlags = builtins.concatStringsSep " " ( - # We have to run with "-j1" otherwise various segfaults occur on non-NixOS systems. - [ - "--output-on-errors" - "-j1" - ] - # See https://github.com/arrayfire/arrayfire/issues/3484 - ++ lib.optional openclSupport "-E '(inverse_dense|cholesky_dense)'" - ); - in - '' - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} - '' - + - # On non-NixOS systems, help the tests find Nvidia drivers - lib.optionalString (openclSupport && nvidiaComputeDrivers != null) '' - export OCL_ICD_VENDORS=${nvidiaComputeDrivers}/etc/OpenCL/vendors - '' - + '' - # Note: for debugging, enable AF_TRACE=all - AF_PRINT_ERRORS=1 ctest ${ctestFlags} - ''; - - buildInputs = [ - blas - boost.dev - boost.out - clblast - fftw - fftwFloat - # We need fmt_9 because ArrayFire fails to compile with newer versions. - fmt_9 - forge - freeimage - gtest - lapack - libGL - ocl-icd - opencl-clhpp - span-lite - ] - ++ lib.optionals cudaSupport [ - cudaPackages.cudatoolkit - cudaPackages.cudnn - cudaPackages.cuda_cccl - ] - ++ lib.optionals openclSupport [ - mesa - ]; - - nativeBuildInputs = [ - cmake - pkg-config - python3 - ]; - - meta = with lib; { - description = "General-purpose library for parallel and massively-parallel computations"; - longDescription = '' - A general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices."; - ''; - license = licenses.bsd3; - homepage = "https://arrayfire.com/"; - platforms = platforms.linux; - maintainers = with maintainers; [ - chessai - twesterhout - ]; - broken = true; - }; -} diff --git a/pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch b/pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch deleted file mode 100644 index 5c9b3d194392..000000000000 --- a/pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/resources/systems/linux/es_find_rules.xml 2024-09-13 16:19:36.000000000 +0300 -+++ b/resources/systems/linux/es_find_rules.xml 2024-11-26 23:08:49.204498848 +0200 -@@ -41,6 +41,9 @@ - /usr/lib64/libretro - - /usr/lib/libretro -+ -+ /run/current-system/sw/lib/retroarch/cores -+ ~/.nix-profile/lib/retroarch/cores - - - diff --git a/pkgs/by-name/em/emulationstation-de/package.nix b/pkgs/by-name/em/emulationstation-de/package.nix deleted file mode 100644 index 7646b0754512..000000000000 --- a/pkgs/by-name/em/emulationstation-de/package.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - stdenv, - fetchzip, - cmake, - pkg-config, - alsa-lib, - bluez, - curl, - ffmpeg, - freeimage, - freetype, - gettext, - harfbuzz, - icu, - libgit2, - poppler, - pugixml, - SDL2, - libGL, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "emulationstation-de"; - version = "3.2.0"; - - src = fetchzip { - url = "https://gitlab.com/es-de/emulationstation-de/-/archive/v${finalAttrs.version}/emulationstation-de-v${finalAttrs.version}.tar.gz"; - hash = "sha256-tW8+7ImcJ3mBhoIHVE8h4cba+4SQLP55kiFYE7N8jyI="; - }; - - patches = [ - ./001-add-nixpkgs-retroarch-cores.patch - ]; - - postPatch = '' - # ldd-based detection fails for cross builds - substituteInPlace CMake/Packages/FindPoppler.cmake \ - --replace-fail 'GET_PREREQUISITES("''${POPPLER_LIBRARY}" POPPLER_PREREQS 1 0 "" "")' "" - ''; - - nativeBuildInputs = [ - cmake - gettext # msgfmt - pkg-config - ]; - - buildInputs = [ - alsa-lib - bluez - curl - ffmpeg - freeimage - freetype - harfbuzz - icu - libgit2 - poppler - pugixml - SDL2 - libGL - ]; - - cmakeFlags = [ (lib.cmakeBool "APPLICATION_UPDATER" false) ]; - - meta = { - description = "ES-DE (EmulationStation Desktop Edition) is a frontend for browsing and launching games from your multi-platform collection"; - homepage = "https://es-de.org"; - maintainers = with lib.maintainers; [ ivarmedi ]; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - mainProgram = "es-de"; - }; -}) diff --git a/pkgs/by-name/em/emulationstation/package.nix b/pkgs/by-name/em/emulationstation/package.nix deleted file mode 100644 index eb8c048d4ea1..000000000000 --- a/pkgs/by-name/em/emulationstation/package.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - lib, - SDL2, - alsa-lib, - boost, - callPackage, - cmake, - curl, - freeimage, - freetype, - libGL, - libGLU, - libvlc, - pkg-config, - rapidjson, - stdenv, -}: - -let - sources = callPackage ./sources.nix { }; -in -stdenv.mkDerivation { - inherit (sources.emulationstation) pname version src; - - postUnpack = '' - pushd $sourceRoot/external/pugixml - cp --verbose --archive ${sources.pugixml.src}/* . - chmod --recursive 744 . - popd - ''; - - nativeBuildInputs = [ - SDL2 - cmake - pkg-config - ]; - - buildInputs = [ - SDL2 - alsa-lib - boost - curl - freeimage - freetype - libGL - libGLU - libvlc - rapidjson - ]; - - cmakeFlags = [ (lib.cmakeBool "GL" true) ]; - - strictDeps = true; - - installPhase = '' - runHook preInstall - - install -Dm755 ../emulationstation $out/bin/emulationstation - mkdir -p $out/share/emulationstation/ - cp -r ../resources $out/share/emulationstation/ - - runHook postInstall - ''; - - # es-core/src/resources/ResourceManager.cpp: resources are searched at the - # same place of binaries. - postFixup = '' - pushd $out - ln -s $out/share/emulationstation/resources $out/bin/ - popd - ''; - - passthru = { - inherit sources; - }; - - meta = { - homepage = "https://github.com/RetroPie/EmulationStation"; - description = "Flexible emulator front-end supporting keyboardless navigation and custom system themes (forked by RetroPie)"; - license = with lib.licenses; [ mit ]; - mainProgram = "emulationstation"; - maintainers = with lib.maintainers; [ - edwtjo - ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/em/emulationstation/sources.nix b/pkgs/by-name/em/emulationstation/sources.nix deleted file mode 100644 index 88273e845fee..000000000000 --- a/pkgs/by-name/em/emulationstation/sources.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ fetchFromGitHub }: - -{ - emulationstation = - let - self = { - pname = "emulationstation"; - version = "2.11.2"; - - src = fetchFromGitHub { - owner = "RetroPie"; - repo = "EmulationStation"; - rev = "v${self.version}"; - hash = "sha256-f2gRkp+3Pp2qnvg2RBzaHPpzhAnwx0+5x1Pe3kD90xE="; - }; - }; - in - self; - - pugixml = - let - self = { - pname = "pugixml"; - version = "1.8.1"; - - src = fetchFromGitHub { - owner = "zeux"; - repo = "pugixml"; - rev = "v${self.version}"; - hash = "sha256-LbjTN1hnIbqI79C+gCdwuDG0+B/5yXf7hg0Q+cDFIf4="; - }; - }; - in - self; -} diff --git a/pkgs/by-name/fo/forge/no-download-glad.patch b/pkgs/by-name/fo/forge/no-download-glad.patch deleted file mode 100644 index 0957be82a3b7..000000000000 --- a/pkgs/by-name/fo/forge/no-download-glad.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeModules/ForgeConfigureDepsVars.cmake b/CMakeModules/ForgeConfigureDepsVars.cmake -index ee5c2fc..2f75181 100644 ---- a/CMakeModules/ForgeConfigureDepsVars.cmake -+++ b/CMakeModules/ForgeConfigureDepsVars.cmake -@@ -84,7 +84,7 @@ macro(fg_dep_check_and_populate dep_prefix) - URL ${fdcp_args_URI} - URL_HASH ${fdcp_args_REF} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild" -@@ -94,7 +94,7 @@ macro(fg_dep_check_and_populate dep_prefix) - QUIET - URL ${fdcp_args_URI} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild" -@@ -106,7 +106,7 @@ macro(fg_dep_check_and_populate dep_prefix) - GIT_REPOSITORY ${fdcp_args_URI} - GIT_TAG ${fdcp_args_REF} - DOWNLOAD_COMMAND \"\" -- UPDATE_DISCONNECTED ON -+ UPDATE_COMMAND \"\" - SOURCE_DIR "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src" - BINARY_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-build" - SUBBUILD_DIR "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild" diff --git a/pkgs/by-name/fo/forge/package.nix b/pkgs/by-name/fo/forge/package.nix deleted file mode 100644 index 653f33eab53c..000000000000 --- a/pkgs/by-name/fo/forge/package.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - boost, - cmake, - expat, - fetchFromGitHub, - fontconfig, - freeimage, - freetype, - glfw3, - glm, - lib, - libGLU, - libGL, - libgbm, - opencl-clhpp, - pkg-config, - stdenv, - SDL2, -}: - -stdenv.mkDerivation rec { - pname = "forge"; - version = "1.0.8"; - - src = fetchFromGitHub { - owner = "arrayfire"; - repo = "forge"; - rev = "v1.0.8"; - sha256 = "sha256-lSZAwcqAHiuZkpYcVfwvZCfNmEF3xGN9S/HuZQrGeKU="; - }; - glad = fetchFromGitHub { - owner = "arrayfire"; - repo = "glad"; - rev = "b94680aee5b8ce01ae1644c5f2661769366c765a"; - hash = "sha256-CrZy76gOGMpy9f1NuMK4tokZ57U//zYeNH5ZYY0SC2U="; - }; - - # This patch ensures that Forge does not try to fetch glad from GitHub and - # uses our sources that we've checked out via Nix. - patches = [ ./no-download-glad.patch ]; - - postPatch = '' - mkdir -p ./extern - cp -R --no-preserve=mode,ownership ${glad} ./extern/fg_glad-src - ln -s ${opencl-clhpp} ./extern/cl2hpp - ''; - - cmakeFlags = [ "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - boost.out - boost.dev - expat - fontconfig - freeimage - freetype - glfw3 - glm - libGL - libGLU - opencl-clhpp - SDL2 - libgbm - ]; - - meta = with lib; { - description = "OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend"; - longDescription = '' - An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend. - The goal of Forge is to provide high performance OpenGL visualizations for C/C++ applications that use CUDA/OpenCL. - Forge uses OpenGL >=3.3 forward compatible contexts, so please make sure you have capable hardware before trying it out. - ''; - license = licenses.bsd3; - homepage = "https://arrayfire.com/"; - platforms = platforms.linux; - maintainers = with maintainers; [ - chessai - twesterhout - ]; - }; -} diff --git a/pkgs/by-name/ga/gamecube-tools/package.nix b/pkgs/by-name/ga/gamecube-tools/package.nix deleted file mode 100644 index edf3e5b21684..000000000000 --- a/pkgs/by-name/ga/gamecube-tools/package.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - freeimage, - libGL, -}: - -stdenv.mkDerivation rec { - version = "1.0.6"; - pname = "gamecube-tools"; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ - freeimage - libGL - ]; - - src = fetchFromGitHub { - owner = "devkitPro"; - repo = "gamecube-tools"; - rev = "v${version}"; - sha256 = "sha256-GsTmwyxBc36Qg+UGy+cRAjGW1eh1XxV0s94B14ZJAjU="; - }; - - meta = with lib; { - description = "Tools for gamecube/wii projects"; - homepage = "https://github.com/devkitPro/gamecube-tools/"; - license = licenses.gpl2; - maintainers = with maintainers; [ tomsmeets ]; - }; -} diff --git a/pkgs/by-name/pe/perceptualdiff/package.nix b/pkgs/by-name/pe/perceptualdiff/package.nix deleted file mode 100644 index 0f2154629c3d..000000000000 --- a/pkgs/by-name/pe/perceptualdiff/package.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - freeimage, -}: - -stdenv.mkDerivation rec { - pname = "perceptualdiff"; - version = "2.1"; - - src = fetchFromGitHub { - owner = "myint"; - repo = "perceptualdiff"; - rev = "v${version}"; - sha256 = "176n518xv0pczf1yyz9r5a8zw5r6sh5ym596kmvw30qznp8n4a8j"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ freeimage ]; - - meta = with lib; { - description = "Program that compares two images using a perceptually based image metric"; - homepage = "https://github.com/myint/perceptualdiff"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ uri-canva ]; - platforms = platforms.unix; - mainProgram = "perceptualdiff"; - }; -} diff --git a/pkgs/by-name/pg/pgf_graphics/package.nix b/pkgs/by-name/pg/pgf_graphics/package.nix deleted file mode 100644 index f92be10a6307..000000000000 --- a/pkgs/by-name/pg/pgf_graphics/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - stdenv, - fetchzip, - autoreconfHook, - dos2unix, - doxygen, - freeimage, - libpgf, -}: - -stdenv.mkDerivation rec { - pname = "pgf"; - version = "7.21.7"; - - src = fetchzip { - url = "mirror://sourceforge/libpgf/libpgf/${version}/pgf-console.zip"; - hash = "sha256-W9eXYhbynLtvZQsn724Uw0SZ5TuyK2MwREwYKGFhJj0="; - }; - - postPatch = '' - find . -type f | xargs dos2unix - mv README.txt README - ''; - - nativeBuildInputs = [ - autoreconfHook - dos2unix - doxygen - ]; - - buildInputs = [ - freeimage - libpgf - ]; - - meta = { - homepage = "https://www.libpgf.org/"; - description = "Progressive Graphics Format command line program"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/po/posterazor/package.nix b/pkgs/by-name/po/posterazor/package.nix deleted file mode 100644 index 300f959bb0f2..000000000000 --- a/pkgs/by-name/po/posterazor/package.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - cmake, - unzip, - pkg-config, - libXpm, - fltk13, - freeimage, -}: - -stdenv.mkDerivation rec { - pname = "posterazor"; - version = "1.5.1"; - - src = fetchurl { - url = "mirror://sourceforge/posterazor/${version}/PosteRazor-${version}-Source.zip"; - hash = "sha256-BbujA2ASyqQelb3iFAwgeJC0OhzXqufIa1UD+tFsF7c="; - }; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ - cmake - pkg-config - unzip - ]; - buildInputs = [ - libXpm - fltk13 - freeimage - ]; - - unpackPhase = '' - unzip $src -d posterazor - cd posterazor/src - ''; - - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667328 - patchPhase = '' - sed "s/\(#define CASESENSITIVESTRCMP strcasecmp\)/#include \n\1/" -i FlPosteRazorDialog.cpp - ''; - - installPhase = '' - mkdir -p $out/bin - cp PosteRazor $out/bin - ''; - - meta = with lib; { - homepage = "http://posterazor.sourceforge.net/"; - description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.madjar ]; - mainProgram = "PosteRazor"; - }; -} diff --git a/pkgs/by-name/ru/rucksack/package.nix b/pkgs/by-name/ru/rucksack/package.nix deleted file mode 100644 index c6d84a6f2961..000000000000 --- a/pkgs/by-name/ru/rucksack/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - liblaxjson, - cmake, - freeimage, -}: - -stdenv.mkDerivation rec { - version = "3.1.0"; - pname = "rucksack"; - - src = fetchFromGitHub { - owner = "andrewrk"; - repo = "rucksack"; - rev = version; - sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - liblaxjson - freeimage - ]; - - meta = with lib; { - description = "Texture packer and resource bundler"; - platforms = [ - "i686-linux" - "x86_64-linux" - ]; # fails on Darwin and AArch64 - homepage = "https://github.com/andrewrk/rucksack"; - license = licenses.mit; - maintainers = [ maintainers.andrewrk ]; - }; -} diff --git a/pkgs/by-name/tr/trenchbroom/package.nix b/pkgs/by-name/tr/trenchbroom/package.nix deleted file mode 100644 index bc7a43919e18..000000000000 --- a/pkgs/by-name/tr/trenchbroom/package.nix +++ /dev/null @@ -1,175 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - writeText, - cmake, - ninja, - curl, - git, - pandoc, - pkg-config, - unzip, - zip, - libGL, - libGLU, - freeimage, - freetype, - assimp, - catch2, - fmt, - glew, - miniz, - tinyxml-2, - xorg, - qt6, - copyDesktopItems, - makeDesktopItem, -}: - -stdenv.mkDerivation rec { - pname = "TrenchBroom"; - version = "2025.2"; - - src = fetchFromGitHub { - owner = "TrenchBroom"; - repo = "TrenchBroom"; - tag = "v${version}"; - hash = "sha256-aOHhL0yBDgFTMcDY7RKZXRrReRiThcQdf7QMHEpRuks="; - fetchSubmodules = true; - }; - - # Manually simulate a vcpkg installation so that it can link the libraries - # properly. - postUnpack = - let - vcpkg_target = "x64-linux"; - - vcpkg_pkgs = [ - "assimp" - "catch2" - "fmt" - "freeimage" - "freetype" - "glew" - "miniz" - "tinyxml2" - ]; - - updates_vcpkg_file = writeText "update_vcpkg_trenchbroom" ( - lib.concatMapStringsSep "\n" (name: '' - Package : ${name} - Architecture : ${vcpkg_target} - Version : 1.0 - Status : is installed - '') vcpkg_pkgs - ); - in - '' - export VCPKG_ROOT="$TMP/vcpkg" - - mkdir -p $VCPKG_ROOT/.vcpkg-root - mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib - mkdir -p $VCPKG_ROOT/installed/vcpkg/updates - ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status - mkdir -p $VCPKG_ROOT/installed/vcpkg/info - ${lib.concatMapStrings (name: '' - touch $VCPKG_ROOT/installed/vcpkg/info/${name}_1.0_${vcpkg_target}.list - '') vcpkg_pkgs} - - ln -s ${assimp.lib}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${catch2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${fmt}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${freeimage}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${freetype}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${glew.out}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${miniz}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${tinyxml-2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ''; - - postPatch = '' - substituteInPlace common/src/Version.h.in \ - --subst-var-by APP_VERSION_YEAR ${lib.versions.major version} \ - --subst-var-by APP_VERSION_NUMBER ${lib.versions.minor version} \ - --subst-var-by GIT_DESCRIBE v${version} - substituteInPlace app/CMakeLists.txt \ - --replace-fail 'set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")' 'set(CPACK_PACKAGING_INSTALL_PREFIX "'$out'")' - ''; - - nativeBuildInputs = [ - cmake - ninja - curl - git - pandoc - qt6.wrapQtAppsHook - copyDesktopItems - pkg-config - unzip - zip - ]; - - buildInputs = [ - libGL - libGLU - xorg.libXxf86vm - xorg.libSM - freeimage - freetype - qt6.qtbase - qt6.qtwayland - qt6.qtsvg - catch2 - fmt - glew - miniz - tinyxml-2 - assimp - ]; - - QT_PLUGIN_PATH = "${qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}"; - - QT_QPA_PLATFORM = "offscreen"; - - cmakeFlags = [ - "-DCMAKE_MAKE_PROGRAM=ninja" - "-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake" - "-DVCPKG_MANIFEST_INSTALL=OFF" - # https://github.com/TrenchBroom/TrenchBroom/issues/4002#issuecomment-1125390780 - "-DCMAKE_PREFIX_PATH=cmake/packages" - ]; - - ninjaFlags = [ "TrenchBroom" ]; - - postInstall = '' - pushd ../app/resources/linux/icons - - for F in icon_*.png; do - SIZE=$(echo $F|sed -e s/icon_// -e s/.png//) - DIR=$out/share/icons/hicolor/$SIZE"x"$SIZE/apps - install -Dm644 $F $DIR/trenchbroom.png - done - - popd - ''; - - desktopItems = [ - (makeDesktopItem { - name = "TrenchBroom"; - desktopName = "TrenchBroom level editor"; - icon = "trenchbroom"; - comment = meta.description; - categories = [ "Development" ]; - exec = "trenchbroom"; - }) - ]; - - meta = { - homepage = "https://trenchbroom.github.io/"; - changelog = "https://github.com/TrenchBroom/TrenchBroom/releases/tag/v${version}"; - description = "Level editor for Quake-engine based games"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ astro ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9f8b8dd7d5ae..30eb6aa12ea8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -478,6 +478,7 @@ mapAliases { aria = aria2; # Added 2024-03-26 artim-dark = aritim-dark; # Added 2025-07-27 armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11 + arrayfire = throw "arrayfire was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 aseprite-unfree = aseprite; # Added 2023-08-26 asitop = macpm; # 'macpm' is a better-maintained downstream; keep 'asitop' for backwards-compatibility async = throw "'async' has been removed due to lack of upstream maintenance"; # Added 2025-01-26 @@ -863,6 +864,8 @@ mapAliases { embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14 EmptyEpsilon = empty-epsilon; # Added 2024-07-14 + emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 + emulationstation-de = throw "emulationstation-de was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 enyo-doom = enyo-launcher; # Added 2022-09-09 eolie = throw "'eolie' has been removed due to being unmaintained"; # Added 2025-04-15 epapirus-icon-theme = throw "'epapirus-icon-theme' has been removed because 'papirus-icon-theme' no longer supports building with elementaryOS icon support"; # Added 2025-06-15 @@ -955,6 +958,7 @@ mapAliases { fntsample = throw "fntsample has been removed as it is unmaintained upstream"; # Added 2025-04-21 foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17 follow = lib.warnOnInstantiate "follow has been renamed to folo" folo; # Added 2025-05-18 + forge = throw "forge was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 forgejo-actions-runner = forgejo-runner; # Added 2024-04-04 fornalder = throw "'fornalder' has been removed as it is unmaintained upstream"; # Added 2025-01-25 foundationdb71 = throw "foundationdb71 has been removed; please upgrade to foundationdb73"; # Added 2024-12-28 @@ -984,6 +988,7 @@ mapAliases { g4music = gapless; # Added 2024-07-26 g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17 + gamecube-tools = throw "gamecube-tools was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19 garage_0_8 = throw "'garage_0_8' has been removed as it is unmaintained upstream"; # Added 2025-06-23 garage_0_8_7 = throw "'garage_0_8_7' has been removed as it is unmaintained upstream"; # Added 2025-06-23 @@ -2073,6 +2078,7 @@ mapAliases { pds = lib.warnOnInstantiate "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20 pdsadmin = lib.warnOnInstantiate "'pdsadmin' has been renamed to 'bluesky-pdsadmin'" bluesky-pdsadmin; # Added 2025-08-20 peach = asouldocs; # Added 2022-08-28 + perceptual-diff = throw "perceptual-diff was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 percona-server_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13 percona-server_lts = percona-server; # Added 2024-10-13 percona-xtrabackup_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-xtrabackup; # Added 2024-10-13 @@ -2085,6 +2091,7 @@ mapAliases { petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09 pg-gvm = throw "pg-gvm has been moved to postgresql.pkgs.pg-gvm to make it work with all versions of PostgreSQL"; # added 2024-11-30 pgadmin = pgadmin4; # Added 2022-01-14 + pgf_graphics = throw "pgf_graphics was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 pharo-spur64 = pharo; # Added 2022-08-03 phlare = throw "'phlare' has been removed as the upstream project was archived."; # Added 2025-03-27 php81 = throw "php81 is EOL"; @@ -2124,6 +2131,7 @@ mapAliases { polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25 poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03 posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17 + posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 powerdns = pdns; # Added 2022-03-28 postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03 presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24 @@ -2341,6 +2349,7 @@ mapAliases { rubyPackages_3_1 = throw "rubyPackages_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12 rubyPackages_3_2 = throw "rubyPackages_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11’s support cycle"; # Added 2025-10-12 ruby-zoom = throw "'ruby-zoom' has been removed due to lack of maintaince and had not been updated since 2020"; # Added 2025-08-24 + rucksack = throw "rucksack was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 runCommandNoCC = runCommand; # Added 2021-08-15 runCommandNoCCLocal = runCommandLocal; # Added 2021-08-15 run-scaled = throw "run-scaled has been removed due to being deprecated. Consider using run_scaled from 'xpra' instead"; # Added 2025-03-17 @@ -2633,6 +2642,7 @@ mapAliases { transcode = throw "transcode has been removed as it is unmaintained"; # Added 2024-12-11 transfig = fig2dev; # Added 2022-02-15 transifex-client = transifex-cli; # Added 2023-12-29 + trenchbroom = throw "trenchbroom was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 trfl = throw "trfl has been removed, because it has not received an update for 3 years and was broken"; # Added 2024-07-25 trezor_agent = trezor-agent; # Added 2024-01-07 trilium-next-desktop = trilium-desktop; # Added 2025-08-30 From 3e505de718c840728e2c84890a5ed99eee8f26cd Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 23 Oct 2025 13:40:15 +0200 Subject: [PATCH 2/2] freeimage: drop Very insecure. --- lib/licenses.nix | 5 - .../by-name/fr/freeimage/CVE-2020-24292.patch | 13 - .../by-name/fr/freeimage/CVE-2020-24293.patch | 14 - .../by-name/fr/freeimage/CVE-2020-24295.patch | 21 - .../by-name/fr/freeimage/CVE-2021-33367.patch | 19 - .../by-name/fr/freeimage/CVE-2021-40263.patch | 15 - .../by-name/fr/freeimage/CVE-2021-40266.patch | 14 - .../by-name/fr/freeimage/CVE-2023-47995.patch | 14 - .../by-name/fr/freeimage/CVE-2023-47997.patch | 16 - pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff | 15 - pkgs/by-name/fr/freeimage/package.nix | 170 ----- pkgs/by-name/fr/freeimage/unbundle.diff | 584 ------------------ pkgs/by-name/im/imv/package.nix | 3 +- pkgs/by-name/li/libtiff/package.nix | 2 - pkgs/by-name/me/megacmd/package.nix | 9 +- pkgs/development/lisp-modules/ql.nix | 3 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 18 files changed, 5 insertions(+), 917 deletions(-) delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2020-24292.patch delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2020-24293.patch delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2020-24295.patch delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2021-33367.patch delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2021-40263.patch delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2021-40266.patch delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2023-47995.patch delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2023-47997.patch delete mode 100644 pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff delete mode 100644 pkgs/by-name/fr/freeimage/package.nix delete mode 100644 pkgs/by-name/fr/freeimage/unbundle.diff diff --git a/lib/licenses.nix b/lib/licenses.nix index 9e2edd69836a..b3d4a82b87c8 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -620,11 +620,6 @@ lib.mapAttrs mkLicense ( fullName = "Unspecified free software license"; }; - freeimage = { - spdxId = "FreeImage"; - fullName = "FreeImage Public License v1.0"; - }; - fsl11Mit = { fullName = "Functional Source License, Version 1.1, MIT Future License"; spdxId = "FSL-1.1-MIT"; diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch deleted file mode 100644 index 059bb5a520c2..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginICO.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginICO.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginICO.cpp 2023-09-28 19:34:45.524031668 +0200 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginICO.cpp 2023-09-28 19:34:47.717009813 +0200 -@@ -301,6 +301,9 @@ LoadStandardIcon(FreeImageIO *io, fi_han - int width = bmih.biWidth; - int height = bmih.biHeight / 2; // height == xor + and mask - unsigned bit_count = bmih.biBitCount; -+ if (bit_count != 1 && bit_count != 2 && bit_count != 4 && bit_count != 8 && bit_count != 16 && bit_count != 24 && bit_count != 32) { -+ return NULL; -+ } - unsigned line = CalculateLine(width, bit_count); - unsigned pitch = CalculatePitch(line); - diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch deleted file mode 100644 index d457ae51fe07..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.287014100 +0200 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.832008666 +0200 -@@ -780,6 +780,10 @@ int psdThumbnail::Read(FreeImageIO *io, - FreeImage_Unload(_dib); - } - -+ if (_WidthBytes != _Width * _BitPerPixel / 8) { -+ throw "Invalid PSD image"; -+ } -+ - if(_Format == 1) { - // kJpegRGB thumbnail image - _dib = FreeImage_LoadFromHandle(FIF_JPEG, io, handle); diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch deleted file mode 100644 index 2f3bac236737..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.936007630 +0200 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp 2023-09-28 19:34:47.940007590 +0200 -@@ -1466,6 +1466,7 @@ FIBITMAP* psdParser::ReadImageData(FreeI - const unsigned dstBpp = (depth == 1) ? 1 : FreeImage_GetBPP(bitmap)/8; - const unsigned dstLineSize = FreeImage_GetPitch(bitmap); - BYTE* const dst_first_line = FreeImage_GetScanLine(bitmap, nHeight - 1);//<*** flipped -+ const unsigned dst_buffer_size = dstLineSize * nHeight; - - BYTE* line_start = new BYTE[lineSize]; //< fileline cache - -@@ -1481,6 +1482,9 @@ FIBITMAP* psdParser::ReadImageData(FreeI - const unsigned channelOffset = GetChannelOffset(bitmap, c) * bytes; - - BYTE* dst_line_start = dst_first_line + channelOffset; -+ if (channelOffset + lineSize > dst_buffer_size) { -+ throw "Invalid PSD image"; -+ } - for(unsigned h = 0; h < nHeight; ++h, dst_line_start -= dstLineSize) {//<*** flipped - io->read_proc(line_start, lineSize, 1, handle); - ReadImageLine(dst_line_start, line_start, lineSize, dstBpp, bytes); diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch b/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch deleted file mode 100644 index 655a8e7f70cc..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/Metadata/Exif.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/Metadata/Exif.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/Metadata/Exif.cpp 2023-09-28 19:34:45.003036859 +0200 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/Metadata/Exif.cpp 2023-09-28 19:34:47.505011926 +0200 -@@ -770,8 +770,13 @@ jpeg_read_exif_dir(FIBITMAP *dib, const - // - - const WORD entriesCount0th = ReadUint16(msb_order, ifd0th); -- -- DWORD next_offset = ReadUint32(msb_order, DIR_ENTRY_ADDR(ifd0th, entriesCount0th)); -+ -+ const BYTE* de_addr = DIR_ENTRY_ADDR(ifd0th, entriesCount0th); -+ if(de_addr+4 >= (BYTE*)(dwLength + ifd0th - tiffp)) { -+ return TRUE; //< no thumbnail -+ } -+ -+ DWORD next_offset = ReadUint32(msb_order, de_addr); - if((next_offset == 0) || (next_offset >= dwLength)) { - return TRUE; //< no thumbnail - } diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch b/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch deleted file mode 100644 index 11681c372be3..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.713009853 +0200 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:48.043006563 +0200 -@@ -2142,6 +2142,11 @@ Load(FreeImageIO *io, fi_handle handle, - uint32_t tileRowSize = (uint32_t)TIFFTileRowSize(tif); - uint32_t imageRowSize = (uint32_t)TIFFScanlineSize(tif); - -+ if (width / tileWidth * tileRowSize * 8 > bitspersample * samplesperpixel * width) { -+ free(tileBuffer); -+ throw "Corrupted tiled TIFF file"; -+ } -+ - - // In the tiff file the lines are saved from up to down - // In a DIB the lines must be saved from down to up diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch b/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch deleted file mode 100644 index 8526f9814851..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.501011966 +0200 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2023-09-28 19:34:47.610010879 +0200 -@@ -372,6 +372,10 @@ static void - ReadPalette(TIFF *tiff, uint16_t photometric, uint16_t bitspersample, FIBITMAP *dib) { - RGBQUAD *pal = FreeImage_GetPalette(dib); - -+ if (!pal) { -+ return; -+ } -+ - switch(photometric) { - case PHOTOMETRIC_MINISBLACK: // bitmap and greyscale image types - case PHOTOMETRIC_MINISWHITE: diff --git a/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch b/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch deleted file mode 100644 index ccd623b81fa1..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginJPEG.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginJPEG.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginJPEG.cpp 2024-03-10 14:22:17.818579271 +0100 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginJPEG.cpp 2024-03-10 14:22:18.776573816 +0100 -@@ -1086,6 +1086,10 @@ Load(FreeImageIO *io, fi_handle handle, - - jpeg_read_header(&cinfo, TRUE); - -+ if (cinfo.image_width > JPEG_MAX_DIMENSION || cinfo.image_height > JPEG_MAX_DIMENSION) { -+ throw FI_MSG_ERROR_DIB_MEMORY; -+ } -+ - // step 4: set parameters for decompression - - unsigned int scale_denom = 1; // fraction by which to scale image diff --git a/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch b/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch deleted file mode 100644 index 2969c738c509..000000000000 --- a/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp ---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp 2024-03-10 14:22:18.669574426 +0100 -+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp 2024-03-10 14:22:18.673574403 +0100 -@@ -1484,6 +1484,12 @@ Load(FreeImageIO *io, fi_handle handle, - (int)bitspersample, (int)samplesperpixel, (int)photometric); - throw (char*)NULL; - } -+ if (planar_config == PLANARCONFIG_SEPARATE && bitspersample < 8) { -+ FreeImage_OutputMessageProc(s_format_id, -+ "Unable to handle this format: bitspersample = 8, TIFFTAG_PLANARCONFIG = PLANARCONFIG_SEPARATE" -+ ); -+ throw (char*)NULL; -+ } - - // --------------------------------------------------------------------------------- - diff --git a/pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff b/pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff deleted file mode 100644 index 13abd5dd7089..000000000000 --- a/pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff +++ /dev/null @@ -1,15 +0,0 @@ -Fix build with libtiff 4.4.0 by not using a private libtiff API. -Patch by Kurt Schwehr: https://sourceforge.net/p/freeimage/discussion/36109/thread/2018fdc6e7/ - -diff -ru a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp ---- a/Source/Metadata/XTIFF.cpp -+++ b/Source/Metadata/XTIFF.cpp -@@ -749,7 +749,7 @@ - continue; - } - // type of storage may differ (e.g. rationnal array vs float array type) -- if((unsigned)_TIFFDataSize(tif_tag_type) != FreeImage_TagDataWidth(tag_type)) { -+ if((unsigned)TIFFFieldSetGetSize(fld) != FreeImage_TagDataWidth(tag_type)) { - // skip tag or _TIFFmemcpy will fail - continue; - } diff --git a/pkgs/by-name/fr/freeimage/package.nix b/pkgs/by-name/fr/freeimage/package.nix deleted file mode 100644 index e541840df2b5..000000000000 --- a/pkgs/by-name/fr/freeimage/package.nix +++ /dev/null @@ -1,170 +0,0 @@ -{ - lib, - stdenv, - fetchsvn, - cctools, - libtiff, - libpng, - zlib, - libwebp, - libraw, - openexr, - openjpeg, - libjpeg, - jxrlib, - pkg-config, - fixDarwinDylibNames, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "freeimage"; - version = "3.18.0-unstable-2024-04-18"; - - src = fetchsvn { - url = "svn://svn.code.sf.net/p/freeimage/svn/"; - rev = "1911"; - hash = "sha256-JznVZUYAbsN4FplnuXxCd/ITBhH7bfGKWXep2A6mius="; - }; - - sourceRoot = "${finalAttrs.src.name}/FreeImage/trunk"; - - # Ensure that the bundled libraries are not used at all - prePatch = '' - rm -rf Source/Lib* Source/OpenEXR Source/ZLib - ''; - - # Tell patch to work with trailing carriage returns - patchFlags = [ - "-p1" - "--binary" - ]; - - patches = [ - ./unbundle.diff - ./CVE-2020-24292.patch - ./CVE-2020-24293.patch - ./CVE-2020-24295.patch - ./CVE-2021-33367.patch - ./CVE-2021-40263.patch - ./CVE-2021-40266.patch - ./CVE-2023-47995.patch - ./CVE-2023-47997.patch - ]; - - postPatch = '' - # To support cross compilation, use the correct `pkg-config`. - substituteInPlace Makefile.fip \ - --replace "pkg-config" "$PKG_CONFIG" - substituteInPlace Makefile.gnu \ - --replace "pkg-config" "$PKG_CONFIG" - '' - + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' - # Upstream Makefile hardcodes i386 and x86_64 architectures only - substituteInPlace Makefile.osx --replace "x86_64" "arm64" - ''; - - nativeBuildInputs = [ - pkg-config - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools - fixDarwinDylibNames - ]; - - buildInputs = [ - libtiff - libtiff.dev_private - libpng - zlib - libwebp - libraw - openexr - openjpeg - libjpeg - libjpeg.dev_private - jxrlib - ]; - - postBuild = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - make -f Makefile.fip - ''; - - INCDIR = "${placeholder "out"}/include"; - INSTALLDIR = "${placeholder "out"}/lib"; - - preInstall = '' - mkdir -p $INCDIR $INSTALLDIR - '' - # Workaround for Makefiles.osx not using ?= - + lib.optionalString stdenv.hostPlatform.isDarwin '' - makeFlagsArray+=( "INCDIR=$INCDIR" "INSTALLDIR=$INSTALLDIR" ) - ''; - - postInstall = - lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - make -f Makefile.fip install - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - ln -s $out/lib/libfreeimage.3.dylib $out/lib/libfreeimage.dylib - ''; - - enableParallelBuilding = true; - - meta = { - description = "Open Source library for accessing popular graphics image file formats"; - homepage = "http://freeimage.sourceforge.net/"; - license = with lib.licenses; [ - freeimage - gpl2Only - gpl3Only - ]; - knownVulnerabilities = [ - "CVE-2024-31570" - "CVE-2024-28584" - "CVE-2024-28583" - "CVE-2024-28582" - "CVE-2024-28581" - "CVE-2024-28580" - "CVE-2024-28579" - "CVE-2024-28578" - "CVE-2024-28577" - "CVE-2024-28576" - "CVE-2024-28575" - "CVE-2024-28574" - "CVE-2024-28573" - "CVE-2024-28572" - "CVE-2024-28571" - "CVE-2024-28570" - "CVE-2024-28569" - "CVE-2024-28568" - "CVE-2024-28567" - "CVE-2024-28566" - "CVE-2024-28565" - "CVE-2024-28564" - "CVE-2024-28563" - "CVE-2024-28562" - "CVE-2024-9029" - # "CVE-2023-47997" - "CVE-2023-47996" - # "CVE-2023-47995" - "CVE-2023-47994" - "CVE-2023-47993" - "CVE-2023-47992" - # "CVE-2021-40266" - "CVE-2021-40265" - "CVE-2021-40264" - # "CVE-2021-40263" - "CVE-2021-40262" - # "CVE-2021-33367" - # "CVE-2020-24295" - "CVE-2020-24294" - # "CVE-2020-24293" - # "CVE-2020-24292" - "CVE-2020-21426" - "CVE-2019-12214" - "CVE-2019-12212" - ]; - maintainers = [ ]; - platforms = with lib.platforms; unix; - }; -}) diff --git a/pkgs/by-name/fr/freeimage/unbundle.diff b/pkgs/by-name/fr/freeimage/unbundle.diff deleted file mode 100644 index 66df1176bca9..000000000000 --- a/pkgs/by-name/fr/freeimage/unbundle.diff +++ /dev/null @@ -1,584 +0,0 @@ -diff --git a/Makefile.fip b/Makefile.fip -index 660a0265..86b30401 100644 ---- a/Makefile.fip -+++ b/Makefile.fip -@@ -11,32 +11,21 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib - # Converts cr/lf to just lf - DOS2UNIX = dos2unix - --LIBRARIES = -lstdc++ -+LIBRARIES = -lstdc++ $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) - - MODULES = $(SRCS:.c=.o) - MODULES := $(MODULES:.cpp=.o) - -+INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) -+ - # C flags - CFLAGS ?= -std=c99 -O3 -fPIC -fexceptions -fvisibility=hidden --# OpenJPEG --CFLAGS += -DOPJ_STATIC --# LibRaw --CFLAGS += -DNO_LCMS --# LibJXR --CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ - CFLAGS += $(INCLUDE) - - # C++ flags - CXXFLAGS ?= -std=c++0x -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy --# LibJXR --CXXFLAGS += -D__ANSI__ - CXXFLAGS += $(INCLUDE) - --ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) -- CFLAGS += -fPIC -- CXXFLAGS += -fPIC --endif -- - TARGET = freeimageplus - STATICLIB = lib$(TARGET).a - SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so -@@ -76,10 +65,10 @@ $(SHAREDLIB): $(MODULES) - - install: - install -d $(INCDIR) $(INSTALLDIR) -- install -m 644 -o root -g root $(HEADER) $(INCDIR) -- install -m 644 -o root -g root $(HEADERFIP) $(INCDIR) -- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) -- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) -+ install -m 644 $(HEADER) $(INCDIR) -+ install -m 644 $(HEADERFIP) $(INCDIR) -+ install -m 644 $(STATICLIB) $(INSTALLDIR) -+ install -m 755 $(SHAREDLIB) $(INSTALLDIR) - ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) - ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) - -diff --git a/Makefile.gnu b/Makefile.gnu -index a4f26013..be954761 100644 ---- a/Makefile.gnu -+++ b/Makefile.gnu -@@ -11,32 +11,21 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib - # Converts cr/lf to just lf - DOS2UNIX = dos2unix - --LIBRARIES = -lstdc++ -+LIBRARIES = -lstdc++ $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) - - MODULES = $(SRCS:.c=.o) - MODULES := $(MODULES:.cpp=.o) - -+INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) -+ - # C flags - CFLAGS ?= -std=c99 -O3 -fPIC -fexceptions -fvisibility=hidden --# OpenJPEG --CFLAGS += -DOPJ_STATIC --# LibRaw --CFLAGS += -DNO_LCMS --# LibJXR --CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ - CFLAGS += $(INCLUDE) - - # C++ flags - CXXFLAGS ?= -std=c++0x -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy --# LibJXR --CXXFLAGS += -D__ANSI__ - CXXFLAGS += $(INCLUDE) - --ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) -- CFLAGS += -fPIC -- CXXFLAGS += -fPIC --endif -- - TARGET = freeimage - STATICLIB = lib$(TARGET).a - SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so -@@ -75,12 +64,11 @@ $(SHAREDLIB): $(MODULES) - - install: - install -d $(INCDIR) $(INSTALLDIR) -- install -m 644 -o root -g root $(HEADER) $(INCDIR) -- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) -- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) -+ install -m 644 $(HEADER) $(INCDIR) -+ install -m 644 $(STATICLIB) $(INSTALLDIR) -+ install -m 755 $(SHAREDLIB) $(INSTALLDIR) - ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) - ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) --# ldconfig - - clean: - rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) -diff --git a/Makefile.osx b/Makefile.osx -index c39121db..3800e39d 100644 ---- a/Makefile.osx -+++ b/Makefile.osx -@@ -10,24 +10,25 @@ MACOSX_SYSROOT = $(shell xcrun --show-sdk-path) - MACOSX_DEPLOYMENT_TARGET = 10.11 - - # General configuration variables: --CC_I386 = $(shell xcrun -find clang) --CC_X86_64 = $(shell xcrun -find clang) --CPP_I386 = $(shell xcrun -find clang++) --CPP_X86_64 = $(shell xcrun -find clang++) -+CC_I386 = clang -+CC_X86_64 = clang -+CPP_I386 = clang++ -+CPP_X86_64 = clang++ - MACOSX_DEPLOY = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET) - COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__ - COMPILERFLAGS_I386 = -arch i386 - COMPILERFLAGS_X86_64 = -arch x86_64 - COMPILERPPFLAGS = -Wno-ctor-dtor-privacy -D__ANSI__ -std=c++11 -stdlib=libc++ -Wc++11-narrowing --INCLUDE += --INCLUDE_I386 = -isysroot $(MACOSX_SYSROOT) --INCLUDE_X86_64 = -isysroot $(MACOSX_SYSROOT) -+INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) -+INCLUDE_I386 = -+INCLUDE_X86_64 = - CFLAGS_I386 = $(COMPILERFLAGS) $(COMPILERFLAGS_I386) $(INCLUDE) $(INCLUDE_I386) $(MACOSX_DEPLOY) - CFLAGS_X86_64 = $(COMPILERFLAGS) $(COMPILERFLAGS_X86_64) $(INCLUDE) $(INCLUDE_X86_64) $(MACOSX_DEPLOY) - CPPFLAGS_I386 = $(COMPILERPPFLAGS) $(CFLAGS_I386) - CPPFLAGS_X86_64 = $(COMPILERPPFLAGS) $(CFLAGS_X86_64) --LIBRARIES_I386 = $(MACOSX_DEPLOY) -Wl,-syslibroot $(MACOSX_SYSROOT) --LIBRARIES_X86_64 = $(MACOSX_DEPLOY) -Wl,-syslibroot $(MACOSX_SYSROOT) -+LIBS = $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg) -+LIBRARIES_I386 = $(LIBS) $(MACOSX_DEPLOY) -+LIBRARIES_X86_64 = $(LIBS) $(MACOSX_DEPLOY) - LIBTOOL = libtool - LIPO = lipo - -@@ -57,7 +58,7 @@ dist: FreeImage - cp *.a Dist - cp Source/FreeImage.h Dist - --FreeImage: $(STATICLIB) -+FreeImage: $(STATICLIB) $(SHAREDLIB) - - $(STATICLIB): $(STATICLIB)-x86_64 - cp -p $(STATICLIB)-x86_64 $(STATICLIB) -@@ -84,13 +85,10 @@ $(STATICLIB)-i386: $(MODULES_I386) - $(STATICLIB)-x86_64: $(MODULES_X86_64) - $(LIBTOOL) -arch_only x86_64 -o $@ $(MODULES_X86_64) - --$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -- $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB) -- - $(SHAREDLIB)-i386: $(MODULES_I386) - $(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386) - --$(SHAREDLIB)-x86_64: $(MODULES_X86_64) -+$(SHAREDLIB): $(MODULES_X86_64) - $(CPP_X86_64) -arch x86_64 -dynamiclib $(LIBRARIES_X86_64) -o $@ $(MODULES_X86_64) - - .c.o-i386: -@@ -106,9 +104,8 @@ $(SHAREDLIB)-x86_64: $(MODULES_X86_64) - $(CPP_X86_64) $(CPPFLAGS_X86_64) -c $< -o $@ - - install: -- install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR) -- install -m 644 -o root -g wheel $(HEADER) $(INCDIR) -- install -m 644 -o root -g wheel $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR) -+ install $(HEADER) $(INCDIR) -+ install $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR) - ranlib -sf $(INSTALLDIR)/$(STATICLIB) - ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME) - -diff --git a/Makefile.srcs b/Makefile.srcs -index 692c6e56..212195b2 100644 ---- a/Makefile.srcs -+++ b/Makefile.srcs -@@ -1,6 +1,6 @@ - VER_MAJOR = 3 - VER_MINOR = 19.0 --SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_lerc.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_webp.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/src/decoders/canon_600.cpp Source/LibRawLite/src/decoders/crx.cpp Source/LibRawLite/src/decoders/decoders_dcraw.cpp Source/LibRawLite/src/decoders/decoders_libraw.cpp Source/LibRawLite/src/decoders/decoders_libraw_dcrdefs.cpp Source/LibRawLite/src/decoders/dng.cpp Source/LibRawLite/src/decoders/fp_dng.cpp Source/LibRawLite/src/decoders/fuji_compressed.cpp Source/LibRawLite/src/decoders/generic.cpp Source/LibRawLite/src/decoders/kodak_decoders.cpp Source/LibRawLite/src/decoders/load_mfbacks.cpp Source/LibRawLite/src/decoders/smal.cpp Source/LibRawLite/src/decoders/unpack.cpp Source/LibRawLite/src/decoders/unpack_thumb.cpp Source/LibRawLite/src/demosaic/aahd_demosaic.cpp Source/LibRawLite/src/demosaic/ahd_demosaic.cpp Source/LibRawLite/src/demosaic/dcb_demosaic.cpp Source/LibRawLite/src/demosaic/dht_demosaic.cpp Source/LibRawLite/src/demosaic/misc_demosaic.cpp Source/LibRawLite/src/demosaic/xtrans_demosaic.cpp Source/LibRawLite/src/integration/dngsdk_glue.cpp Source/LibRawLite/src/integration/rawspeed_glue.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibRawLite/src/metadata/adobepano.cpp Source/LibRawLite/src/metadata/canon.cpp Source/LibRawLite/src/metadata/ciff.cpp Source/LibRawLite/src/metadata/cr3_parser.cpp Source/LibRawLite/src/metadata/epson.cpp Source/LibRawLite/src/metadata/exif_gps.cpp Source/LibRawLite/src/metadata/fuji.cpp Source/LibRawLite/src/metadata/hasselblad_model.cpp Source/LibRawLite/src/metadata/identify.cpp Source/LibRawLite/src/metadata/identify_tools.cpp Source/LibRawLite/src/metadata/kodak.cpp Source/LibRawLite/src/metadata/leica.cpp Source/LibRawLite/src/metadata/makernotes.cpp Source/LibRawLite/src/metadata/mediumformat.cpp Source/LibRawLite/src/metadata/minolta.cpp Source/LibRawLite/src/metadata/misc_parsers.cpp Source/LibRawLite/src/metadata/nikon.cpp Source/LibRawLite/src/metadata/normalize_model.cpp Source/LibRawLite/src/metadata/olympus.cpp Source/LibRawLite/src/metadata/p1.cpp Source/LibRawLite/src/metadata/pentax.cpp Source/LibRawLite/src/metadata/samsung.cpp Source/LibRawLite/src/metadata/sony.cpp Source/LibRawLite/src/metadata/tiff.cpp Source/LibRawLite/src/postprocessing/aspect_ratio.cpp Source/LibRawLite/src/postprocessing/dcraw_process.cpp Source/LibRawLite/src/postprocessing/mem_image.cpp Source/LibRawLite/src/postprocessing/postprocessing_aux.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils_dcrdefs.cpp Source/LibRawLite/src/preprocessing/ext_preprocess.cpp Source/LibRawLite/src/preprocessing/raw2image.cpp Source/LibRawLite/src/preprocessing/subtract_black.cpp Source/LibRawLite/src/tables/cameralist.cpp Source/LibRawLite/src/tables/colorconst.cpp Source/LibRawLite/src/tables/colordata.cpp Source/LibRawLite/src/tables/wblists.cpp Source/LibRawLite/src/utils/curves.cpp Source/LibRawLite/src/utils/decoder_info.cpp Source/LibRawLite/src/utils/init_close_utils.cpp Source/LibRawLite/src/utils/open.cpp Source/LibRawLite/src/utils/phaseone_processing.cpp Source/LibRawLite/src/utils/read_utils.cpp Source/LibRawLite/src/utils/thumb_utils.cpp Source/LibRawLite/src/utils/utils_dcraw.cpp Source/LibRawLite/src/utils/utils_libraw.cpp Source/LibRawLite/src/write/file_write.cpp Source/LibRawLite/src/x3f/x3f_parse_process.cpp Source/LibRawLite/src/x3f/x3f_utils_patched.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/lossless_sse41.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c --INCLS = ./Dist/x64/FreeImage.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Source/CacheFile.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage.h ./Source/FreeImageIO.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/LibJPEG/cderror.h ./Source/LibJPEG/cdjpeg.h ./Source/LibJPEG/jconfig.h ./Source/LibJPEG/jdct.h ./Source/LibJPEG/jerror.h ./Source/LibJPEG/jinclude.h ./Source/LibJPEG/jmemsys.h ./Source/LibJPEG/jmorecfg.h ./Source/LibJPEG/jpegint.h ./Source/LibJPEG/jpeglib.h ./Source/LibJPEG/jversion.h ./Source/LibJPEG/transupp.h ./Source/LibJXR/common/include/guiddef.h ./Source/LibJXR/common/include/wmsal.h ./Source/LibJXR/common/include/wmspecstring.h ./Source/LibJXR/common/include/wmspecstrings_adt.h ./Source/LibJXR/common/include/wmspecstrings_strict.h ./Source/LibJXR/common/include/wmspecstrings_undef.h ./Source/LibJXR/image/decode/decode.h ./Source/LibJXR/image/encode/encode.h ./Source/LibJXR/image/sys/ansi.h ./Source/LibJXR/image/sys/common.h ./Source/LibJXR/image/sys/perfTimer.h ./Source/LibJXR/image/sys/strcodec.h ./Source/LibJXR/image/sys/strTransform.h ./Source/LibJXR/image/sys/windowsmediaphoto.h ./Source/LibJXR/image/sys/xplatform_image.h ./Source/LibJXR/image/x86/x86.h ./Source/LibJXR/jxrgluelib/JXRGlue.h ./Source/LibJXR/jxrgluelib/JXRMeta.h ./Source/LibOpenJPEG/bio.h ./Source/LibOpenJPEG/cidx_manager.h ./Source/LibOpenJPEG/cio.h ./Source/LibOpenJPEG/dwt.h ./Source/LibOpenJPEG/event.h ./Source/LibOpenJPEG/function_list.h ./Source/LibOpenJPEG/image.h ./Source/LibOpenJPEG/indexbox_manager.h ./Source/LibOpenJPEG/invert.h ./Source/LibOpenJPEG/j2k.h ./Source/LibOpenJPEG/jp2.h ./Source/LibOpenJPEG/mct.h ./Source/LibOpenJPEG/mqc.h ./Source/LibOpenJPEG/openjpeg.h ./Source/LibOpenJPEG/opj_clock.h ./Source/LibOpenJPEG/opj_codec.h ./Source/LibOpenJPEG/opj_config.h ./Source/LibOpenJPEG/opj_config_private.h ./Source/LibOpenJPEG/opj_includes.h ./Source/LibOpenJPEG/opj_intmath.h ./Source/LibOpenJPEG/opj_inttypes.h ./Source/LibOpenJPEG/opj_malloc.h ./Source/LibOpenJPEG/opj_stdint.h ./Source/LibOpenJPEG/pi.h ./Source/LibOpenJPEG/raw.h ./Source/LibOpenJPEG/t1.h ./Source/LibOpenJPEG/t1_luts.h ./Source/LibOpenJPEG/t2.h ./Source/LibOpenJPEG/tcd.h ./Source/LibOpenJPEG/tgt.h ./Source/LibPNG/png.h ./Source/LibPNG/pngconf.h ./Source/LibPNG/pngdebug.h ./Source/LibPNG/pnginfo.h ./Source/LibPNG/pnglibconf.h ./Source/LibPNG/pngpriv.h ./Source/LibPNG/pngstruct.h ./Source/LibRawLite/internal/dcraw_defs.h ./Source/LibRawLite/internal/dcraw_fileio_defs.h ./Source/LibRawLite/internal/defines.h ./Source/LibRawLite/internal/dmp_include.h ./Source/LibRawLite/internal/libraw_cameraids.h ./Source/LibRawLite/internal/libraw_cxx_defs.h ./Source/LibRawLite/internal/libraw_internal_funcs.h ./Source/LibRawLite/internal/var_defines.h ./Source/LibRawLite/internal/x3f_tools.h ./Source/LibRawLite/libraw/libraw.h ./Source/LibRawLite/libraw/libraw_alloc.h ./Source/LibRawLite/libraw/libraw_const.h ./Source/LibRawLite/libraw/libraw_datastream.h ./Source/LibRawLite/libraw/libraw_internal.h ./Source/LibRawLite/libraw/libraw_types.h ./Source/LibRawLite/libraw/libraw_version.h ./Source/LibTIFF4/t4.h ./Source/LibTIFF4/tiff.h ./Source/LibTIFF4/tiffconf.h ./Source/LibTIFF4/tiffconf.vc.h ./Source/LibTIFF4/tiffconf.wince.h ./Source/LibTIFF4/tiffio.h ./Source/LibTIFF4/tiffiop.h ./Source/LibTIFF4/tiffvers.h ./Source/LibTIFF4/tif_config.h ./Source/LibTIFF4/tif_config.vc.h ./Source/LibTIFF4/tif_config.wince.h ./Source/LibTIFF4/tif_dir.h ./Source/LibTIFF4/tif_fax3.h ./Source/LibTIFF4/tif_predict.h ./Source/LibTIFF4/uvcode.h ./Source/LibWebP/src/dec/alphai_dec.h ./Source/LibWebP/src/dec/common_dec.h ./Source/LibWebP/src/dec/vp8i_dec.h ./Source/LibWebP/src/dec/vp8li_dec.h ./Source/LibWebP/src/dec/vp8_dec.h ./Source/LibWebP/src/dec/webpi_dec.h ./Source/LibWebP/src/dsp/common_sse2.h ./Source/LibWebP/src/dsp/common_sse41.h ./Source/LibWebP/src/dsp/dsp.h ./Source/LibWebP/src/dsp/lossless.h ./Source/LibWebP/src/dsp/lossless_common.h ./Source/LibWebP/src/dsp/mips_macro.h ./Source/LibWebP/src/dsp/msa_macro.h ./Source/LibWebP/src/dsp/neon.h ./Source/LibWebP/src/dsp/quant.h ./Source/LibWebP/src/dsp/yuv.h ./Source/LibWebP/src/enc/backward_references_enc.h ./Source/LibWebP/src/enc/cost_enc.h ./Source/LibWebP/src/enc/histogram_enc.h ./Source/LibWebP/src/enc/vp8i_enc.h ./Source/LibWebP/src/enc/vp8li_enc.h ./Source/LibWebP/src/mux/animi.h ./Source/LibWebP/src/mux/muxi.h ./Source/LibWebP/src/utils/bit_reader_inl_utils.h ./Source/LibWebP/src/utils/bit_reader_utils.h ./Source/LibWebP/src/utils/bit_writer_utils.h ./Source/LibWebP/src/utils/color_cache_utils.h ./Source/LibWebP/src/utils/endian_inl_utils.h ./Source/LibWebP/src/utils/filters_utils.h ./Source/LibWebP/src/utils/huffman_encode_utils.h ./Source/LibWebP/src/utils/huffman_utils.h ./Source/LibWebP/src/utils/quant_levels_dec_utils.h ./Source/LibWebP/src/utils/quant_levels_utils.h ./Source/LibWebP/src/utils/random_utils.h ./Source/LibWebP/src/utils/rescaler_utils.h ./Source/LibWebP/src/utils/thread_utils.h ./Source/LibWebP/src/utils/utils.h ./Source/LibWebP/src/webp/decode.h ./Source/LibWebP/src/webp/demux.h ./Source/LibWebP/src/webp/encode.h ./Source/LibWebP/src/webp/format_constants.h ./Source/LibWebP/src/webp/mux.h ./Source/LibWebP/src/webp/mux_types.h ./Source/LibWebP/src/webp/types.h ./Source/MapIntrospector.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Source/OpenEXR/Half/eLut.h ./Source/OpenEXR/Half/half.h ./Source/OpenEXR/Half/halfExport.h ./Source/OpenEXR/Half/halfFunction.h ./Source/OpenEXR/Half/halfLimits.h ./Source/OpenEXR/Half/toFloat.h ./Source/OpenEXR/Iex/Iex.h ./Source/OpenEXR/Iex/IexBaseExc.h ./Source/OpenEXR/Iex/IexErrnoExc.h ./Source/OpenEXR/Iex/IexExport.h ./Source/OpenEXR/Iex/IexForward.h ./Source/OpenEXR/Iex/IexMacros.h ./Source/OpenEXR/Iex/IexMathExc.h ./Source/OpenEXR/Iex/IexNamespace.h ./Source/OpenEXR/Iex/IexThrowErrnoExc.h ./Source/OpenEXR/IexMath/IexMathFloatExc.h ./Source/OpenEXR/IexMath/IexMathFpu.h ./Source/OpenEXR/IexMath/IexMathIeeeExc.h ./Source/OpenEXR/IlmBaseConfig.h ./Source/OpenEXR/IlmImf/b44ExpLogTable.h ./Source/OpenEXR/IlmImf/dwaLookups.h ./Source/OpenEXR/IlmImf/ImfAcesFile.h ./Source/OpenEXR/IlmImf/ImfArray.h ./Source/OpenEXR/IlmImf/ImfAttribute.h ./Source/OpenEXR/IlmImf/ImfAutoArray.h ./Source/OpenEXR/IlmImf/ImfB44Compressor.h ./Source/OpenEXR/IlmImf/ImfBoxAttribute.h ./Source/OpenEXR/IlmImf/ImfChannelList.h ./Source/OpenEXR/IlmImf/ImfChannelListAttribute.h ./Source/OpenEXR/IlmImf/ImfCheckedArithmetic.h ./Source/OpenEXR/IlmImf/ImfChromaticities.h ./Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.h ./Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h ./Source/OpenEXR/IlmImf/ImfCompression.h ./Source/OpenEXR/IlmImf/ImfCompressionAttribute.h ./Source/OpenEXR/IlmImf/ImfCompressor.h ./Source/OpenEXR/IlmImf/ImfConvert.h ./Source/OpenEXR/IlmImf/ImfCRgbaFile.h ./Source/OpenEXR/IlmImf/ImfDeepCompositing.h ./Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfDeepImageState.h ./Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfDoubleAttribute.h ./Source/OpenEXR/IlmImf/ImfDwaCompressor.h ./Source/OpenEXR/IlmImf/ImfDwaCompressorSimd.h ./Source/OpenEXR/IlmImf/ImfEnvmap.h ./Source/OpenEXR/IlmImf/ImfEnvmapAttribute.h ./Source/OpenEXR/IlmImf/ImfExport.h ./Source/OpenEXR/IlmImf/ImfFastHuf.h ./Source/OpenEXR/IlmImf/ImfFloatAttribute.h ./Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfForward.h ./Source/OpenEXR/IlmImf/ImfFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfFramesPerSecond.h ./Source/OpenEXR/IlmImf/ImfGenericInputFile.h ./Source/OpenEXR/IlmImf/ImfGenericOutputFile.h ./Source/OpenEXR/IlmImf/ImfHeader.h ./Source/OpenEXR/IlmImf/ImfHuf.h ./Source/OpenEXR/IlmImf/ImfInputFile.h ./Source/OpenEXR/IlmImf/ImfInputPart.h ./Source/OpenEXR/IlmImf/ImfInputPartData.h ./Source/OpenEXR/IlmImf/ImfInputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfInt64.h ./Source/OpenEXR/IlmImf/ImfIntAttribute.h ./Source/OpenEXR/IlmImf/ImfIO.h ./Source/OpenEXR/IlmImf/ImfKeyCode.h ./Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfLineOrder.h ./Source/OpenEXR/IlmImf/ImfLineOrderAttribute.h ./Source/OpenEXR/IlmImf/ImfLut.h ./Source/OpenEXR/IlmImf/ImfMatrixAttribute.h ./Source/OpenEXR/IlmImf/ImfMisc.h ./Source/OpenEXR/IlmImf/ImfMultiPartInputFile.h ./Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.h ./Source/OpenEXR/IlmImf/ImfMultiView.h ./Source/OpenEXR/IlmImf/ImfName.h ./Source/OpenEXR/IlmImf/ImfNamespace.h ./Source/OpenEXR/IlmImf/ImfOpaqueAttribute.h ./Source/OpenEXR/IlmImf/ImfOptimizedPixelReading.h ./Source/OpenEXR/IlmImf/ImfOutputFile.h ./Source/OpenEXR/IlmImf/ImfOutputPart.h ./Source/OpenEXR/IlmImf/ImfOutputPartData.h ./Source/OpenEXR/IlmImf/ImfOutputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfPartHelper.h ./Source/OpenEXR/IlmImf/ImfPartType.h ./Source/OpenEXR/IlmImf/ImfPixelType.h ./Source/OpenEXR/IlmImf/ImfPizCompressor.h ./Source/OpenEXR/IlmImf/ImfPreviewImage.h ./Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.h ./Source/OpenEXR/IlmImf/ImfPxr24Compressor.h ./Source/OpenEXR/IlmImf/ImfRational.h ./Source/OpenEXR/IlmImf/ImfRationalAttribute.h ./Source/OpenEXR/IlmImf/ImfRgba.h ./Source/OpenEXR/IlmImf/ImfRgbaFile.h ./Source/OpenEXR/IlmImf/ImfRgbaYca.h ./Source/OpenEXR/IlmImf/ImfRle.h ./Source/OpenEXR/IlmImf/ImfRleCompressor.h ./Source/OpenEXR/IlmImf/ImfScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfSimd.h ./Source/OpenEXR/IlmImf/ImfStandardAttributes.h ./Source/OpenEXR/IlmImf/ImfStdIO.h ./Source/OpenEXR/IlmImf/ImfStringAttribute.h ./Source/OpenEXR/IlmImf/ImfStringVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfSystemSpecific.h ./Source/OpenEXR/IlmImf/ImfTestFile.h ./Source/OpenEXR/IlmImf/ImfThreading.h ./Source/OpenEXR/IlmImf/ImfTileDescription.h ./Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfTiledMisc.h ./Source/OpenEXR/IlmImf/ImfTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfTiledRgbaFile.h ./Source/OpenEXR/IlmImf/ImfTileOffsets.h ./Source/OpenEXR/IlmImf/ImfTimeCode.h ./Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfVecAttribute.h ./Source/OpenEXR/IlmImf/ImfVersion.h ./Source/OpenEXR/IlmImf/ImfWav.h ./Source/OpenEXR/IlmImf/ImfXdr.h ./Source/OpenEXR/IlmImf/ImfZip.h ./Source/OpenEXR/IlmImf/ImfZipCompressor.h ./Source/OpenEXR/IlmThread/IlmThread.h ./Source/OpenEXR/IlmThread/IlmThreadExport.h ./Source/OpenEXR/IlmThread/IlmThreadForward.h ./Source/OpenEXR/IlmThread/IlmThreadMutex.h ./Source/OpenEXR/IlmThread/IlmThreadNamespace.h ./Source/OpenEXR/IlmThread/IlmThreadPool.h ./Source/OpenEXR/IlmThread/IlmThreadSemaphore.h ./Source/OpenEXR/Imath/ImathBox.h ./Source/OpenEXR/Imath/ImathBoxAlgo.h ./Source/OpenEXR/Imath/ImathColor.h ./Source/OpenEXR/Imath/ImathColorAlgo.h ./Source/OpenEXR/Imath/ImathEuler.h ./Source/OpenEXR/Imath/ImathExc.h ./Source/OpenEXR/Imath/ImathExport.h ./Source/OpenEXR/Imath/ImathForward.h ./Source/OpenEXR/Imath/ImathFrame.h ./Source/OpenEXR/Imath/ImathFrustum.h ./Source/OpenEXR/Imath/ImathFrustumTest.h ./Source/OpenEXR/Imath/ImathFun.h ./Source/OpenEXR/Imath/ImathGL.h ./Source/OpenEXR/Imath/ImathGLU.h ./Source/OpenEXR/Imath/ImathHalfLimits.h ./Source/OpenEXR/Imath/ImathInt64.h ./Source/OpenEXR/Imath/ImathInterval.h ./Source/OpenEXR/Imath/ImathLimits.h ./Source/OpenEXR/Imath/ImathLine.h ./Source/OpenEXR/Imath/ImathLineAlgo.h ./Source/OpenEXR/Imath/ImathMath.h ./Source/OpenEXR/Imath/ImathMatrix.h ./Source/OpenEXR/Imath/ImathMatrixAlgo.h ./Source/OpenEXR/Imath/ImathNamespace.h ./Source/OpenEXR/Imath/ImathPlane.h ./Source/OpenEXR/Imath/ImathPlatform.h ./Source/OpenEXR/Imath/ImathQuat.h ./Source/OpenEXR/Imath/ImathRandom.h ./Source/OpenEXR/Imath/ImathRoots.h ./Source/OpenEXR/Imath/ImathShear.h ./Source/OpenEXR/Imath/ImathSphere.h ./Source/OpenEXR/Imath/ImathVec.h ./Source/OpenEXR/Imath/ImathVecAlgo.h ./Source/OpenEXR/OpenEXRConfig.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/ToneMapping.h ./Source/Utilities.h ./Source/ZLib/crc32.h ./Source/ZLib/deflate.h ./Source/ZLib/gzguts.h ./Source/ZLib/inffast.h ./Source/ZLib/inffixed.h ./Source/ZLib/inflate.h ./Source/ZLib/inftrees.h ./Source/ZLib/trees.h ./Source/ZLib/zconf.h ./Source/ZLib/zlib.h ./Source/ZLib/zutil.h ./TestAPI/TestSuite.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/dist/x64/FreeImagePlus.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h -+SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp -+INCLS = ./Dist/FreeImage.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Source/CacheFile.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage.h ./Source/FreeImageIO.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/MapIntrospector.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/ToneMapping.h ./Source/Utilities.h ./TestAPI/TestSuite.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h - --INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibPNG -ISource/LibTIFF4 -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/OpenEXR/IexMath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -ISource/LibWebP -ISource/LibJXR -ISource/LibJXR/common/include -ISource/LibJXR/image/sys -ISource/LibJXR/jxrgluelib -+INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -diff --git a/Source/FreeImage.h b/Source/FreeImage.h -index 2dfb9ee2..d2d32322 100644 ---- a/Source/FreeImage.h -+++ b/Source/FreeImage.h -@@ -155,8 +155,8 @@ typedef uint8_t BYTE; - typedef uint16_t WORD; - typedef uint32_t DWORD; - typedef int32_t LONG; --typedef int64_t INT64; --typedef uint64_t UINT64; -+#define INT64 int64_t -+#define UINT64 uint64_t - #else - // MS is not C99 ISO compliant - typedef long BOOL; -diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp -index 062b49ee..0e79fbc5 100644 ---- a/Source/FreeImage/J2KHelper.cpp -+++ b/Source/FreeImage/J2KHelper.cpp -@@ -21,7 +21,7 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibOpenJPEG/openjpeg.h" -+#include - #include "J2KHelper.h" - - // -------------------------------------------------------------------------- -diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp -index b2864303..9bf3ada9 100644 ---- a/Source/FreeImage/PluginEXR.cpp -+++ b/Source/FreeImage/PluginEXR.cpp -@@ -28,16 +28,16 @@ - #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning) - #endif - --#include "../OpenEXR/IlmImf/ImfIO.h" --#include "../OpenEXR/Iex/Iex.h" --#include "../OpenEXR/IlmImf/ImfOutputFile.h" --#include "../OpenEXR/IlmImf/ImfInputFile.h" --#include "../OpenEXR/IlmImf/ImfRgbaFile.h" --#include "../OpenEXR/IlmImf/ImfChannelList.h" --#include "../OpenEXR/IlmImf/ImfRgba.h" --#include "../OpenEXR/IlmImf/ImfArray.h" --#include "../OpenEXR/IlmImf/ImfPreviewImage.h" --#include "../OpenEXR/Half/half.h" -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - - - // ========================================================== -diff --git a/Source/FreeImage/PluginG3.cpp b/Source/FreeImage/PluginG3.cpp -index 4680aa32..7d4b5ce6 100644 ---- a/Source/FreeImage/PluginG3.cpp -+++ b/Source/FreeImage/PluginG3.cpp -@@ -20,7 +20,7 @@ - // Use at your own risk! - // ========================================================== - --#include "../LibTIFF4/tiffiop.h" -+#include - - #include "FreeImage.h" - #include "Utilities.h" -diff --git a/Source/FreeImage/PluginJ2K.cpp b/Source/FreeImage/PluginJ2K.cpp -index b8bcfc8b..621a9037 100644 ---- a/Source/FreeImage/PluginJ2K.cpp -+++ b/Source/FreeImage/PluginJ2K.cpp -@@ -21,7 +21,7 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibOpenJPEG/openjpeg.h" -+#include - #include "J2KHelper.h" - - // ========================================================== -diff --git a/Source/FreeImage/PluginJP2.cpp b/Source/FreeImage/PluginJP2.cpp -index 742fe2c0..c57f6267 100644 ---- a/Source/FreeImage/PluginJP2.cpp -+++ b/Source/FreeImage/PluginJP2.cpp -@@ -21,7 +21,7 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibOpenJPEG/openjpeg.h" -+#include - #include "J2KHelper.h" - - // ========================================================== -diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp -index 8db177d2..a7de6378 100644 ---- a/Source/FreeImage/PluginJPEG.cpp -+++ b/Source/FreeImage/PluginJPEG.cpp -@@ -35,9 +35,9 @@ extern "C" { - #undef FAR - #include - --#include "../LibJPEG/jinclude.h" --#include "../LibJPEG/jpeglib.h" --#include "../LibJPEG/jerror.h" -+#include -+#include -+#include - } - - #include "FreeImage.h" -@@ -484,116 +484,6 @@ marker_is_icc(jpeg_saved_marker_ptr marker) { - return FALSE; - } - --/** -- See if there was an ICC profile in the JPEG file being read; -- if so, reassemble and return the profile data. -- -- TRUE is returned if an ICC profile was found, FALSE if not. -- If TRUE is returned, *icc_data_ptr is set to point to the -- returned data, and *icc_data_len is set to its length. -- -- IMPORTANT: the data at **icc_data_ptr has been allocated with malloc() -- and must be freed by the caller with free() when the caller no longer -- needs it. (Alternatively, we could write this routine to use the -- IJG library's memory allocator, so that the data would be freed implicitly -- at jpeg_finish_decompress() time. But it seems likely that many apps -- will prefer to have the data stick around after decompression finishes.) -- -- NOTE: if the file contains invalid ICC APP2 markers, we just silently -- return FALSE. You might want to issue an error message instead. --*/ --static BOOL --jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) { -- jpeg_saved_marker_ptr marker; -- int num_markers = 0; -- int seq_no; -- JOCTET *icc_data; -- unsigned total_length; -- -- const int MAX_SEQ_NO = 255; // sufficient since marker numbers are bytes -- BYTE marker_present[MAX_SEQ_NO+1]; // 1 if marker found -- unsigned data_length[MAX_SEQ_NO+1]; // size of profile data in marker -- unsigned data_offset[MAX_SEQ_NO+1]; // offset for data in marker -- -- *icc_data_ptr = NULL; // avoid confusion if FALSE return -- *icc_data_len = 0; -- -- /** -- this first pass over the saved markers discovers whether there are -- any ICC markers and verifies the consistency of the marker numbering. -- */ -- -- memset(marker_present, 0, (MAX_SEQ_NO + 1)); -- -- for(marker = cinfo->marker_list; marker != NULL; marker = marker->next) { -- if (marker_is_icc(marker)) { -- if (num_markers == 0) { -- // number of markers -- num_markers = GETJOCTET(marker->data[13]); -- } -- else if (num_markers != GETJOCTET(marker->data[13])) { -- return FALSE; // inconsistent num_markers fields -- } -- // sequence number -- seq_no = GETJOCTET(marker->data[12]); -- if (seq_no <= 0 || seq_no > num_markers) { -- return FALSE; // bogus sequence number -- } -- if (marker_present[seq_no]) { -- return FALSE; // duplicate sequence numbers -- } -- marker_present[seq_no] = 1; -- data_length[seq_no] = marker->data_length - ICC_HEADER_SIZE; -- } -- } -- -- if (num_markers == 0) -- return FALSE; -- -- /** -- check for missing markers, count total space needed, -- compute offset of each marker's part of the data. -- */ -- -- total_length = 0; -- for(seq_no = 1; seq_no <= num_markers; seq_no++) { -- if (marker_present[seq_no] == 0) { -- return FALSE; // missing sequence number -- } -- data_offset[seq_no] = total_length; -- total_length += data_length[seq_no]; -- } -- -- if (total_length <= 0) -- return FALSE; // found only empty markers ? -- -- // allocate space for assembled data -- icc_data = (JOCTET *) malloc(total_length * sizeof(JOCTET)); -- if (icc_data == NULL) -- return FALSE; // out of memory -- -- // and fill it in -- for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) { -- if (marker_is_icc(marker)) { -- JOCTET FAR *src_ptr; -- JOCTET *dst_ptr; -- unsigned length; -- seq_no = GETJOCTET(marker->data[12]); -- dst_ptr = icc_data + data_offset[seq_no]; -- src_ptr = marker->data + ICC_HEADER_SIZE; -- length = data_length[seq_no]; -- while (length--) { -- *dst_ptr++ = *src_ptr++; -- } -- } -- } -- -- *icc_data_ptr = icc_data; -- *icc_data_len = total_length; -- -- return TRUE; --} -- - /** - Read JPEG_APPD marker (IPTC or Adobe Photoshop profile) - */ -diff --git a/Source/FreeImage/PluginJXR.cpp b/Source/FreeImage/PluginJXR.cpp -index 85c6ff3e..163a93bd 100644 ---- a/Source/FreeImage/PluginJXR.cpp -+++ b/Source/FreeImage/PluginJXR.cpp -@@ -23,7 +23,7 @@ - #include "Utilities.h" - #include "../Metadata/FreeImageTag.h" - --#include "../LibJXR/jxrgluelib/JXRGlue.h" -+#include - - // ========================================================== - // Plugin Interface -diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp -index 661f1602..504fafe1 100644 ---- a/Source/FreeImage/PluginPNG.cpp -+++ b/Source/FreeImage/PluginPNG.cpp -@@ -40,8 +40,8 @@ - - // ---------------------------------------------------------- - --#include "../ZLib/zlib.h" --#include "../LibPNG/png.h" -+#include -+#include - - // ---------------------------------------------------------- - -diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp -index 26134bcc..d7fa81e4 100644 ---- a/Source/FreeImage/PluginRAW.cpp -+++ b/Source/FreeImage/PluginRAW.cpp -@@ -19,12 +19,16 @@ - // Use at your own risk! - // ========================================================== - --#include "../LibRawLite/libraw/libraw.h" -+#include - - #include "FreeImage.h" - #include "Utilities.h" - #include "../Metadata/FreeImageTag.h" - -+// What an ugly hack -+#undef INT64 -+#undef UINT64 -+ - // ========================================================== - // Plugin Interface - // ========================================================== -diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp -index 84554958..13a224dd 100644 ---- a/Source/FreeImage/PluginTIFF.cpp -+++ b/Source/FreeImage/PluginTIFF.cpp -@@ -37,9 +37,9 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibTIFF4/tiffiop.h" -+#include - #include "../Metadata/FreeImageTag.h" --#include "../OpenEXR/Half/half.h" -+#include - - #include "FreeImageIO.h" - #include "PSDParser.h" -diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp -index 7c9f62fd..c4014473 100644 ---- a/Source/FreeImage/PluginWebP.cpp -+++ b/Source/FreeImage/PluginWebP.cpp -@@ -24,9 +24,9 @@ - - #include "../Metadata/FreeImageTag.h" - --#include "../LibWebP/src/webp/decode.h" --#include "../LibWebP/src/webp/encode.h" --#include "../LibWebP/src/webp/mux.h" -+#include -+#include -+#include - - // ========================================================== - // Plugin Interface -diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp -index 3ab6d321..09734755 100644 ---- a/Source/FreeImage/ZLibInterface.cpp -+++ b/Source/FreeImage/ZLibInterface.cpp -@@ -19,10 +19,9 @@ - // Use at your own risk! - // ========================================================== - --#include "../ZLib/zlib.h" -+#include - #include "FreeImage.h" - #include "Utilities.h" --#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */ - - /** - Compresses a source buffer into a target buffer, using the ZLib library. -@@ -115,7 +114,8 @@ FreeImage_ZLibGZip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_s - return 0; - case Z_OK: { - // patch header, setup crc and length (stolen from mod_trace_output) -- BYTE *p = target + 8; *p++ = 2; *p = OS_CODE; // xflags, os_code -+ // OS_CODE is 0x03 on unix it seems, not sure how important this is -+ BYTE *p = target + 8; *p++ = 2; *p = 0x03; // xflags, os_code - crc = crc32(crc, source, source_size); - memcpy(target + 4 + dest_len, &crc, 4); - memcpy(target + 8 + dest_len, &source_size, 4); -diff --git a/Source/FreeImageToolkit/JPEGTransform.cpp b/Source/FreeImageToolkit/JPEGTransform.cpp -index 6f9ba8e1..836bc901 100644 ---- a/Source/FreeImageToolkit/JPEGTransform.cpp -+++ b/Source/FreeImageToolkit/JPEGTransform.cpp -@@ -26,10 +26,10 @@ extern "C" { - #undef FAR - #include - --#include "../LibJPEG/jinclude.h" --#include "../LibJPEG/jpeglib.h" --#include "../LibJPEG/jerror.h" --#include "../LibJPEG/transupp.h" -+#include -+#include -+#include -+#include - } - - #include "FreeImage.h" -diff --git a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp -index 6919a8e8..ce3d7c6b 100644 ---- a/Source/Metadata/XTIFF.cpp -+++ b/Source/Metadata/XTIFF.cpp -@@ -29,7 +29,7 @@ - #pragma warning (disable : 4786) // identifier was truncated to 'number' characters - #endif - --#include "../LibTIFF4/tiffiop.h" -+#include - - #include "FreeImage.h" - #include "Utilities.h" -diff --git a/fipMakefile.srcs b/fipMakefile.srcs -index cc75e5e0..bedc9e3e 100644 ---- a/fipMakefile.srcs -+++ b/fipMakefile.srcs -@@ -1,4 +1,4 @@ - VER_MAJOR = 3 - VER_MINOR = 19.0 --SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_lerc.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_webp.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/src/decoders/canon_600.cpp Source/LibRawLite/src/decoders/crx.cpp Source/LibRawLite/src/decoders/decoders_dcraw.cpp Source/LibRawLite/src/decoders/decoders_libraw.cpp Source/LibRawLite/src/decoders/decoders_libraw_dcrdefs.cpp Source/LibRawLite/src/decoders/dng.cpp Source/LibRawLite/src/decoders/fp_dng.cpp Source/LibRawLite/src/decoders/fuji_compressed.cpp Source/LibRawLite/src/decoders/generic.cpp Source/LibRawLite/src/decoders/kodak_decoders.cpp Source/LibRawLite/src/decoders/load_mfbacks.cpp Source/LibRawLite/src/decoders/smal.cpp Source/LibRawLite/src/decoders/unpack.cpp Source/LibRawLite/src/decoders/unpack_thumb.cpp Source/LibRawLite/src/demosaic/aahd_demosaic.cpp Source/LibRawLite/src/demosaic/ahd_demosaic.cpp Source/LibRawLite/src/demosaic/dcb_demosaic.cpp Source/LibRawLite/src/demosaic/dht_demosaic.cpp Source/LibRawLite/src/demosaic/misc_demosaic.cpp Source/LibRawLite/src/demosaic/xtrans_demosaic.cpp Source/LibRawLite/src/integration/dngsdk_glue.cpp Source/LibRawLite/src/integration/rawspeed_glue.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibRawLite/src/metadata/adobepano.cpp Source/LibRawLite/src/metadata/canon.cpp Source/LibRawLite/src/metadata/ciff.cpp Source/LibRawLite/src/metadata/cr3_parser.cpp Source/LibRawLite/src/metadata/epson.cpp Source/LibRawLite/src/metadata/exif_gps.cpp Source/LibRawLite/src/metadata/fuji.cpp Source/LibRawLite/src/metadata/hasselblad_model.cpp Source/LibRawLite/src/metadata/identify.cpp Source/LibRawLite/src/metadata/identify_tools.cpp Source/LibRawLite/src/metadata/kodak.cpp Source/LibRawLite/src/metadata/leica.cpp Source/LibRawLite/src/metadata/makernotes.cpp Source/LibRawLite/src/metadata/mediumformat.cpp Source/LibRawLite/src/metadata/minolta.cpp Source/LibRawLite/src/metadata/misc_parsers.cpp Source/LibRawLite/src/metadata/nikon.cpp Source/LibRawLite/src/metadata/normalize_model.cpp Source/LibRawLite/src/metadata/olympus.cpp Source/LibRawLite/src/metadata/p1.cpp Source/LibRawLite/src/metadata/pentax.cpp Source/LibRawLite/src/metadata/samsung.cpp Source/LibRawLite/src/metadata/sony.cpp Source/LibRawLite/src/metadata/tiff.cpp Source/LibRawLite/src/postprocessing/aspect_ratio.cpp Source/LibRawLite/src/postprocessing/dcraw_process.cpp Source/LibRawLite/src/postprocessing/mem_image.cpp Source/LibRawLite/src/postprocessing/postprocessing_aux.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils_dcrdefs.cpp Source/LibRawLite/src/preprocessing/ext_preprocess.cpp Source/LibRawLite/src/preprocessing/raw2image.cpp Source/LibRawLite/src/preprocessing/subtract_black.cpp Source/LibRawLite/src/tables/cameralist.cpp Source/LibRawLite/src/tables/colorconst.cpp Source/LibRawLite/src/tables/colordata.cpp Source/LibRawLite/src/tables/wblists.cpp Source/LibRawLite/src/utils/curves.cpp Source/LibRawLite/src/utils/decoder_info.cpp Source/LibRawLite/src/utils/init_close_utils.cpp Source/LibRawLite/src/utils/open.cpp Source/LibRawLite/src/utils/phaseone_processing.cpp Source/LibRawLite/src/utils/read_utils.cpp Source/LibRawLite/src/utils/thumb_utils.cpp Source/LibRawLite/src/utils/utils_dcraw.cpp Source/LibRawLite/src/utils/utils_libraw.cpp Source/LibRawLite/src/write/file_write.cpp Source/LibRawLite/src/x3f/x3f_parse_process.cpp Source/LibRawLite/src/x3f/x3f_utils_patched.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/lossless_sse41.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp --INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibPNG -ISource/LibTIFF4 -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/OpenEXR/IexMath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -ISource/LibWebP -ISource/LibJXR -ISource/LibJXR/common/include -ISource/LibJXR/image/sys -ISource/LibJXR/jxrgluelib -IWrapper/FreeImagePlus -+SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp -+INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -IWrapper/FreeImagePlus diff --git a/pkgs/by-name/im/imv/package.nix b/pkgs/by-name/im/imv/package.nix index 47e257e65e2e..656590150e2b 100644 --- a/pkgs/by-name/im/imv/package.nix +++ b/pkgs/by-name/im/imv/package.nix @@ -27,7 +27,6 @@ "libheif" "libnsgif" ], - freeimage, libtiff, libjpeg_turbo, libjxl, @@ -50,7 +49,6 @@ let backends = { inherit - freeimage libtiff libpng librsvg @@ -59,6 +57,7 @@ let libnsgif ; libjpeg = libjpeg_turbo; + freeimage = throw "freeimage backend not supported"; }; backendFlags = map ( diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index 7bbb16328344..a7930a49d2af 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -32,7 +32,6 @@ graphicsmagick, gdal, openimageio, - freeimage, testers, }: @@ -113,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: { graphicsmagick gdal openimageio - freeimage ; inherit (python3Packages) pillow imread; diff --git a/pkgs/by-name/me/megacmd/package.nix b/pkgs/by-name/me/megacmd/package.nix index b8e02743871f..cbbdb84569f5 100644 --- a/pkgs/by-name/me/megacmd/package.nix +++ b/pkgs/by-name/me/megacmd/package.nix @@ -7,7 +7,6 @@ curl, fetchFromGitHub, ffmpeg, - freeimage, gcc-unwrapped, icu, libmediainfo, @@ -19,7 +18,6 @@ pkg-config, readline, sqlite, - withFreeImage ? false, # default to false because freeimage is insecure }: let @@ -71,8 +69,7 @@ stdenv.mkDerivation { pcre-cpp readline sqlite - ] - ++ lib.optionals withFreeImage [ freeimage ]; + ]; configureFlags = [ "--disable-examples" @@ -88,8 +85,8 @@ stdenv.mkDerivation { "--with-readline" "--with-sodium" "--with-termcap" - ] - ++ (if withFreeImage then [ "--with-freeimage" ] else [ "--without-freeimage" ]); + "--without-freeimage" + ]; # On darwin, some macros defined in AssertMacros.h (from apple-sdk) are conflicting. postConfigure = '' diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index 45ad78c4f236..725a6353f983 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -27,9 +27,6 @@ let cl-cairo2-xlib = super.cl-cairo2-xlib.overrideLispAttrs (o: { nativeLibs = [ pkgs.gtk2-x11 ]; }); - cl-freeimage = super.cl-freeimage.overrideLispAttrs (o: { - nativeLibs = [ pkgs.freeimage ]; - }); cl-freetype2 = super.cl-freetype2.overrideLispAttrs (o: { nativeLibs = [ pkgs.freetype ]; nativeBuildInputs = [ pkgs.freetype ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 30eb6aa12ea8..fce4d1cd6ac8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -968,6 +968,7 @@ mapAliases { francis = kdePackages.francis; # added 2024-07-13 freecad-qt6 = freecad; # added 2025-06-14 freecad-wayland = freecad; # added 2025-06-14 + freeimage = throw "freeimage was removed due to numerous vulnerabilities"; # Added 2025-10-23 freerdp3 = freerdp; # added 2025-03-25 freerdpUnstable = freerdp; # added 2025-03-25 frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3847ee7ae46..64c1a5833818 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7225,10 +7225,6 @@ with pkgs; fplll = callPackage ../development/libraries/fplll { }; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { }; - freeimage = callPackage ../by-name/fr/freeimage/package.nix { - openexr = openexr_2; - }; - freeipa = callPackage ../os-specific/linux/freeipa { # NOTE: freeipa and sssd need to be built with the same version of python kerberos = krb5.override {