diff -Nru kodi-imagedecoder-raw-3.0.1/appveyor.yml kodi-imagedecoder-raw-19.0.0/appveyor.yml --- kodi-imagedecoder-raw-3.0.1/appveyor.yml 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/appveyor.yml 2021-08-29 12:22:46.000000000 +0000 @@ -23,7 +23,7 @@ build_script: - cd .. - - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git + - git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git - cd %app_id% - mkdir build - cd build diff -Nru kodi-imagedecoder-raw-3.0.1/azure-pipelines.yml kodi-imagedecoder-raw-19.0.0/azure-pipelines.yml --- kodi-imagedecoder-raw-3.0.1/azure-pipelines.yml 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/azure-pipelines.yml 2021-08-29 12:22:46.000000000 +0000 @@ -46,7 +46,7 @@ - script: | cd .. - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git kodi + git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git kodi cd $(Build.SourcesDirectory) mkdir build cd build diff -Nru kodi-imagedecoder-raw-3.0.1/debian/changelog kodi-imagedecoder-raw-19.0.0/debian/changelog --- kodi-imagedecoder-raw-3.0.1/debian/changelog 2013-05-31 22:59:22.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/debian/changelog 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-imagedecoder-raw (3.0.1-1~focal) focal; urgency=low +kodi-imagedecoder-raw (19.0.0-1~focal) focal; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-imagedecoder-raw-3.0.1/debian/copyright kodi-imagedecoder-raw-19.0.0/debian/copyright --- kodi-imagedecoder-raw-3.0.1/debian/copyright 2013-05-31 22:59:22.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/debian/copyright 2013-05-31 22:59:22.000000000 +0000 @@ -3,7 +3,7 @@ Source: https://github.com/xbmc/imagedecoder.raw Files: * -Copyright: 2005-2020 Team Kodi +Copyright: 2005-2021 Team Kodi License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru kodi-imagedecoder-raw-3.0.1/depends/common/lcms2/0001-no-register-keyword.patch kodi-imagedecoder-raw-19.0.0/depends/common/lcms2/0001-no-register-keyword.patch --- kodi-imagedecoder-raw-3.0.1/depends/common/lcms2/0001-no-register-keyword.patch 1970-01-01 00:00:00.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/common/lcms2/0001-no-register-keyword.patch 2021-08-29 12:22:46.000000000 +0000 @@ -0,0 +1,12 @@ +--- a/include/lcms2.h ++++ b/include/lcms2.h +@@ -62,7 +62,7 @@ + // #define CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT + + // Uncomment this to remove the "register" storage class +-// #define CMS_NO_REGISTER_KEYWORD 1 ++#define CMS_NO_REGISTER_KEYWORD 1 + + // ********** End of configuration toggles ****************************** + + diff -Nru kodi-imagedecoder-raw-3.0.1/depends/common/lcms2/lcms2.sha256 kodi-imagedecoder-raw-19.0.0/depends/common/lcms2/lcms2.sha256 --- kodi-imagedecoder-raw-3.0.1/depends/common/lcms2/lcms2.sha256 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/common/lcms2/lcms2.sha256 2021-08-29 12:22:46.000000000 +0000 @@ -1 +1 @@ -8e23a09dc81af856db37941a4ea26acdf6a45b0281ec5b7ee94b5a4e9f7afbf7 +18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5 diff -Nru kodi-imagedecoder-raw-3.0.1/depends/common/lcms2/lcms2.txt kodi-imagedecoder-raw-19.0.0/depends/common/lcms2/lcms2.txt --- kodi-imagedecoder-raw-3.0.1/depends/common/lcms2/lcms2.txt 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/common/lcms2/lcms2.txt 2021-08-29 12:22:46.000000000 +0000 @@ -1 +1 @@ -lcms2 https://github.com/mm2/Little-CMS/archive/lcms2.9.tar.gz \ No newline at end of file +lcms2 https://github.com/mm2/Little-CMS/releases/download/lcms2.12/lcms2-2.12.tar.gz diff -Nru kodi-imagedecoder-raw-3.0.1/depends/common/libjpeg-turbo/0001-fix-uwp-api.patch kodi-imagedecoder-raw-19.0.0/depends/common/libjpeg-turbo/0001-fix-uwp-api.patch --- kodi-imagedecoder-raw-3.0.1/depends/common/libjpeg-turbo/0001-fix-uwp-api.patch 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/common/libjpeg-turbo/0001-fix-uwp-api.patch 2021-08-29 12:22:46.000000000 +0000 @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -313,6 +313,9 @@ +@@ -352,6 +352,9 @@ endforeach() endif() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3 /wd4996") diff -Nru kodi-imagedecoder-raw-3.0.1/depends/common/libjpeg-turbo/0002-disable-executables.patch kodi-imagedecoder-raw-19.0.0/depends/common/libjpeg-turbo/0002-disable-executables.patch --- kodi-imagedecoder-raw-3.0.1/depends/common/libjpeg-turbo/0002-disable-executables.patch 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/common/libjpeg-turbo/0002-disable-executables.patch 2021-08-29 12:22:46.000000000 +0000 @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -595,18 +595,6 @@ +@@ -648,18 +648,6 @@ set_target_properties(turbojpeg PROPERTIES LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}") endif() @@ -19,7 +19,7 @@ endif() if(ENABLE_STATIC) -@@ -618,16 +606,6 @@ +@@ -671,16 +659,6 @@ if(NOT MSVC) set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg) endif() @@ -36,7 +36,7 @@ endif() endif() -@@ -642,26 +620,6 @@ +@@ -695,26 +673,6 @@ set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c) endif() @@ -63,7 +63,7 @@ ############################################################################### # TESTS -@@ -1359,8 +1317,6 @@ +@@ -1467,8 +1425,6 @@ else() set(DIR ${CMAKE_CURRENT_BINARY_DIR}) endif() @@ -72,7 +72,7 @@ endif() endif() install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h -@@ -1375,17 +1331,9 @@ +@@ -1485,17 +1441,9 @@ else() set(DIR ${CMAKE_CURRENT_BINARY_DIR}) endif() @@ -90,7 +90,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c -@@ -1398,13 +1346,6 @@ +@@ -1508,13 +1456,6 @@ DESTINATION ${CMAKE_INSTALL_DOCDIR}) endif() diff -Nru kodi-imagedecoder-raw-3.0.1/depends/common/libjpeg-turbo/0003-static.patch kodi-imagedecoder-raw-19.0.0/depends/common/libjpeg-turbo/0003-static.patch --- kodi-imagedecoder-raw-3.0.1/depends/common/libjpeg-turbo/0003-static.patch 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/common/libjpeg-turbo/0003-static.patch 2021-08-29 12:22:46.000000000 +0000 @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -555,10 +555,10 @@ +@@ -608,10 +608,10 @@ endif() if(ENABLE_STATIC) @@ -13,7 +13,7 @@ endif() endif() -@@ -598,13 +598,13 @@ +@@ -651,13 +651,13 @@ endif() if(ENABLE_STATIC) @@ -30,22 +30,21 @@ endif() endif() endif() -@@ -1309,7 +1309,7 @@ +@@ -1416,7 +1416,7 @@ if(WITH_TURBOJPEG) endif() endif() if(ENABLE_STATIC) -- install(TARGETS turbojpeg-static ARCHIVE -+ install(TARGETS turbojpeg ARCHIVE - DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- install(TARGETS turbojpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets ++ install(TARGETS turbojpeg EXPORT ${CMAKE_PROJECT_NAME}Targets + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) if(NOT ENABLE_SHARED) - if(MSVC_IDE OR XCODE) -@@ -1324,7 +1324,7 @@ +@@ -1432,7 +1432,7 @@ endif() if(ENABLE_STATIC) -- install(TARGETS jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ install(TARGETS jpeg ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- install(TARGETS jpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets ++ install(TARGETS jpeg EXPORT ${CMAKE_PROJECT_NAME}Targets + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) if(NOT ENABLE_SHARED) - if(MSVC_IDE OR XCODE) - set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") - diff -Nru kodi-imagedecoder-raw-3.0.1/depends/common/libjpeg-turbo/libjpeg-turbo.sha256 kodi-imagedecoder-raw-19.0.0/depends/common/libjpeg-turbo/libjpeg-turbo.sha256 --- kodi-imagedecoder-raw-3.0.1/depends/common/libjpeg-turbo/libjpeg-turbo.sha256 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/common/libjpeg-turbo/libjpeg-turbo.sha256 2021-08-29 12:22:46.000000000 +0000 @@ -1 +1 @@ -33dd8547efd5543639e890efbf2ef52d5a21df81faf41bb940657af916a23406 +20e9cd3e5f517950dfb7a300ad344543d88719c254407ffb5ad88d891bf701c4 diff -Nru kodi-imagedecoder-raw-3.0.1/depends/common/libjpeg-turbo/libjpeg-turbo.txt kodi-imagedecoder-raw-19.0.0/depends/common/libjpeg-turbo/libjpeg-turbo.txt --- kodi-imagedecoder-raw-3.0.1/depends/common/libjpeg-turbo/libjpeg-turbo.txt 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/common/libjpeg-turbo/libjpeg-turbo.txt 2021-08-29 12:22:46.000000000 +0000 @@ -1 +1 @@ -libjpeg-turbo http://mirrors.kodi.tv/build-deps/sources/libjpeg-turbo-2.0.4.tar.gz +libjpeg-turbo https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/2.1.1.tar.gz diff -Nru kodi-imagedecoder-raw-3.0.1/depends/common/libraw/0001-android-swab.patch kodi-imagedecoder-raw-19.0.0/depends/common/libraw/0001-android-swab.patch --- kodi-imagedecoder-raw-3.0.1/depends/common/libraw/0001-android-swab.patch 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/common/libraw/0001-android-swab.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ ---- a/internal/dcraw_common.cpp -+++ b/internal/dcraw_common.cpp -@@ -20,6 +20,9 @@ - - - #include -+#if defined(TARGET_ANDROID) || defined(ANDROID) -+#include "internal/swab.h" -+#endif - #define CLASS LibRaw:: - #include "libraw/libraw_types.h" - #define LIBRAW_LIBRARY_BUILD ---- /dev/null -+++ b/internal/swab.cpp -@@ -0,0 +1,20 @@ -+#if defined(TARGET_ANDROID) || defined(ANDROID) -+ -+#include "internal/swab.h" -+ -+#include -+ -+void swab(const void *p_src, void *p_dst, ssize_t n) -+{ -+ if (n < 0) -+ return; -+ -+ for (ssize_t i = 0; i < n - 1; i += 2) -+ { -+ uint8_t tmp = static_cast(p_src)[i + 0]; -+ static_cast(p_dst)[i + 0] = static_cast(p_src)[i + 1]; -+ static_cast(p_dst)[i + 1] = tmp; -+ } -+} -+ -+#endif ---- /dev/null -+++ b/internal/swab.h -@@ -0,0 +1,5 @@ -+#pragma once -+ -+#include -+ -+void swab(const void *p_src_, void *p_dst_, ssize_t n); ---- a/Makefile.am -+++ b/Makefile.am -@@ -31,6 +31,7 @@ - lib_libraw_a_SOURCES = internal/dcraw_common.cpp \ - internal/dcraw_fileio.cpp \ - internal/demosaic_packs.cpp \ -+ internal/swab.cpp \ - src/libraw_cxx.cpp \ - src/libraw_datastream.cpp \ - src/libraw_c_api.cpp ---- a/src/libraw_cxx.cpp -+++ b/src/libraw_cxx.cpp -@@ -35,6 +35,10 @@ - #include - #endif - -+#if defined(TARGET_ANDROID) || defined(ANDROID) -+#include "internal/swab.h" -+#endif -+ - #ifdef USE_RAWSPEED - #include "../RawSpeed/rawspeed_xmldata.cpp" - #include diff -Nru kodi-imagedecoder-raw-3.0.1/depends/common/libraw/0001-fix-android-builds.patch kodi-imagedecoder-raw-19.0.0/depends/common/libraw/0001-fix-android-builds.patch --- kodi-imagedecoder-raw-3.0.1/depends/common/libraw/0001-fix-android-builds.patch 1970-01-01 00:00:00.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/common/libraw/0001-fix-android-builds.patch 2021-08-29 12:22:46.000000000 +0000 @@ -0,0 +1,111 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -64,7 +64,7 @@ + src/tables/wblists.cpp src/utils/curves.cpp \ + src/utils/decoder_info.cpp src/utils/init_close_utils.cpp \ + src/utils/open.cpp src/utils/phaseone_processing.cpp \ +- src/utils/read_utils.cpp src/utils/thumb_utils.cpp \ ++ src/utils/read_utils.cpp src/utils/swab.cpp src/utils/thumb_utils.cpp \ + src/utils/utils_dcraw.cpp src/utils/utils_libraw.cpp \ + src/write/apply_profile.cpp src/write/file_write.cpp \ + src/write/tiff_writer.cpp src/x3f/x3f_parse_process.cpp \ +--- a/internal/dcraw_common.cpp ++++ b/internal/dcraw_common.cpp +@@ -21,6 +21,7 @@ + #include "../src/utils/read_utils.cpp" + #include "../src/utils/curves.cpp" + #include "../src/utils/utils_dcraw.cpp" ++#include "../src/utils/swab.cpp" + + #include "../src/tables/colordata.cpp" + +--- a/internal/defines.h ++++ b/internal/defines.h +@@ -189,4 +189,8 @@ + #define BAYERC(row, col, c) \ + imgdata.image[((row) >> IO.shrink) * S.iwidth + ((col) >> IO.shrink)][c] + ++#if defined(__ANDROID__) ++ void swab(const void *p_src, void *p_dst, ssize_t n); ++#endif ++ + #endif +--- a/libraw/libraw_datastream.h ++++ b/libraw/libraw_datastream.h +@@ -43,6 +43,10 @@ + #endif + #endif + ++#if defined(__ANDROID__) && __ANDROID_API__ < 24 ++#define _LIBCPP_HAS_NO_OFF_T_FUNCTIONS ++#endif ++ + #include "libraw_const.h" + #include "libraw_types.h" + #include +--- a/src/libraw_cxx.cpp ++++ b/src/libraw_cxx.cpp +@@ -37,6 +37,7 @@ + #include "utils/decoder_info.cpp" + #include "utils/open.cpp" + #include "utils/phaseone_processing.cpp" ++#include "utils/swab.cpp" + #include "utils/thumb_utils.cpp" + + #include "write/tiff_writer.cpp" +--- a/src/libraw_datastream.cpp ++++ b/src/libraw_datastream.cpp +@@ -588,6 +588,8 @@ + #else + return fseek(f, (long)o, whence); + #endif ++#elif __ANDROID__ && __ANDROID_API__ < 24 ++ return fseek(f, (long)o, whence); + #else + return fseeko(f, o, whence); + #endif +@@ -602,6 +604,8 @@ + #else + return ftell(f); + #endif ++#elif __ANDROID__ && __ANDROID_API__ < 24 ++ return ftell(f); + #else + return ftello(f); + #endif +--- /dev/null ++++ b/src/utils/swab.cpp +@@ -0,0 +1,33 @@ ++/* -*- C++ -*- ++ * Copyright 2019-2020 LibRaw LLC (info@libraw.org) ++ * ++ ++ LibRaw is free software; you can redistribute it and/or modify ++ it under the terms of the one of two licenses as you choose: ++ ++1. GNU LESSER GENERAL PUBLIC LICENSE version 2.1 ++ (See file LICENSE.LGPL provided in LibRaw distribution archive for details). ++ ++2. COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 ++ (See file LICENSE.CDDL provided in LibRaw distribution archive for details). ++ ++ */ ++ ++#if defined(__ANDROID__) ++ ++#include "../../internal/dcraw_defs.h" ++ ++void swab(const void *p_src, void *p_dst, ssize_t n) ++{ ++ if (n < 0) ++ return; ++ ++ for (ssize_t i = 0; i < n - 1; i += 2) ++ { ++ uint8_t tmp = static_cast(p_src)[i + 0]; ++ static_cast(p_dst)[i + 0] = static_cast(p_src)[i + 1]; ++ static_cast(p_dst)[i + 1] = tmp; ++ } ++} ++ ++#endif diff -Nru kodi-imagedecoder-raw-3.0.1/depends/common/libraw/libraw.sha256 kodi-imagedecoder-raw-19.0.0/depends/common/libraw/libraw.sha256 --- kodi-imagedecoder-raw-3.0.1/depends/common/libraw/libraw.sha256 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/common/libraw/libraw.sha256 2021-08-29 12:22:46.000000000 +0000 @@ -1 +1 @@ -9a2a40418e4fb0ab908f6d384ff6f9075f4431f8e3d79a0e44e5a6ea9e75abdc +02df7d403b34602b769bb38e5bf7d4258e075eeefbe980b6832e6e1491989d60 diff -Nru kodi-imagedecoder-raw-3.0.1/depends/common/libraw/libraw.txt kodi-imagedecoder-raw-19.0.0/depends/common/libraw/libraw.txt --- kodi-imagedecoder-raw-3.0.1/depends/common/libraw/libraw.txt 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/common/libraw/libraw.txt 2021-08-29 12:22:46.000000000 +0000 @@ -1 +1 @@ -libraw https://github.com/LibRaw/LibRaw/archive/0.19.5.tar.gz +libraw https://github.com/LibRaw/LibRaw/archive/refs/tags/0.20.2.tar.gz diff -Nru kodi-imagedecoder-raw-3.0.1/depends/windows/lcms2/0001-no-register-keyword.patch kodi-imagedecoder-raw-19.0.0/depends/windows/lcms2/0001-no-register-keyword.patch --- kodi-imagedecoder-raw-3.0.1/depends/windows/lcms2/0001-no-register-keyword.patch 1970-01-01 00:00:00.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/windows/lcms2/0001-no-register-keyword.patch 2021-08-29 12:22:46.000000000 +0000 @@ -0,0 +1,12 @@ +--- a/include/lcms2.h ++++ b/include/lcms2.h +@@ -62,7 +62,7 @@ + // #define CMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT + + // Uncomment this to remove the "register" storage class +-// #define CMS_NO_REGISTER_KEYWORD 1 ++#define CMS_NO_REGISTER_KEYWORD 1 + + // ********** End of configuration toggles ****************************** + + diff -Nru kodi-imagedecoder-raw-3.0.1/depends/windows/lcms2/lcms2.sha256 kodi-imagedecoder-raw-19.0.0/depends/windows/lcms2/lcms2.sha256 --- kodi-imagedecoder-raw-3.0.1/depends/windows/lcms2/lcms2.sha256 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/windows/lcms2/lcms2.sha256 2021-08-29 12:22:46.000000000 +0000 @@ -1 +1 @@ -8e23a09dc81af856db37941a4ea26acdf6a45b0281ec5b7ee94b5a4e9f7afbf7 +18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5 diff -Nru kodi-imagedecoder-raw-3.0.1/depends/windows/lcms2/lcms2.txt kodi-imagedecoder-raw-19.0.0/depends/windows/lcms2/lcms2.txt --- kodi-imagedecoder-raw-3.0.1/depends/windows/lcms2/lcms2.txt 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/windows/lcms2/lcms2.txt 2021-08-29 12:22:46.000000000 +0000 @@ -1 +1 @@ -lcms2 https://github.com/mm2/Little-CMS/archive/lcms2.9.tar.gz \ No newline at end of file +lcms2 https://github.com/mm2/Little-CMS/releases/download/lcms2.12/lcms2-2.12.tar.gz diff -Nru kodi-imagedecoder-raw-3.0.1/depends/windows/libraw/0003-fix-sdl-errors.patch kodi-imagedecoder-raw-19.0.0/depends/windows/libraw/0003-fix-sdl-errors.patch --- kodi-imagedecoder-raw-3.0.1/depends/windows/libraw/0003-fix-sdl-errors.patch 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/windows/libraw/0003-fix-sdl-errors.patch 2021-08-29 12:22:46.000000000 +0000 @@ -1,52 +1,165 @@ ---- a/internal/dcraw_common.cpp -+++ b/internal/dcraw_common.cpp -@@ -1710,7 +1710,7 @@ - int i, nz; - char tail[424]; +--- a/src/decoders/crx.cpp ++++ b/src/decoders/crx.cpp +@@ -347,7 +347,7 @@ + (bitCode << param->kParam); + + // add converted (+/-) error code to predicted value +- param->lineBuf1[1] += -(bitCode & 1) ^ (bitCode >> 1); ++ param->lineBuf1[1] += (0u-(bitCode & 1)) ^ (bitCode >> 1); + + // for not end of the line - use one symbol ahead to estimate next K + if (notEOL) +@@ -456,7 +456,7 @@ + else if (param->kParam) + bitCode = crxBitstreamGetBits(¶m->bitStream, param->kParam) | + (bitCode << param->kParam); +- int32_t code = -(bitCode & 1) ^ (bitCode >> 1); ++ int32_t code = (0u-(bitCode & 1)) ^ (bitCode >> 1); + param->lineBuf1[1] = param->roundedBitsMask * 2 * code + (code >> 31) + sym; + + if (doCode) +@@ -576,7 +576,7 @@ + else if (param->kParam) + bitCode = crxBitstreamGetBits(¶m->bitStream, param->kParam) | + (bitCode << param->kParam); +- param->lineBuf1[i + 1] = -(bitCode & 1) ^ (bitCode >> 1); ++ param->lineBuf1[i + 1] = (0u-(bitCode & 1)) ^ (bitCode >> 1); + param->kParam = crxPredictKParameter(param->kParam, bitCode); + if (param->lineBuf2[i + 1] - param->kParam <= 1) + { +@@ -638,7 +638,7 @@ + else if (param->kParam) + bitCode = crxBitstreamGetBits(¶m->bitStream, param->kParam) | + (bitCode << param->kParam); +- param->lineBuf1[i + 1] = -((bitCode + 1) & 1) ^ ((bitCode + 1) >> 1); ++ param->lineBuf1[i + 1] = (0u-((bitCode + 1) & 1)) ^ ((bitCode + 1) >> 1); + param->kParam = crxPredictKParameter(param->kParam, bitCode, 15); + param->lineBuf2[i] = param->kParam; + } +@@ -652,7 +652,7 @@ + else if (param->kParam) + bitCode = crxBitstreamGetBits(¶m->bitStream, param->kParam) | + (bitCode << param->kParam); +- param->lineBuf1[i + 1] = -((bitCode + 1) & 1) ^ ((bitCode + 1) >> 1); ++ param->lineBuf1[i + 1] = (0u-((bitCode + 1) & 1)) ^ ((bitCode + 1) >> 1); + param->kParam = crxPredictKParameter(param->kParam, bitCode); + if (param->lineBuf2[i + 1] - param->kParam <= 1) + { +@@ -743,7 +743,7 @@ + else if (param->kParam) + bitCode = crxBitstreamGetBits(¶m->bitStream, param->kParam) | + (bitCode << param->kParam); +- param->lineBuf1[1] += -(bitCode & 1) ^ (bitCode >> 1); ++ param->lineBuf1[1] += (0u-(bitCode & 1)) ^ (bitCode >> 1); + param->kParam = crxPredictKParameter(param->kParam, bitCode, 15); + ++param->lineBuf1; + } +@@ -757,7 +757,7 @@ + else if (param->kParam) + bitCode = crxBitstreamGetBits(¶m->bitStream, param->kParam) | + (bitCode << param->kParam); +- param->lineBuf1[1] += -(bitCode & 1) ^ (bitCode >> 1); ++ param->lineBuf1[1] += (0u-(bitCode & 1)) ^ (bitCode >> 1); + param->kParam = crxPredictKParameter(param->kParam, bitCode, 15); + ++param->lineBuf1; + } +@@ -830,7 +830,7 @@ + bitCode = crxBitstreamGetBits(¶m->bitStream, param->kParam) | + (bitCode << param->kParam); + +- int32_t sVal = -(bitCode & 1) ^ (bitCode >> 1); ++ int32_t sVal = (0u-(bitCode & 1)) ^ (bitCode >> 1); + param->lineBuf1[1] += param->roundedBitsMask * 2 * sVal + (sVal >> 31); + param->kParam = crxPredictKParameter(param->kParam, bitCode, 15); + ++param->lineBuf1; +@@ -844,7 +844,7 @@ + else if (param->kParam) + bitCode = crxBitstreamGetBits(¶m->bitStream, param->kParam) | + (bitCode << param->kParam); +- int32_t sVal = -(bitCode & 1) ^ (bitCode >> 1); ++ int32_t sVal = (0u-(bitCode & 1)) ^ (bitCode >> 1); + param->lineBuf1[1] += param->roundedBitsMask * 2 * sVal + (sVal >> 31); + param->kParam = crxPredictKParameter(param->kParam, bitCode, 15); + ++param->lineBuf1; +@@ -870,7 +870,7 @@ + else if (param->kParam) + bitCode = crxBitstreamGetBits(¶m->bitStream, param->kParam) | + (bitCode << param->kParam); +- param->lineBuf1[1] = -(bitCode & 1) ^ (bitCode >> 1); ++ param->lineBuf1[1] = (0u-(bitCode & 1)) ^ (bitCode >> 1); + param->kParam = crxPredictKParameter(param->kParam, bitCode, 15); + } + else +@@ -922,7 +922,7 @@ + else if (param->kParam) + bitCode = crxBitstreamGetBits(¶m->bitStream, param->kParam) | + (bitCode << param->kParam); +- param->lineBuf1[1] = -((bitCode + 1) & 1) ^ ((bitCode + 1) >> 1); ++ param->lineBuf1[1] = (0u-((bitCode + 1) & 1)) ^ ((bitCode + 1) >> 1); + param->kParam = crxPredictKParameter(param->kParam, bitCode, 15); + } + param->lineBuf2[0] = param->kParam; +@@ -938,7 +938,7 @@ + else if (param->kParam) + bitCode = crxBitstreamGetBits(¶m->bitStream, param->kParam) | + (bitCode << param->kParam); +- param->lineBuf1[1] = -(bitCode & 1) ^ (bitCode >> 1); ++ param->lineBuf1[1] = (0u-(bitCode & 1)) ^ (bitCode >> 1); + param->kParam = crxPredictKParameter(param->kParam, bitCode, 15); + param->lineBuf2[0] = param->kParam; + ++param->lineBuf1; +@@ -1085,7 +1085,7 @@ + (bitCode << subband->paramK); + + subband->quantValue += +- -(bitCode & 1) ^ (bitCode >> 1); // converting encoded to signed integer ++ (0u-(bitCode & 1) ^ (bitCode >> 1)); // converting encoded to signed integer + subband->paramK = crxPredictKParameter(subband->paramK, bitCode); + if (subband->paramK > 7) + return -1; +--- a/src/metadata/cr3_parser.cpp ++++ b/src/metadata/cr3_parser.cpp +@@ -298,7 +298,7 @@ + AtomType = 1; + } + else +- fseek(ifp, -lHdr, SEEK_CUR); ++ fseek(ifp, 0u -lHdr, SEEK_CUR); + } + else if (!strcmp(AtomNameStack, "moovuuidCCTP")) + { +--- a/src/metadata/makernotes.cpp ++++ b/src/metadata/makernotes.cpp +@@ -96,7 +96,7 @@ -- fseek(ifp, -sizeof tail, SEEK_END); -+ fseek(ifp, 0u -sizeof tail, SEEK_END); - fread(tail, 1, sizeof tail, ifp); - for (nz = i = 0; i < sizeof tail; i++) - if (tail[i]) -@@ -9273,11 +9273,11 @@ - unsigned lenNikonLensData = 0; - unsigned NikonFlashInfoVersion = 0; + unsigned entries, tag, type, len, save, c; - uchar *CanonCameraInfo; + uchar *CanonCameraInfo = nullptr; unsigned lenCanonCameraInfo = 0; unsigned typeCanonCameraInfo = 0; -- uchar *table_buf; -+ uchar *table_buf = nullptr; - uchar *table_buf_0x0116; - ushort table_buf_0x0116_len = 0; - uchar *table_buf_0x2010; -@@ -10111,11 +10111,11 @@ - - unsigned NikonFlashInfoVersion = 0; +@@ -420,7 +420,7 @@ + unsigned i, wb[4] = {0, 0, 0, 0}; + short morder, sorder = order; - uchar *CanonCameraInfo; + uchar *CanonCameraInfo = nullptr; unsigned lenCanonCameraInfo = 0; unsigned typeCanonCameraInfo = 0; + imCanon.wbi = 0; +--- a/src/metadata/misc_parsers.cpp ++++ b/src/metadata/misc_parsers.cpp +@@ -71,7 +71,7 @@ + int i, nz; + char tail[424]; -- uchar *table_buf; -+ uchar *table_buf = nullptr; - uchar *table_buf_0x0116; - ushort table_buf_0x0116_len = 0; - uchar *table_buf_0x2010; -@@ -14047,7 +14047,7 @@ - #else - if (!ifp->tempbuffer_open(buf, sony_length)) - { -- parse_tiff_ifd(-sony_offset); -+ parse_tiff_ifd(0u -sony_offset); - ifp->tempbuffer_close(); - } - #endif -@@ -15594,7 +15594,7 @@ +- fseek(ifp, -sizeof tail, SEEK_END); ++ fseek(ifp, 0u -sizeof tail, SEEK_END); + fread(tail, 1, sizeof tail, ifp); + for (nz = i = 0; i < int(sizeof tail); i++) + if (tail[i]) +@@ -102,7 +102,7 @@ width = get4(); height = get4(); fseek(ifp, 0, SEEK_END); @@ -54,4 +167,37 @@ + fseek(ifp, 0u -(i = ftello(ifp) & 511), SEEK_CUR); if (get4() != i || get4() != 0x52454f42) { - #ifdef DCRAW_VERBOSE + fseek(ifp, 0, SEEK_SET); +--- a/src/metadata/nikon.cpp ++++ b/src/metadata/nikon.cpp +@@ -238,7 +238,7 @@ + unsigned offset = 0, entries, tag, type, len, save; + + unsigned c, i; +- uchar *LensData_buf; ++ uchar *LensData_buf = nullptr; + uchar ColorBalanceData_buf[324]; + int ColorBalanceData_ready = 0; + uchar ci, cj, ck; +--- a/src/metadata/pentax.cpp ++++ b/src/metadata/pentax.cpp +@@ -133,7 +133,7 @@ + void LibRaw::PentaxLensInfo(unsigned long long id, unsigned len) // tag 0x0207 + { + ushort iLensData = 0; +- uchar *table_buf; ++ uchar *table_buf = nullptr; + table_buf = (uchar *)malloc(MAX(len, 128)); + fread(table_buf, len, 1, ifp); + if ((id < PentaxID_K100D) || +--- a/src/metadata/sony.cpp ++++ b/src/metadata/sony.cpp +@@ -982,7 +982,7 @@ + { + + ushort lid, a, c, d; +- uchar *table_buf; ++ uchar *table_buf = nullptr; + uchar uc; + uchar s[2]; + int LensDataValid = 0; diff -Nru kodi-imagedecoder-raw-3.0.1/depends/windows/libraw/libraw.sha256 kodi-imagedecoder-raw-19.0.0/depends/windows/libraw/libraw.sha256 --- kodi-imagedecoder-raw-3.0.1/depends/windows/libraw/libraw.sha256 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/windows/libraw/libraw.sha256 2021-08-29 12:22:46.000000000 +0000 @@ -1 +1 @@ -9a2a40418e4fb0ab908f6d384ff6f9075f4431f8e3d79a0e44e5a6ea9e75abdc +02df7d403b34602b769bb38e5bf7d4258e075eeefbe980b6832e6e1491989d60 diff -Nru kodi-imagedecoder-raw-3.0.1/depends/windows/libraw/libraw.txt kodi-imagedecoder-raw-19.0.0/depends/windows/libraw/libraw.txt --- kodi-imagedecoder-raw-3.0.1/depends/windows/libraw/libraw.txt 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/depends/windows/libraw/libraw.txt 2021-08-29 12:22:46.000000000 +0000 @@ -1 +1 @@ -libraw https://github.com/LibRaw/LibRaw/archive/0.19.5.tar.gz +libraw https://github.com/LibRaw/LibRaw/archive/refs/tags/0.20.2.tar.gz diff -Nru kodi-imagedecoder-raw-3.0.1/.github/workflows/sync-addon-metadata-translations.yml kodi-imagedecoder-raw-19.0.0/.github/workflows/sync-addon-metadata-translations.yml --- kodi-imagedecoder-raw-3.0.1/.github/workflows/sync-addon-metadata-translations.yml 1970-01-01 00:00:00.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/.github/workflows/sync-addon-metadata-translations.yml 2021-08-29 12:22:46.000000000 +0000 @@ -0,0 +1,46 @@ +name: Sync addon metadata translations + +on: + push: + branches: [ Matrix, Nexus ] + paths: + - '**addon.xml' + - '**resource.language.**strings.po' + +jobs: + default: + if: github.repository == 'xbmc/imagedecoder.raw' + runs-on: ubuntu-latest + + steps: + + - name: Checkout repository + uses: actions/checkout@v2 + with: + path: project + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.9' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install git+https://github.com/xbmc/sync_addon_metadata_translations.git + + - name: Run sync-addon-metadata-translations + run: | + sync-addon-metadata-translations + working-directory: ./project + + - name: Create PR for sync-addon-metadata-translations changes + uses: peter-evans/create-pull-request@v3.10.0 + with: + commit-message: Sync of addon metadata translations + title: Sync of addon metadata translations + body: Sync of addon metadata translations triggered by ${{ github.sha }} + branch: amt-sync + delete-branch: true + path: ./project + reviewers: gade01 diff -Nru kodi-imagedecoder-raw-3.0.1/imagedecoder.raw/addon.xml.in kodi-imagedecoder-raw-19.0.0/imagedecoder.raw/addon.xml.in --- kodi-imagedecoder-raw-3.0.1/imagedecoder.raw/addon.xml.in 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/imagedecoder.raw/addon.xml.in 2021-08-29 12:22:46.000000000 +0000 @@ -1,7 +1,7 @@  @ADDON_DEPENDS@ @@ -11,15 +11,15 @@ extension=".3fr|.arw|.cr2|.crw|.dcr|.dng|.erf|.kdc|.mdc|.mef|.mos|.mrw|.nef|.nrw|.orf|.pef|.ppm|.raf|.raw|.rw2|.srw|.x3f" mimetype="image/3fr|image/arw|image/cr2|image/crw|image/dcr|image/dng|image/erf|image/kdc|image/mdc|image/mef|image/mos|image/mrw|image/nef|image/nrw|image/orf|image/pef|image/x-portable-pixmap|image/raf|image/raw|image/rw2|image/srw|image/x3f"/> - Reading of RAW digicam images - Lesen von RAW-Digicam Bildern - Addon based on LibRaw for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, MOS, KDC, DCR and others; virtually all RAW formats are supported). - Addon basierend auf LibRaw zum Lesen von Dateien im Rohdatenformat der digitalen Fotokameras (CRW / CR2, NEF, RAF, DNG, MOS, KDC, DCR und andere; praktisch alle RAW-Formate werden unterstützt). @PLATFORM@ GPL-2.0-or-later https://github.com/xbmc/imagedecoder.raw icon.png + Lesen von RAW-Digicam Bildern + Reading of RAW digicam images + Addon basierend auf LibRaw zum Lesen von Dateien im Rohdatenformat der digitalen Fotokameras (CRW / CR2, NEF, RAF, DNG, MOS, KDC, DCR und andere; praktisch alle RAW-Formate werden unterstützt). + Addon based on LibRaw for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, MOS, KDC, DCR and others; virtually all RAW formats are supported). diff -Nru kodi-imagedecoder-raw-3.0.1/imagedecoder.raw/resources/language/resource.language.de_de/strings.po kodi-imagedecoder-raw-19.0.0/imagedecoder.raw/resources/language/resource.language.de_de/strings.po --- kodi-imagedecoder-raw-3.0.1/imagedecoder.raw/resources/language/resource.language.de_de/strings.po 1970-01-01 00:00:00.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/imagedecoder.raw/resources/language/resource.language.de_de/strings.po 2021-08-29 12:22:46.000000000 +0000 @@ -0,0 +1,25 @@ +# Kodi Media Center language file +# Addon Name: libraw image decoder +# Addon id: imagedecoder.raw +# Addon Provider: Team Kodi +msgid "" +msgstr "" +"Project-Id-Version: KODI Addons\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/imagedecoder.raw/issues/\n" +"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Kodi Translation Team\n" +"Language-Team: German (Germany) (http://www.transifex.com/projects/p/kodi-addons/language/de_DE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: de_DE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgctxt "Addon Summary" +msgid "Reading of RAW digicam images" +msgstr "Lesen von RAW-Digicam Bildern" + +msgctxt "Addon Description" +msgid "Addon based on LibRaw for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, MOS, KDC, DCR and others; virtually all RAW formats are supported)." +msgstr "Addon basierend auf LibRaw zum Lesen von Dateien im Rohdatenformat der digitalen Fotokameras (CRW / CR2, NEF, RAF, DNG, MOS, KDC, DCR und andere; praktisch alle RAW-Formate werden unterstützt)." diff -Nru kodi-imagedecoder-raw-3.0.1/imagedecoder.raw/resources/language/resource.language.en_gb/strings.po kodi-imagedecoder-raw-19.0.0/imagedecoder.raw/resources/language/resource.language.en_gb/strings.po --- kodi-imagedecoder-raw-3.0.1/imagedecoder.raw/resources/language/resource.language.en_gb/strings.po 1970-01-01 00:00:00.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/imagedecoder.raw/resources/language/resource.language.en_gb/strings.po 2021-08-29 12:22:46.000000000 +0000 @@ -0,0 +1,25 @@ +# Kodi Media Center language file +# Addon Name: libraw image decoder +# Addon id: imagedecoder.raw +# Addon Provider: Team Kodi +msgid "" +msgstr "" +"Project-Id-Version: KODI Addons\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/imagedecoder.raw/issues/\n" +"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Kodi Translation Team\n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/kodi-addons/language/en_GB/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgctxt "Addon Summary" +msgid "Reading of RAW digicam images" +msgstr "" + +msgctxt "Addon Description" +msgid "Addon based on LibRaw for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, MOS, KDC, DCR and others; virtually all RAW formats are supported)." +msgstr "" diff -Nru kodi-imagedecoder-raw-3.0.1/README.md kodi-imagedecoder-raw-19.0.0/README.md --- kodi-imagedecoder-raw-3.0.1/README.md 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/README.md 2021-08-29 12:22:46.000000000 +0000 @@ -1,5 +1,4 @@ [![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md) -[![Build Status](https://travis-ci.org/xbmc/imagedecoder.raw.svg?branch=Matrix)](https://travis-ci.org/xbmc/imagedecoder.raw/branches) [![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.imagedecoder.raw?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=28&branchName=Matrix) [![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/imagedecoder.raw/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Fimagedecoder.raw/branches/) @@ -14,7 +13,7 @@ ## Build instructions When building the addon you have to use the correct branch depending on which version of Kodi you're building against. -If you want to build the addon to be compatible with the latest kodi `master` commit, you need to checkout the branch with the current kodi codename. +If you want to build the addon to be compatible with the latest kodi `Matrix` commit, you need to checkout the branch with the current kodi codename. Also make sure you follow this README from the branch in question. ### Linux @@ -22,8 +21,8 @@ The following instructions assume you will have built Kodi already in the `kodi-build` directory suggested by the README. -1. `git clone --branch master https://github.com/xbmc/xbmc.git` -2. `git clone https://github.com/xbmc/imagedecoder.raw.git` +1. `git clone --branch Matrix https://github.com/xbmc/xbmc.git` +2. `git clone --branch Matrix https://github.com/xbmc/imagedecoder.raw.git` 3. `cd imagedecoder.raw && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=imagedecoder.raw -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons` 5. `make` diff -Nru kodi-imagedecoder-raw-3.0.1/src/RawPicture.cpp kodi-imagedecoder-raw-19.0.0/src/RawPicture.cpp --- kodi-imagedecoder-raw-3.0.1/src/RawPicture.cpp 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/src/RawPicture.cpp 2021-08-29 12:22:46.000000000 +0000 @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2020 Team Kodi - * https://kodi.tv + * Copyright (C) 2005-2021 Team Kodi (https://kodi.tv) * * SPDX-License-Identifier: GPL-2.0-or-later * See LICENSE.md for more information. diff -Nru kodi-imagedecoder-raw-3.0.1/.travis.yml kodi-imagedecoder-raw-19.0.0/.travis.yml --- kodi-imagedecoder-raw-3.0.1/.travis.yml 2020-05-19 17:56:54.000000000 +0000 +++ kodi-imagedecoder-raw-19.0.0/.travis.yml 2021-08-29 12:22:46.000000000 +0000 @@ -40,7 +40,7 @@ # before_script: - cd $TRAVIS_BUILD_DIR/.. - - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git + - git clone --branch Matrix --depth=1 https://github.com/xbmc/xbmc.git - cd ${app_id} && mkdir build && cd build - mkdir -p definition/${app_id} - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt