diff --git a/3rdparty/libjpeg-turbo/CMakeLists.txt b/3rdparty/libjpeg-turbo/CMakeLists.txt index b08fb266ec..fe9b574805 100644 --- a/3rdparty/libjpeg-turbo/CMakeLists.txt +++ b/3rdparty/libjpeg-turbo/CMakeLists.txt @@ -18,8 +18,8 @@ if(CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13) ocv_warnings_disable(CMAKE_C_FLAGS -Wstringop-overflow) endif() -set(VERSION 3.1.0) -set(COPYRIGHT_YEAR "1991-2024") +set(VERSION 3.1.2) +set(COPYRIGHT_YEAR "1991-2025") string(REPLACE "." ";" VERSION_TRIPLET ${VERSION}) list(GET VERSION_TRIPLET 0 VERSION_MAJOR) list(GET VERSION_TRIPLET 1 VERSION_MINOR) diff --git a/3rdparty/libjpeg-turbo/simd/arm/aarch32/jccolext-neon.c b/3rdparty/libjpeg-turbo/simd/arm/aarch32/jccolext-neon.c index 362102d2b2..3d7134e795 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/aarch32/jccolext-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/aarch32/jccolext-neon.c @@ -1,5 +1,5 @@ /* - * jccolext-neon.c - colorspace conversion (32-bit Arm Neon) + * Colorspace conversion (32-bit Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * Copyright (C) 2020, D. R. Commander. All Rights Reserved. diff --git a/3rdparty/libjpeg-turbo/simd/arm/aarch32/jchuff-neon.c b/3rdparty/libjpeg-turbo/simd/arm/aarch32/jchuff-neon.c index 153da1f1c1..491072cba9 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/aarch32/jchuff-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/aarch32/jchuff-neon.c @@ -1,5 +1,5 @@ /* - * jchuff-neon.c - Huffman entropy encoding (32-bit Arm Neon) + * Huffman entropy encoding (32-bit Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * Copyright (C) 2024, D. R. Commander. All Rights Reserved. diff --git a/3rdparty/libjpeg-turbo/simd/arm/aarch32/jsimd.c b/3rdparty/libjpeg-turbo/simd/arm/aarch32/jsimd.c index 7c8ea306bd..292b8a36f9 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/aarch32/jsimd.c +++ b/3rdparty/libjpeg-turbo/simd/arm/aarch32/jsimd.c @@ -1,6 +1,4 @@ /* - * jsimd_arm.c - * * Copyright 2009 Pierre Ossman for Cendio AB * Copyright (C) 2011, Nokia Corporation and/or its subsidiary(-ies). * Copyright (C) 2009-2011, 2013-2014, 2016, 2018, 2022, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/arm/aarch64/jccolext-neon.c b/3rdparty/libjpeg-turbo/simd/arm/aarch64/jccolext-neon.c index 37130c225e..c7720700d3 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/aarch64/jccolext-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/aarch64/jccolext-neon.c @@ -1,5 +1,5 @@ /* - * jccolext-neon.c - colorspace conversion (64-bit Arm Neon) + * Colorspace conversion (64-bit Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * diff --git a/3rdparty/libjpeg-turbo/simd/arm/aarch64/jchuff-neon.c b/3rdparty/libjpeg-turbo/simd/arm/aarch64/jchuff-neon.c index 11bf6dab13..5001167e2f 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/aarch64/jchuff-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/aarch64/jchuff-neon.c @@ -1,5 +1,5 @@ /* - * jchuff-neon.c - Huffman entropy encoding (64-bit Arm Neon) + * Huffman entropy encoding (64-bit Arm Neon) * * Copyright (C) 2020-2021, Arm Limited. All Rights Reserved. * Copyright (C) 2020, 2022, 2024, D. R. Commander. All Rights Reserved. diff --git a/3rdparty/libjpeg-turbo/simd/arm/aarch64/jsimd.c b/3rdparty/libjpeg-turbo/simd/arm/aarch64/jsimd.c index 8a6f30a1a8..e91ff83d1e 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/aarch64/jsimd.c +++ b/3rdparty/libjpeg-turbo/simd/arm/aarch64/jsimd.c @@ -1,6 +1,4 @@ /* - * jsimd_arm64.c - * * Copyright 2009 Pierre Ossman for Cendio AB * Copyright (C) 2011, Nokia Corporation and/or its subsidiary(-ies). * Copyright (C) 2009-2011, 2013-2014, 2016, 2018, 2020, 2022, 2024, diff --git a/3rdparty/libjpeg-turbo/simd/arm/jccolor-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jccolor-neon.c index d14a7bf501..4ac1e55955 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jccolor-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jccolor-neon.c @@ -1,8 +1,8 @@ /* - * jccolor-neon.c - colorspace conversion (Arm Neon) + * Colorspace conversion (Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. - * Copyright (C) 2020, 2024, D. R. Commander. All Rights Reserved. + * Copyright (C) 2020, 2024-2025, D. R. Commander. All Rights Reserved. * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -53,7 +53,7 @@ ALIGN(16) static const uint16_t jsimd_rgb_ycc_neon_consts[] = { /* Include inline routines for colorspace extensions. */ -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) #include "aarch64/jccolext-neon.c" #else #include "aarch32/jccolext-neon.c" @@ -68,7 +68,7 @@ ALIGN(16) static const uint16_t jsimd_rgb_ycc_neon_consts[] = { #define RGB_BLUE EXT_RGB_BLUE #define RGB_PIXELSIZE EXT_RGB_PIXELSIZE #define jsimd_rgb_ycc_convert_neon jsimd_extrgb_ycc_convert_neon -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) #include "aarch64/jccolext-neon.c" #else #include "aarch32/jccolext-neon.c" @@ -84,7 +84,7 @@ ALIGN(16) static const uint16_t jsimd_rgb_ycc_neon_consts[] = { #define RGB_BLUE EXT_RGBX_BLUE #define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE #define jsimd_rgb_ycc_convert_neon jsimd_extrgbx_ycc_convert_neon -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) #include "aarch64/jccolext-neon.c" #else #include "aarch32/jccolext-neon.c" @@ -100,7 +100,7 @@ ALIGN(16) static const uint16_t jsimd_rgb_ycc_neon_consts[] = { #define RGB_BLUE EXT_BGR_BLUE #define RGB_PIXELSIZE EXT_BGR_PIXELSIZE #define jsimd_rgb_ycc_convert_neon jsimd_extbgr_ycc_convert_neon -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) #include "aarch64/jccolext-neon.c" #else #include "aarch32/jccolext-neon.c" @@ -116,7 +116,7 @@ ALIGN(16) static const uint16_t jsimd_rgb_ycc_neon_consts[] = { #define RGB_BLUE EXT_BGRX_BLUE #define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE #define jsimd_rgb_ycc_convert_neon jsimd_extbgrx_ycc_convert_neon -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) #include "aarch64/jccolext-neon.c" #else #include "aarch32/jccolext-neon.c" @@ -132,7 +132,7 @@ ALIGN(16) static const uint16_t jsimd_rgb_ycc_neon_consts[] = { #define RGB_BLUE EXT_XBGR_BLUE #define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE #define jsimd_rgb_ycc_convert_neon jsimd_extxbgr_ycc_convert_neon -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) #include "aarch64/jccolext-neon.c" #else #include "aarch32/jccolext-neon.c" @@ -148,7 +148,7 @@ ALIGN(16) static const uint16_t jsimd_rgb_ycc_neon_consts[] = { #define RGB_BLUE EXT_XRGB_BLUE #define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE #define jsimd_rgb_ycc_convert_neon jsimd_extxrgb_ycc_convert_neon -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) #include "aarch64/jccolext-neon.c" #else #include "aarch32/jccolext-neon.c" diff --git a/3rdparty/libjpeg-turbo/simd/arm/jcgray-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jcgray-neon.c index fbcf821405..381913115b 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jcgray-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jcgray-neon.c @@ -1,5 +1,5 @@ /* - * jcgray-neon.c - grayscale colorspace conversion (Arm Neon) + * Grayscale colorspace conversion (Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * Copyright (C) 2024, D. R. Commander. All Rights Reserved. diff --git a/3rdparty/libjpeg-turbo/simd/arm/jcgryext-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jcgryext-neon.c index 416a7385df..559b6a5b50 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jcgryext-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jcgryext-neon.c @@ -1,5 +1,5 @@ /* - * jcgryext-neon.c - grayscale colorspace conversion (Arm Neon) + * Grayscale colorspace conversion (Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * diff --git a/3rdparty/libjpeg-turbo/simd/arm/jchuff.h b/3rdparty/libjpeg-turbo/simd/arm/jchuff.h index 2fbd252b9b..5ca9629394 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jchuff.h +++ b/3rdparty/libjpeg-turbo/simd/arm/jchuff.h @@ -4,7 +4,7 @@ * This file was part of the Independent JPEG Group's software: * Copyright (C) 1991-1997, Thomas G. Lane. * libjpeg-turbo Modifications: - * Copyright (C) 2009, 2018, 2021, D. R. Commander. + * Copyright (C) 2009, 2018, 2021, 2025, D. R. Commander. * Copyright (C) 2018, Matthias Räncker. * Copyright (C) 2020-2021, Arm Limited. * For conditions of distribution and use, see the accompanying README.ijg @@ -17,7 +17,7 @@ * but must not be updated permanently until we complete the MCU. */ -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) #define BIT_BUF_SIZE 64 #else #define BIT_BUF_SIZE 32 @@ -54,7 +54,7 @@ typedef struct { * directly to the output buffer. Otherwise, use the EMIT_BYTE() macro to * encode 0xFF as 0xFF 0x00. */ -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) #define FLUSH() { \ if (put_buffer & 0x8080808080808080 & ~(put_buffer + 0x0101010101010101)) { \ diff --git a/3rdparty/libjpeg-turbo/simd/arm/jcphuff-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jcphuff-neon.c index 435f96ee96..d3aeedbd15 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jcphuff-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jcphuff-neon.c @@ -1,9 +1,9 @@ /* - * jcphuff-neon.c - prepare data for progressive Huffman encoding (Arm Neon) + * Prepare data for progressive Huffman encoding (Arm Neon) * * Copyright (C) 2020-2021, Arm Limited. All Rights Reserved. * Copyright (C) 2022, Matthieu Darbois. All Rights Reserved. - * Copyright (C) 2022, 2024, D. R. Commander. All Rights Reserved. + * Copyright (C) 2022, 2024-2025, D. R. Commander. All Rights Reserved. * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -251,7 +251,7 @@ void jsimd_encode_mcu_AC_first_prepare_neon uint8x8_t bitmap_rows_4567 = vpadd_u8(bitmap_rows_45, bitmap_rows_67); uint8x8_t bitmap_all = vpadd_u8(bitmap_rows_0123, bitmap_rows_4567); -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) /* Move bitmap to a 64-bit scalar register. */ uint64_t bitmap = vget_lane_u64(vreinterpret_u64_u8(bitmap_all), 0); /* Store zerobits bitmap. */ @@ -511,7 +511,7 @@ int jsimd_encode_mcu_AC_refine_prepare_neon uint8x8_t bitmap_rows_4567 = vpadd_u8(bitmap_rows_45, bitmap_rows_67); uint8x8_t bitmap_all = vpadd_u8(bitmap_rows_0123, bitmap_rows_4567); -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) /* Move bitmap to a 64-bit scalar register. */ uint64_t bitmap = vget_lane_u64(vreinterpret_u64_u8(bitmap_all), 0); /* Store zerobits bitmap. */ @@ -552,7 +552,7 @@ int jsimd_encode_mcu_AC_refine_prepare_neon bitmap_rows_4567 = vpadd_u8(bitmap_rows_45, bitmap_rows_67); bitmap_all = vpadd_u8(bitmap_rows_0123, bitmap_rows_4567); -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) /* Move bitmap to a 64-bit scalar register. */ bitmap = vget_lane_u64(vreinterpret_u64_u8(bitmap_all), 0); /* Store signbits bitmap. */ @@ -595,7 +595,7 @@ int jsimd_encode_mcu_AC_refine_prepare_neon bitmap_rows_4567 = vpadd_u8(bitmap_rows_45, bitmap_rows_67); bitmap_all = vpadd_u8(bitmap_rows_0123, bitmap_rows_4567); -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) /* Move bitmap to a 64-bit scalar register. */ bitmap = vget_lane_u64(vreinterpret_u64_u8(bitmap_all), 0); diff --git a/3rdparty/libjpeg-turbo/simd/arm/jcsample-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jcsample-neon.c index fd8a93e520..ccba6f42e4 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jcsample-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jcsample-neon.c @@ -1,8 +1,8 @@ /* - * jcsample-neon.c - downsampling (Arm Neon) + * Downsampling (Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. - * Copyright (C) 2024, D. R. Commander. All Rights Reserved. + * Copyright (C) 2024-2025, D. R. Commander. All Rights Reserved. * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -107,7 +107,7 @@ void jsimd_h2v1_downsample_neon(JDIMENSION image_width, int max_v_samp_factor, /* Load pixels in last DCT block into a table. */ uint8x16_t pixels = vld1q_u8(inptr + (width_in_blocks - 1) * 2 * DCTSIZE); -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) /* Pad the empty elements with the value of the last pixel. */ pixels = vqtbl1q_u8(pixels, expand_mask); #else @@ -169,7 +169,7 @@ void jsimd_h2v2_downsample_neon(JDIMENSION image_width, int max_v_samp_factor, vld1q_u8(inptr0 + (width_in_blocks - 1) * 2 * DCTSIZE); uint8x16_t pixels_r1 = vld1q_u8(inptr1 + (width_in_blocks - 1) * 2 * DCTSIZE); -#if defined(__aarch64__) || defined(_M_ARM64) +#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) /* Pad the empty elements with the value of the last pixel. */ pixels_r0 = vqtbl1q_u8(pixels_r0, expand_mask); pixels_r1 = vqtbl1q_u8(pixels_r1, expand_mask); diff --git a/3rdparty/libjpeg-turbo/simd/arm/jdcolext-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jdcolext-neon.c index c3c07a1964..1a154a021c 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jdcolext-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jdcolext-neon.c @@ -1,5 +1,5 @@ /* - * jdcolext-neon.c - colorspace conversion (Arm Neon) + * Colorspace conversion (Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * Copyright (C) 2020, D. R. Commander. All Rights Reserved. diff --git a/3rdparty/libjpeg-turbo/simd/arm/jdcolor-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jdcolor-neon.c index 97bb02a1ed..fc8d2bef54 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jdcolor-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jdcolor-neon.c @@ -1,5 +1,5 @@ /* - * jdcolor-neon.c - colorspace conversion (Arm Neon) + * Colorspace conversion (Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * Copyright (C) 2024, D. R. Commander. All Rights Reserved. diff --git a/3rdparty/libjpeg-turbo/simd/arm/jdmerge-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jdmerge-neon.c index 95e6d32830..744dab5135 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jdmerge-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jdmerge-neon.c @@ -1,5 +1,5 @@ /* - * jdmerge-neon.c - merged upsampling/color conversion (Arm Neon) + * Merged upsampling/color conversion (Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * Copyright (C) 2024, D. R. Commander. All Rights Reserved. diff --git a/3rdparty/libjpeg-turbo/simd/arm/jdmrgext-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jdmrgext-neon.c index 5b89bdb339..1e29bc6267 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jdmrgext-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jdmrgext-neon.c @@ -1,5 +1,5 @@ /* - * jdmrgext-neon.c - merged upsampling/color conversion (Arm Neon) + * Merged upsampling/color conversion (Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * Copyright (C) 2020, D. R. Commander. All Rights Reserved. diff --git a/3rdparty/libjpeg-turbo/simd/arm/jdsample-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jdsample-neon.c index a130b1a958..0847b8d061 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jdsample-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jdsample-neon.c @@ -1,5 +1,5 @@ /* - * jdsample-neon.c - upsampling (Arm Neon) + * Upsampling (Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * Copyright (C) 2020, 2024, D. R. Commander. All Rights Reserved. diff --git a/3rdparty/libjpeg-turbo/simd/arm/jfdctfst-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jfdctfst-neon.c index d6109f11d3..f49a9a8314 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jfdctfst-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jfdctfst-neon.c @@ -1,5 +1,5 @@ /* - * jfdctfst-neon.c - fast integer FDCT (Arm Neon) + * Fast integer FDCT (Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * Copyright (C) 2024, D. R. Commander. All Rights Reserved. diff --git a/3rdparty/libjpeg-turbo/simd/arm/jfdctint-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jfdctint-neon.c index bb290ea45d..e770c706d0 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jfdctint-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jfdctint-neon.c @@ -1,5 +1,5 @@ /* - * jfdctint-neon.c - accurate integer FDCT (Arm Neon) + * Accurate integer FDCT (Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * Copyright (C) 2020, 2024, D. R. Commander. All Rights Reserved. diff --git a/3rdparty/libjpeg-turbo/simd/arm/jidctfst-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jidctfst-neon.c index e789125344..5da698d61b 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jidctfst-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jidctfst-neon.c @@ -1,5 +1,5 @@ /* - * jidctfst-neon.c - fast integer IDCT (Arm Neon) + * Fast integer IDCT (Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * Copyright (C) 2024, D. R. Commander. All Rights Reserved. diff --git a/3rdparty/libjpeg-turbo/simd/arm/jidctint-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jidctint-neon.c index 709e0eaf4e..0e351bebb9 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jidctint-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jidctint-neon.c @@ -1,5 +1,5 @@ /* - * jidctint-neon.c - accurate integer IDCT (Arm Neon) + * Accurate integer IDCT (Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * Copyright (C) 2020, 2024, D. R. Commander. All Rights Reserved. diff --git a/3rdparty/libjpeg-turbo/simd/arm/jidctred-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jidctred-neon.c index 25b1addc6a..f676e3a8c1 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jidctred-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jidctred-neon.c @@ -1,5 +1,5 @@ /* - * jidctred-neon.c - reduced-size IDCT (Arm Neon) + * Reduced-size IDCT (Arm Neon) * * Copyright (C) 2020, Arm Limited. All Rights Reserved. * Copyright (C) 2020, 2024, D. R. Commander. All Rights Reserved. diff --git a/3rdparty/libjpeg-turbo/simd/arm/jquanti-neon.c b/3rdparty/libjpeg-turbo/simd/arm/jquanti-neon.c index e44fb3d413..1e78dd8c89 100644 --- a/3rdparty/libjpeg-turbo/simd/arm/jquanti-neon.c +++ b/3rdparty/libjpeg-turbo/simd/arm/jquanti-neon.c @@ -1,8 +1,8 @@ /* - * jquanti-neon.c - sample data conversion and quantization (Arm Neon) + * Sample data conversion and quantization (Arm Neon) * * Copyright (C) 2020-2021, Arm Limited. All Rights Reserved. - * Copyright (C) 2024, D. R. Commander. All Rights Reserved. + * Copyright (C) 2024-2025, D. R. Commander. All Rights Reserved. * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -102,7 +102,8 @@ void jsimd_quantize_neon(JCOEFPTR coef_block, DCTELEM *divisors, DCTELEM *shift_ptr = divisors + 3 * DCTSIZE2; int i; -#if defined(__clang__) && (defined(__aarch64__) || defined(_M_ARM64)) +#if defined(__clang__) && (defined(__aarch64__) || defined(_M_ARM64) || \ + defined(_M_ARM64EC)) #pragma unroll #endif for (i = 0; i < DCTSIZE; i += DCTSIZE / 2) { diff --git a/3rdparty/libjpeg-turbo/simd/i386/jccolext-avx2.asm b/3rdparty/libjpeg-turbo/simd/i386/jccolext-avx2.asm index 28ac952807..0acfe3214c 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jccolext-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jccolext-avx2.asm @@ -1,5 +1,5 @@ ; -; jccolext.asm - colorspace conversion (AVX2) +; Colorspace conversion (AVX2) ; ; Copyright (C) 2015, Intel Corporation. ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jccolext-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jccolext-mmx.asm index 44b62512e9..cadd90bbfc 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jccolext-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jccolext-mmx.asm @@ -1,5 +1,5 @@ ; -; jccolext.asm - colorspace conversion (MMX) +; Colorspace conversion (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jccolext-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jccolext-sse2.asm index 1d8d5f5a20..b8f84343fd 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jccolext-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jccolext-sse2.asm @@ -1,5 +1,5 @@ ; -; jccolext.asm - colorspace conversion (SSE2) +; Colorspace conversion (SSE2) ; ; Copyright (C) 2016, 2024, D. R. Commander. ; diff --git a/3rdparty/libjpeg-turbo/simd/i386/jccolor-avx2.asm b/3rdparty/libjpeg-turbo/simd/i386/jccolor-avx2.asm index 9ad5ea95f8..e3eda9efb1 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jccolor-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jccolor-avx2.asm @@ -1,5 +1,5 @@ ; -; jccolor.asm - colorspace conversion (AVX2) +; Colorspace conversion (AVX2) ; ; Copyright (C) 2009, 2016, 2024, D. R. Commander. ; Copyright (C) 2015, Intel Corporation. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jccolor-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jccolor-mmx.asm index 0dbec54817..9232c4bd5f 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jccolor-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jccolor-mmx.asm @@ -1,5 +1,5 @@ ; -; jccolor.asm - colorspace conversion (MMX) +; Colorspace conversion (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jccolor-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jccolor-sse2.asm index 678306a10c..ed72f38d3a 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jccolor-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jccolor-sse2.asm @@ -1,5 +1,5 @@ ; -; jccolor.asm - colorspace conversion (SSE2) +; Colorspace conversion (SSE2) ; ; Copyright (C) 2009, 2016, 2024, D. R. Commander. ; diff --git a/3rdparty/libjpeg-turbo/simd/i386/jcgray-avx2.asm b/3rdparty/libjpeg-turbo/simd/i386/jcgray-avx2.asm index ded39567df..fae3c2121b 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jcgray-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jcgray-avx2.asm @@ -1,5 +1,5 @@ ; -; jcgray.asm - grayscale colorspace conversion (AVX2) +; Grayscale colorspace conversion (AVX2) ; ; Copyright (C) 2011, 2016, 2024, D. R. Commander. ; Copyright (C) 2015, Intel Corporation. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jcgray-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jcgray-mmx.asm index d6f031869a..47597c97ca 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jcgray-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jcgray-mmx.asm @@ -1,5 +1,5 @@ ; -; jcgray.asm - grayscale colorspace conversion (MMX) +; Grayscale colorspace conversion (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2011, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jcgray-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jcgray-sse2.asm index ecc7fa08ab..3027866148 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jcgray-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jcgray-sse2.asm @@ -1,5 +1,5 @@ ; -; jcgray.asm - grayscale colorspace conversion (SSE2) +; Grayscale colorspace conversion (SSE2) ; ; Copyright (C) 2011, 2016, 2024, D. R. Commander. ; diff --git a/3rdparty/libjpeg-turbo/simd/i386/jcgryext-avx2.asm b/3rdparty/libjpeg-turbo/simd/i386/jcgryext-avx2.asm index 70df8f80ba..847fa320fe 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jcgryext-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jcgryext-avx2.asm @@ -1,5 +1,5 @@ ; -; jcgryext.asm - grayscale colorspace conversion (AVX2) +; Grayscale colorspace conversion (AVX2) ; ; Copyright (C) 2011, 2016, 2024, D. R. Commander. ; Copyright (C) 2015, Intel Corporation. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jcgryext-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jcgryext-mmx.asm index dd90c3dfb0..c67aaec7c5 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jcgryext-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jcgryext-mmx.asm @@ -1,5 +1,5 @@ ; -; jcgryext.asm - grayscale colorspace conversion (MMX) +; Grayscale colorspace conversion (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2011, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jcgryext-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jcgryext-sse2.asm index 227295f307..2965202d2c 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jcgryext-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jcgryext-sse2.asm @@ -1,5 +1,5 @@ ; -; jcgryext.asm - grayscale colorspace conversion (SSE2) +; Grayscale colorspace conversion (SSE2) ; ; Copyright (C) 2011, 2016, 2024, D. R. Commander. ; diff --git a/3rdparty/libjpeg-turbo/simd/i386/jchuff-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jchuff-sse2.asm index ed194dd383..c5c1426df8 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jchuff-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jchuff-sse2.asm @@ -1,5 +1,5 @@ ; -; jchuff-sse2.asm - Huffman entropy encoding (SSE2) +; Huffman entropy encoding (SSE2) ; ; Copyright (C) 2009-2011, 2014-2017, 2019, 2024, D. R. Commander. ; Copyright (C) 2015, Matthieu Darbois. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jcphuff-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jcphuff-sse2.asm index 19a183fcd8..13d4838658 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jcphuff-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jcphuff-sse2.asm @@ -1,5 +1,5 @@ ; -; jcphuff-sse2.asm - prepare data for progressive Huffman encoding (SSE2) +; Prepare data for progressive Huffman encoding (SSE2) ; ; Copyright (C) 2016, 2018, Matthieu Darbois ; diff --git a/3rdparty/libjpeg-turbo/simd/i386/jcsample-avx2.asm b/3rdparty/libjpeg-turbo/simd/i386/jcsample-avx2.asm index 5019829c9a..0beeb4c709 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jcsample-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jcsample-avx2.asm @@ -1,5 +1,5 @@ ; -; jcsample.asm - downsampling (AVX2) +; Downsampling (AVX2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2015, Intel Corporation. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jcsample-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jcsample-mmx.asm index 94dd88870a..1bcd1eece4 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jcsample-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jcsample-mmx.asm @@ -1,5 +1,5 @@ ; -; jcsample.asm - downsampling (MMX) +; Downsampling (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jcsample-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jcsample-sse2.asm index eb8808bea8..70d02f4bca 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jcsample-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jcsample-sse2.asm @@ -1,5 +1,5 @@ ; -; jcsample.asm - downsampling (SSE2) +; Downsampling (SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdcolext-avx2.asm b/3rdparty/libjpeg-turbo/simd/i386/jdcolext-avx2.asm index fd79b79568..9f24958e3a 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdcolext-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdcolext-avx2.asm @@ -1,5 +1,5 @@ ; -; jdcolext.asm - colorspace conversion (AVX2) +; Colorspace conversion (AVX2) ; ; Copyright 2009, 2012 Pierre Ossman for Cendio AB ; Copyright (C) 2012, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdcolext-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jdcolext-mmx.asm index 636bd6d3fd..c7fe0c6d68 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdcolext-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdcolext-mmx.asm @@ -1,5 +1,5 @@ ; -; jdcolext.asm - colorspace conversion (MMX) +; Colorspace conversion (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdcolext-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jdcolext-sse2.asm index 0150f2cb69..a87a98f9cf 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdcolext-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdcolext-sse2.asm @@ -1,5 +1,5 @@ ; -; jdcolext.asm - colorspace conversion (SSE2) +; Colorspace conversion (SSE2) ; ; Copyright 2009, 2012 Pierre Ossman for Cendio AB ; Copyright (C) 2012, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdcolor-avx2.asm b/3rdparty/libjpeg-turbo/simd/i386/jdcolor-avx2.asm index d3a30d63a7..1071e048d1 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdcolor-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdcolor-avx2.asm @@ -1,5 +1,5 @@ ; -; jdcolor.asm - colorspace conversion (AVX2) +; Colorspace conversion (AVX2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2015, Intel Corporation. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdcolor-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jdcolor-mmx.asm index 6e67e4b72e..535d115a01 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdcolor-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdcolor-mmx.asm @@ -1,5 +1,5 @@ ; -; jdcolor.asm - colorspace conversion (MMX) +; Colorspace conversion (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdcolor-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jdcolor-sse2.asm index 79c9c6821a..c2a66bcce9 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdcolor-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdcolor-sse2.asm @@ -1,5 +1,5 @@ ; -; jdcolor.asm - colorspace conversion (SSE2) +; Colorspace conversion (SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdmerge-avx2.asm b/3rdparty/libjpeg-turbo/simd/i386/jdmerge-avx2.asm index 90493fd023..9080aafd2b 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdmerge-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdmerge-avx2.asm @@ -1,5 +1,5 @@ ; -; jdmerge.asm - merged upsampling/color conversion (AVX2) +; Merged upsampling/color conversion (AVX2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdmerge-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jdmerge-mmx.asm index 0dc204aa8b..9787546738 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdmerge-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdmerge-mmx.asm @@ -1,5 +1,5 @@ ; -; jdmerge.asm - merged upsampling/color conversion (MMX) +; Merged upsampling/color conversion (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdmerge-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jdmerge-sse2.asm index 06f0762742..03fc475147 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdmerge-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdmerge-sse2.asm @@ -1,5 +1,5 @@ ; -; jdmerge.asm - merged upsampling/color conversion (SSE2) +; Merged upsampling/color conversion (SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdmrgext-avx2.asm b/3rdparty/libjpeg-turbo/simd/i386/jdmrgext-avx2.asm index a7aa930e34..3bb932fa24 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdmrgext-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdmrgext-avx2.asm @@ -1,5 +1,5 @@ ; -; jdmrgext.asm - merged upsampling/color conversion (AVX2) +; Merged upsampling/color conversion (AVX2) ; ; Copyright 2009, 2012 Pierre Ossman for Cendio AB ; Copyright (C) 2012, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdmrgext-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jdmrgext-mmx.asm index 562758146c..eb8a82a87e 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdmrgext-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdmrgext-mmx.asm @@ -1,5 +1,5 @@ ; -; jdmrgext.asm - merged upsampling/color conversion (MMX) +; Merged upsampling/color conversion (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdmrgext-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jdmrgext-sse2.asm index 13e7d980fa..ad24e10bbb 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdmrgext-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdmrgext-sse2.asm @@ -1,5 +1,5 @@ ; -; jdmrgext.asm - merged upsampling/color conversion (SSE2) +; Merged upsampling/color conversion (SSE2) ; ; Copyright 2009, 2012 Pierre Ossman for Cendio AB ; Copyright (C) 2012, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdsample-avx2.asm b/3rdparty/libjpeg-turbo/simd/i386/jdsample-avx2.asm index eba53ef757..158aa99c17 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdsample-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdsample-avx2.asm @@ -1,5 +1,5 @@ ; -; jdsample.asm - upsampling (AVX2) +; Upsampling (AVX2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2015, Intel Corporation. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdsample-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jdsample-mmx.asm index 01d09e62d1..69afe63263 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdsample-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdsample-mmx.asm @@ -1,5 +1,5 @@ ; -; jdsample.asm - upsampling (MMX) +; Upsampling (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jdsample-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jdsample-sse2.asm index b10d922798..fcad5c15f2 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jdsample-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jdsample-sse2.asm @@ -1,5 +1,5 @@ ; -; jdsample.asm - upsampling (SSE2) +; Upsampling (SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jfdctflt-3dn.asm b/3rdparty/libjpeg-turbo/simd/i386/jfdctflt-3dn.asm index 0cedc6caf4..cd29093a68 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jfdctflt-3dn.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jfdctflt-3dn.asm @@ -1,5 +1,5 @@ ; -; jfdctflt.asm - floating-point FDCT (3DNow!) +; Floating-point FDCT (3DNow!) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jfdctflt-sse.asm b/3rdparty/libjpeg-turbo/simd/i386/jfdctflt-sse.asm index 2cb9533586..4a10e489d9 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jfdctflt-sse.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jfdctflt-sse.asm @@ -1,5 +1,5 @@ ; -; jfdctflt.asm - floating-point FDCT (SSE) +; Floating-point FDCT (SSE) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jfdctfst-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jfdctfst-mmx.asm index fe16e83ee2..900fba53f2 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jfdctfst-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jfdctfst-mmx.asm @@ -1,5 +1,5 @@ ; -; jfdctfst.asm - fast integer FDCT (MMX) +; Fast integer FDCT (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jfdctfst-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jfdctfst-sse2.asm index 890482e006..dca57c77be 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jfdctfst-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jfdctfst-sse2.asm @@ -1,5 +1,5 @@ ; -; jfdctfst.asm - fast integer FDCT (SSE2) +; Fast integer FDCT (SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jfdctint-avx2.asm b/3rdparty/libjpeg-turbo/simd/i386/jfdctint-avx2.asm index 05ea865485..69b59773a1 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jfdctint-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jfdctint-avx2.asm @@ -1,5 +1,5 @@ ; -; jfdctint.asm - accurate integer FDCT (AVX2) +; Accurate integer FDCT (AVX2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2018, 2020, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jfdctint-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jfdctint-mmx.asm index 7d4c61cd7d..d9c47ac663 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jfdctint-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jfdctint-mmx.asm @@ -1,5 +1,5 @@ ; -; jfdctint.asm - accurate integer FDCT (MMX) +; Accurate integer FDCT (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2020, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jfdctint-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jfdctint-sse2.asm index 7ed5c9501a..c98b8337ca 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jfdctint-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jfdctint-sse2.asm @@ -1,5 +1,5 @@ ; -; jfdctint.asm - accurate integer FDCT (SSE2) +; Accurate integer FDCT (SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2020, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jidctflt-3dn.asm b/3rdparty/libjpeg-turbo/simd/i386/jidctflt-3dn.asm index 8612eee3a5..cc66b85a26 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jidctflt-3dn.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jidctflt-3dn.asm @@ -1,5 +1,5 @@ ; -; jidctflt.asm - floating-point IDCT (3DNow! & MMX) +; Floating-point IDCT (3DNow! & MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jidctflt-sse.asm b/3rdparty/libjpeg-turbo/simd/i386/jidctflt-sse.asm index caf636b510..d318267221 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jidctflt-sse.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jidctflt-sse.asm @@ -1,5 +1,5 @@ ; -; jidctflt.asm - floating-point IDCT (SSE & MMX) +; Floating-point IDCT (SSE & MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jidctflt-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jidctflt-sse2.asm index 42703a8efd..3ee4163e51 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jidctflt-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jidctflt-sse2.asm @@ -1,5 +1,5 @@ ; -; jidctflt.asm - floating-point IDCT (SSE & SSE2) +; Floating-point IDCT (SSE & SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jidctfst-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jidctfst-mmx.asm index 77d4613d23..9668bbdecf 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jidctfst-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jidctfst-mmx.asm @@ -1,5 +1,5 @@ ; -; jidctfst.asm - fast integer IDCT (MMX) +; Fast integer IDCT (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jidctfst-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jidctfst-sse2.asm index c2fe34ba8c..b40ac4ebb2 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jidctfst-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jidctfst-sse2.asm @@ -1,5 +1,5 @@ ; -; jidctfst.asm - fast integer IDCT (SSE2) +; Fast integer IDCT (SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jidctint-avx2.asm b/3rdparty/libjpeg-turbo/simd/i386/jidctint-avx2.asm index cb119d3f06..8f67d2bdb5 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jidctint-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jidctint-avx2.asm @@ -1,5 +1,5 @@ ; -; jidctint.asm - accurate integer IDCT (AVX2) +; Accurate integer IDCT (AVX2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2018, 2020, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jidctint-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jidctint-mmx.asm index c2c17f441b..05766fb02b 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jidctint-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jidctint-mmx.asm @@ -1,5 +1,5 @@ ; -; jidctint.asm - accurate integer IDCT (MMX) +; Accurate integer IDCT (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2020, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jidctint-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jidctint-sse2.asm index 70516cadce..199311b632 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jidctint-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jidctint-sse2.asm @@ -1,5 +1,5 @@ ; -; jidctint.asm - accurate integer IDCT (SSE2) +; Accurate integer IDCT (SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2020, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jidctred-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jidctred-mmx.asm index 96cda65713..1d4ab9d1d5 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jidctred-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jidctred-mmx.asm @@ -1,5 +1,5 @@ ; -; jidctred.asm - reduced-size IDCT (MMX) +; Reduced-size IDCT (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jidctred-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jidctred-sse2.asm index 1fe967db19..e1f759abae 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jidctred-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jidctred-sse2.asm @@ -1,5 +1,5 @@ ; -; jidctred.asm - reduced-size IDCT (SSE2) +; Reduced-size IDCT (SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jquant-3dn.asm b/3rdparty/libjpeg-turbo/simd/i386/jquant-3dn.asm index 58e0011f70..6c5e2b9836 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jquant-3dn.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jquant-3dn.asm @@ -1,5 +1,5 @@ ; -; jquant.asm - sample data conversion and quantization (3DNow! & MMX) +; Sample data conversion and quantization (3DNow! & MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jquant-mmx.asm b/3rdparty/libjpeg-turbo/simd/i386/jquant-mmx.asm index 4eda95ce12..81f898cfbf 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jquant-mmx.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jquant-mmx.asm @@ -1,5 +1,5 @@ ; -; jquant.asm - sample data conversion and quantization (MMX) +; Sample data conversion and quantization (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jquant-sse.asm b/3rdparty/libjpeg-turbo/simd/i386/jquant-sse.asm index 6cb5f79c21..ecba4db536 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jquant-sse.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jquant-sse.asm @@ -1,5 +1,5 @@ ; -; jquant.asm - sample data conversion and quantization (SSE & MMX) +; Sample data conversion and quantization (SSE & MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jquantf-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jquantf-sse2.asm index 5668f8cb39..6782eea61f 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jquantf-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jquantf-sse2.asm @@ -1,5 +1,5 @@ ; -; jquantf.asm - sample data conversion and quantization (SSE & SSE2) +; Sample data conversion and quantization (SSE & SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jquanti-avx2.asm b/3rdparty/libjpeg-turbo/simd/i386/jquanti-avx2.asm index 60ae098e9c..1ad0f50af4 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jquanti-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jquanti-avx2.asm @@ -1,5 +1,5 @@ ; -; jquanti.asm - sample data conversion and quantization (AVX2) +; Sample data conversion and quantization (AVX2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2018, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jquanti-sse2.asm b/3rdparty/libjpeg-turbo/simd/i386/jquanti-sse2.asm index c1edde996e..b3ac67a6cc 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jquanti-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jquanti-sse2.asm @@ -1,5 +1,5 @@ ; -; jquanti.asm - sample data conversion and quantization (SSE2) +; Sample data conversion and quantization (SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jsimd.c b/3rdparty/libjpeg-turbo/simd/i386/jsimd.c index d4786b155b..5df7b8c931 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jsimd.c +++ b/3rdparty/libjpeg-turbo/simd/i386/jsimd.c @@ -1,6 +1,4 @@ /* - * jsimd_i386.c - * * Copyright 2009 Pierre Ossman for Cendio AB * Copyright (C) 2009-2011, 2013-2014, 2016, 2018, 2022-2024, D. R. Commander. * Copyright (C) 2015-2016, 2018, 2022, Matthieu Darbois. diff --git a/3rdparty/libjpeg-turbo/simd/i386/jsimdcpu.asm b/3rdparty/libjpeg-turbo/simd/i386/jsimdcpu.asm index df80f17f5f..4f23ea45e7 100644 --- a/3rdparty/libjpeg-turbo/simd/i386/jsimdcpu.asm +++ b/3rdparty/libjpeg-turbo/simd/i386/jsimdcpu.asm @@ -1,5 +1,5 @@ ; -; jsimdcpu.asm - SIMD instruction support check +; SIMD instruction support check ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/jsimd.h b/3rdparty/libjpeg-turbo/simd/jsimd.h index a28754adb9..0fd6b81b34 100644 --- a/3rdparty/libjpeg-turbo/simd/jsimd.h +++ b/3rdparty/libjpeg-turbo/simd/jsimd.h @@ -1,6 +1,4 @@ /* - * simd/jsimd.h - * * Copyright 2009 Pierre Ossman for Cendio AB * Copyright (C) 2011, 2014-2016, 2018, 2020, 2022, D. R. Commander. * Copyright (C) 2013-2014, MIPS Technologies, Inc., California. diff --git a/3rdparty/libjpeg-turbo/simd/mips/jsimd.c b/3rdparty/libjpeg-turbo/simd/mips/jsimd.c index 6a1f1e0bcf..5841e9366d 100644 --- a/3rdparty/libjpeg-turbo/simd/mips/jsimd.c +++ b/3rdparty/libjpeg-turbo/simd/mips/jsimd.c @@ -1,6 +1,4 @@ /* - * jsimd_mips.c - * * Copyright 2009 Pierre Ossman for Cendio AB * Copyright (C) 2009-2011, 2014, 2016, 2018, 2020, 2022, 2024, * D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/mips64/jsimd.c b/3rdparty/libjpeg-turbo/simd/mips64/jsimd.c index a2046d4620..3046e72726 100644 --- a/3rdparty/libjpeg-turbo/simd/mips64/jsimd.c +++ b/3rdparty/libjpeg-turbo/simd/mips64/jsimd.c @@ -1,6 +1,4 @@ /* - * jsimd_mips64.c - * * Copyright 2009 Pierre Ossman for Cendio AB * Copyright (C) 2009-2011, 2014, 2016, 2018, 2022, 2024, D. R. Commander. * Copyright (C) 2013-2014, MIPS Technologies, Inc., California. diff --git a/3rdparty/libjpeg-turbo/simd/powerpc/jsimd.c b/3rdparty/libjpeg-turbo/simd/powerpc/jsimd.c index e8c6c51d94..85252873f5 100644 --- a/3rdparty/libjpeg-turbo/simd/powerpc/jsimd.c +++ b/3rdparty/libjpeg-turbo/simd/powerpc/jsimd.c @@ -1,6 +1,4 @@ /* - * jsimd_powerpc.c - * * Copyright 2009 Pierre Ossman for Cendio AB * Copyright (C) 2009-2011, 2014-2016, 2018, 2022, 2024, D. R. Commander. * Copyright (C) 2015-2016, 2018, 2022, Matthieu Darbois. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jccolext-avx2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jccolext-avx2.asm index aeeda0a682..eecd76f231 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jccolext-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jccolext-avx2.asm @@ -1,5 +1,5 @@ ; -; jccolext.asm - colorspace conversion (64-bit AVX2) +; Colorspace conversion (64-bit AVX2) ; ; Copyright (C) 2009, 2016, 2024, D. R. Commander. ; Copyright (C) 2015, Intel Corporation. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jccolext-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jccolext-sse2.asm index f3a1244903..c3a4052fa4 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jccolext-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jccolext-sse2.asm @@ -1,5 +1,5 @@ ; -; jccolext.asm - colorspace conversion (64-bit SSE2) +; Colorspace conversion (64-bit SSE2) ; ; Copyright (C) 2009, 2016, 2024, D. R. Commander. ; Copyright (C) 2018, Matthias Räncker. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jccolor-avx2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jccolor-avx2.asm index e262891733..003a4df1b5 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jccolor-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jccolor-avx2.asm @@ -1,5 +1,5 @@ ; -; jccolor.asm - colorspace conversion (64-bit AVX2) +; Colorspace conversion (64-bit AVX2) ; ; Copyright (C) 2009, 2016, 2024, D. R. Commander. ; Copyright (C) 2015, Intel Corporation. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jccolor-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jccolor-sse2.asm index cc9edb4ceb..ced172ff4a 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jccolor-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jccolor-sse2.asm @@ -1,5 +1,5 @@ ; -; jccolor.asm - colorspace conversion (64-bit SSE2) +; Colorspace conversion (64-bit SSE2) ; ; Copyright (C) 2009, 2016, 2024, D. R. Commander. ; diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jcgray-avx2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jcgray-avx2.asm index 267ec5142a..2e45b64e9e 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jcgray-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jcgray-avx2.asm @@ -1,5 +1,5 @@ ; -; jcgray.asm - grayscale colorspace conversion (64-bit AVX2) +; Grayscale colorspace conversion (64-bit AVX2) ; ; Copyright (C) 2011, 2016, 2024, D. R. Commander. ; Copyright (C) 2015, Intel Corporation. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jcgray-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jcgray-sse2.asm index 4b94d7b8a2..c9bcf91348 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jcgray-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jcgray-sse2.asm @@ -1,5 +1,5 @@ ; -; jcgray.asm - grayscale colorspace conversion (64-bit SSE2) +; Grayscale colorspace conversion (64-bit SSE2) ; ; Copyright (C) 2011, 2016, 2024, D. R. Commander. ; diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jcgryext-avx2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jcgryext-avx2.asm index 77e85f768f..83fcd1bd63 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jcgryext-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jcgryext-avx2.asm @@ -1,5 +1,5 @@ ; -; jcgryext.asm - grayscale colorspace conversion (64-bit AVX2) +; Grayscale colorspace conversion (64-bit AVX2) ; ; Copyright (C) 2011, 2016, 2024, D. R. Commander. ; Copyright (C) 2015, Intel Corporation. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jcgryext-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jcgryext-sse2.asm index 3e8087c39b..407b5084ab 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jcgryext-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jcgryext-sse2.asm @@ -1,5 +1,5 @@ ; -; jcgryext.asm - grayscale colorspace conversion (64-bit SSE2) +; Grayscale colorspace conversion (64-bit SSE2) ; ; Copyright (C) 2011, 2016, 2024, D. R. Commander. ; Copyright (C) 2018, Matthias Räncker. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jchuff-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jchuff-sse2.asm index b18b7f5d65..7e32ea3fb4 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jchuff-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jchuff-sse2.asm @@ -1,5 +1,5 @@ ; -; jchuff-sse2.asm - Huffman entropy encoding (64-bit SSE2) +; Huffman entropy encoding (64-bit SSE2) ; ; Copyright (C) 2009-2011, 2014-2016, 2019, 2021, 2023-2024, D. R. Commander. ; Copyright (C) 2015, Matthieu Darbois. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jcphuff-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jcphuff-sse2.asm index c9ac59f2f1..49d5414e2e 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jcphuff-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jcphuff-sse2.asm @@ -1,6 +1,5 @@ ; -; jcphuff-sse2.asm - prepare data for progressive Huffman encoding -; (64-bit SSE2) +; Prepare data for progressive Huffman encoding (64-bit SSE2) ; ; Copyright (C) 2016, 2018, Matthieu Darbois ; Copyright (C) 2023, Aliaksiej Kandracienka. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jcsample-avx2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jcsample-avx2.asm index 53afc7d77f..38c662f920 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jcsample-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jcsample-avx2.asm @@ -1,5 +1,5 @@ ; -; jcsample.asm - downsampling (64-bit AVX2) +; Downsampling (64-bit AVX2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jcsample-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jcsample-sse2.asm index d7ffa930e8..739f0c3675 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jcsample-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jcsample-sse2.asm @@ -1,5 +1,5 @@ ; -; jcsample.asm - downsampling (64-bit SSE2) +; Downsampling (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jdcolext-avx2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jdcolext-avx2.asm index 7b8a084398..50990f5f99 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jdcolext-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jdcolext-avx2.asm @@ -1,5 +1,5 @@ ; -; jdcolext.asm - colorspace conversion (64-bit AVX2) +; Colorspace conversion (64-bit AVX2) ; ; Copyright 2009, 2012 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2012, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jdcolext-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jdcolext-sse2.asm index 261f74da5d..9ab3652cb0 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jdcolext-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jdcolext-sse2.asm @@ -1,5 +1,5 @@ ; -; jdcolext.asm - colorspace conversion (64-bit SSE2) +; Colorspace conversion (64-bit SSE2) ; ; Copyright 2009, 2012 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2012, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jdcolor-avx2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jdcolor-avx2.asm index bd5aa00b95..5e7ba872c8 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jdcolor-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jdcolor-avx2.asm @@ -1,5 +1,5 @@ ; -; jdcolor.asm - colorspace conversion (64-bit AVX2) +; Colorspace conversion (64-bit AVX2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jdcolor-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jdcolor-sse2.asm index 40343fe789..858cf346b1 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jdcolor-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jdcolor-sse2.asm @@ -1,5 +1,5 @@ ; -; jdcolor.asm - colorspace conversion (64-bit SSE2) +; Colorspace conversion (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jdmerge-avx2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jdmerge-avx2.asm index 6a5f1daba5..e7550a75d1 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jdmerge-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jdmerge-avx2.asm @@ -1,5 +1,5 @@ ; -; jdmerge.asm - merged upsampling/color conversion (64-bit AVX2) +; Merged upsampling/color conversion (64-bit AVX2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jdmerge-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jdmerge-sse2.asm index 8c269b83d8..42d1f6c775 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jdmerge-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jdmerge-sse2.asm @@ -1,5 +1,5 @@ ; -; jdmerge.asm - merged upsampling/color conversion (64-bit SSE2) +; Merged upsampling/color conversion (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jdmrgext-avx2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jdmrgext-avx2.asm index 01826fb6ab..00fc1226de 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jdmrgext-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jdmrgext-avx2.asm @@ -1,5 +1,5 @@ ; -; jdmrgext.asm - merged upsampling/color conversion (64-bit AVX2) +; Merged upsampling/color conversion (64-bit AVX2) ; ; Copyright 2009, 2012 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2012, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jdmrgext-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jdmrgext-sse2.asm index abd22e21a7..59c9100ae0 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jdmrgext-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jdmrgext-sse2.asm @@ -1,5 +1,5 @@ ; -; jdmrgext.asm - merged upsampling/color conversion (64-bit SSE2) +; Merged upsampling/color conversion (64-bit SSE2) ; ; Copyright 2009, 2012 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2012, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jdsample-avx2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jdsample-avx2.asm index 6ae4cf812a..b0179a372b 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jdsample-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jdsample-avx2.asm @@ -1,5 +1,5 @@ ; -; jdsample.asm - upsampling (64-bit AVX2) +; Upsampling (64-bit AVX2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jdsample-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jdsample-sse2.asm index 54c560fc28..224b1d5565 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jdsample-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jdsample-sse2.asm @@ -1,5 +1,5 @@ ; -; jdsample.asm - upsampling (64-bit SSE2) +; Upsampling (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jfdctflt-sse.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jfdctflt-sse.asm index 58a1f5570d..4954c8ae8e 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jfdctflt-sse.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jfdctflt-sse.asm @@ -1,5 +1,5 @@ ; -; jfdctflt.asm - floating-point FDCT (64-bit SSE) +; Floating-point FDCT (64-bit SSE) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jfdctfst-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jfdctfst-sse2.asm index 3b92d4edaa..60f972858f 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jfdctfst-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jfdctfst-sse2.asm @@ -1,5 +1,5 @@ ; -; jfdctfst.asm - fast integer FDCT (64-bit SSE2) +; Fast integer FDCT (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jfdctint-avx2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jfdctint-avx2.asm index 0c4528612c..22611fc0b5 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jfdctint-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jfdctint-avx2.asm @@ -1,5 +1,5 @@ ; -; jfdctint.asm - accurate integer FDCT (64-bit AVX2) +; Accurate integer FDCT (64-bit AVX2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2018, 2020, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jfdctint-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jfdctint-sse2.asm index 3a6be020cd..adc6b40a68 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jfdctint-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jfdctint-sse2.asm @@ -1,5 +1,5 @@ ; -; jfdctint.asm - accurate integer FDCT (64-bit SSE2) +; Accurate integer FDCT (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2020, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jidctflt-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jidctflt-sse2.asm index 1443734022..54aaf1162b 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jidctflt-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jidctflt-sse2.asm @@ -1,5 +1,5 @@ ; -; jidctflt.asm - floating-point IDCT (64-bit SSE & SSE2) +; Floating-point IDCT (64-bit SSE & SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jidctfst-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jidctfst-sse2.asm index cffabb8378..c4e8005457 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jidctfst-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jidctfst-sse2.asm @@ -1,5 +1,5 @@ ; -; jidctfst.asm - fast integer IDCT (64-bit SSE2) +; Fast integer IDCT (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jidctint-avx2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jidctint-avx2.asm index be3b46888e..24b5958445 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jidctint-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jidctint-avx2.asm @@ -1,5 +1,5 @@ ; -; jidctint.asm - accurate integer IDCT (64-bit AVX2) +; Accurate integer IDCT (64-bit AVX2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2018, 2020, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jidctint-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jidctint-sse2.asm index b186871ff2..5e1a5ac3b4 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jidctint-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jidctint-sse2.asm @@ -1,5 +1,5 @@ ; -; jidctint.asm - accurate integer IDCT (64-bit SSE2) +; Accurate integer IDCT (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2020, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jidctred-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jidctred-sse2.asm index 6fb7095612..9560e33e25 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jidctred-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jidctred-sse2.asm @@ -1,5 +1,5 @@ ; -; jidctred.asm - reduced-size IDCT (64-bit SSE2) +; Reduced-size IDCT (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jquantf-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jquantf-sse2.asm index 64763338f2..9a12419e75 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jquantf-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jquantf-sse2.asm @@ -1,5 +1,5 @@ ; -; jquantf.asm - sample data conversion and quantization (64-bit SSE & SSE2) +; Sample data conversion and quantization (64-bit SSE & SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jquanti-avx2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jquanti-avx2.asm index 7e126e88a8..46bdb83f48 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jquanti-avx2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jquanti-avx2.asm @@ -1,5 +1,5 @@ ; -; jquanti.asm - sample data conversion and quantization (64-bit AVX2) +; Sample data conversion and quantization (64-bit AVX2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2018, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jquanti-sse2.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jquanti-sse2.asm index 284b9fea71..797fb878bd 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jquanti-sse2.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jquanti-sse2.asm @@ -1,5 +1,5 @@ ; -; jquanti.asm - sample data conversion and quantization (64-bit SSE2) +; Sample data conversion and quantization (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2009, 2016, 2024, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jsimd.c b/3rdparty/libjpeg-turbo/simd/x86_64/jsimd.c index 038cf0f8a3..f783e6dccc 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jsimd.c +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jsimd.c @@ -1,6 +1,4 @@ /* - * jsimd_x86_64.c - * * Copyright 2009 Pierre Ossman for Cendio AB * Copyright (C) 2009-2011, 2014, 2016, 2018, 2022-2024, D. R. Commander. * Copyright (C) 2015-2016, 2018, 2022, Matthieu Darbois. diff --git a/3rdparty/libjpeg-turbo/simd/x86_64/jsimdcpu.asm b/3rdparty/libjpeg-turbo/simd/x86_64/jsimdcpu.asm index b72f3b0b39..187498d543 100644 --- a/3rdparty/libjpeg-turbo/simd/x86_64/jsimdcpu.asm +++ b/3rdparty/libjpeg-turbo/simd/x86_64/jsimdcpu.asm @@ -1,5 +1,5 @@ ; -; jsimdcpu.asm - SIMD instruction support check +; SIMD instruction support check ; ; Copyright 2009 Pierre Ossman for Cendio AB ; Copyright (C) 2016, D. R. Commander. diff --git a/3rdparty/libjpeg-turbo/src/jcapimin.c b/3rdparty/libjpeg-turbo/src/jcapimin.c index eb4599fbfa..e99569035b 100644 --- a/3rdparty/libjpeg-turbo/src/jcapimin.c +++ b/3rdparty/libjpeg-turbo/src/jcapimin.c @@ -195,13 +195,19 @@ jpeg_finish_compress(j_compress_ptr cinfo) * all work is being done from the coefficient buffer. */ if (cinfo->data_precision <= 8) { + if (cinfo->coef->compress_data == NULL) + ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision); if (!(*cinfo->coef->compress_data) (cinfo, (JSAMPIMAGE)NULL)) ERREXIT(cinfo, JERR_CANT_SUSPEND); } else if (cinfo->data_precision <= 12) { + if (cinfo->coef->compress_data_12 == NULL) + ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision); if (!(*cinfo->coef->compress_data_12) (cinfo, (J12SAMPIMAGE)NULL)) ERREXIT(cinfo, JERR_CANT_SUSPEND); } else { #ifdef C_LOSSLESS_SUPPORTED + if (cinfo->coef->compress_data_16 == NULL) + ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision); if (!(*cinfo->coef->compress_data_16) (cinfo, (J16SAMPIMAGE)NULL)) ERREXIT(cinfo, JERR_CANT_SUSPEND); #else diff --git a/3rdparty/libjpeg-turbo/src/jcapistd.c b/3rdparty/libjpeg-turbo/src/jcapistd.c index 2226094ba6..b61590df9d 100644 --- a/3rdparty/libjpeg-turbo/src/jcapistd.c +++ b/3rdparty/libjpeg-turbo/src/jcapistd.c @@ -130,6 +130,8 @@ _jpeg_write_scanlines(j_compress_ptr cinfo, _JSAMPARRAY scanlines, num_lines = rows_left; row_ctr = 0; + if (cinfo->main->_process_data == NULL) + ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision); (*cinfo->main->_process_data) (cinfo, scanlines, &row_ctr, num_lines); cinfo->next_scanline += row_ctr; return row_ctr; @@ -187,6 +189,8 @@ _jpeg_write_raw_data(j_compress_ptr cinfo, _JSAMPIMAGE data, ERREXIT(cinfo, JERR_BUFFER_SIZE); /* Directly compress the row. */ + if (cinfo->coef->_compress_data == NULL) + ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision); if (!(*cinfo->coef->_compress_data) (cinfo, data)) { /* If compressor did not consume the whole row, suspend processing. */ return 0; diff --git a/3rdparty/libjpeg-turbo/src/jccoefct.c b/3rdparty/libjpeg-turbo/src/jccoefct.c index 2a5dde2d07..4a47b3cbe5 100644 --- a/3rdparty/libjpeg-turbo/src/jccoefct.c +++ b/3rdparty/libjpeg-turbo/src/jccoefct.c @@ -4,7 +4,7 @@ * This file was part of the Independent JPEG Group's software: * Copyright (C) 1994-1997, Thomas G. Lane. * libjpeg-turbo Modifications: - * Copyright (C) 2022, D. R. Commander. + * Copyright (C) 2022, 2024, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * @@ -414,6 +414,7 @@ _jinit_c_coef_controller(j_compress_ptr cinfo, boolean need_full_buffer) coef = (my_coef_ptr) (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, sizeof(my_coef_controller)); + memset(coef, 0, sizeof(my_coef_controller)); cinfo->coef = (struct jpeg_c_coef_controller *)coef; coef->pub.start_pass = start_pass_coef; diff --git a/3rdparty/libjpeg-turbo/src/jchuff.c b/3rdparty/libjpeg-turbo/src/jchuff.c index 8cdd5bd35d..781e1ca704 100644 --- a/3rdparty/libjpeg-turbo/src/jchuff.c +++ b/3rdparty/libjpeg-turbo/src/jchuff.c @@ -6,7 +6,7 @@ * Lossless JPEG Modifications: * Copyright (C) 1999, Ken Murchison. * libjpeg-turbo Modifications: - * Copyright (C) 2009-2011, 2014-2016, 2018-2024, D. R. Commander. + * Copyright (C) 2009-2011, 2014-2016, 2018-2025, D. R. Commander. * Copyright (C) 2015, Matthieu Darbois. * Copyright (C) 2018, Matthias Räncker. * Copyright (C) 2020, Arm Limited. @@ -55,7 +55,8 @@ typedef size_t bit_buf_type; * retain the old Huffman encoder behavior when using the GAS implementation. */ #if defined(WITH_SIMD) && !(defined(__arm__) || defined(__aarch64__) || \ - defined(_M_ARM) || defined(_M_ARM64)) + defined(_M_ARM) || defined(_M_ARM64) || \ + defined(_M_ARM64EC)) typedef unsigned long long simd_bit_buf_type; #else typedef bit_buf_type simd_bit_buf_type; diff --git a/3rdparty/libjpeg-turbo/src/jcmainct.c b/3rdparty/libjpeg-turbo/src/jcmainct.c index 954e94017c..b72f8deb6c 100644 --- a/3rdparty/libjpeg-turbo/src/jcmainct.c +++ b/3rdparty/libjpeg-turbo/src/jcmainct.c @@ -159,6 +159,7 @@ _jinit_c_main_controller(j_compress_ptr cinfo, boolean need_full_buffer) main_ptr = (my_main_ptr) (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, sizeof(my_main_controller)); + memset(main_ptr, 0, sizeof(my_main_controller)); cinfo->main = (struct jpeg_c_main_controller *)main_ptr; main_ptr->pub.start_pass = start_pass_main; diff --git a/3rdparty/libjpeg-turbo/src/jdapistd.c b/3rdparty/libjpeg-turbo/src/jdapistd.c index d0e5c0e5b9..813e21268e 100644 --- a/3rdparty/libjpeg-turbo/src/jdapistd.c +++ b/3rdparty/libjpeg-turbo/src/jdapistd.c @@ -4,7 +4,7 @@ * This file was part of the Independent JPEG Group's software: * Copyright (C) 1994-1996, Thomas G. Lane. * libjpeg-turbo Modifications: - * Copyright (C) 2010, 2015-2020, 2022-2024, D. R. Commander. + * Copyright (C) 2010, 2015-2020, 2022-2025, D. R. Commander. * Copyright (C) 2015, Google, Inc. * For conditions of distribution and use, see the accompanying README.ijg * file. @@ -128,19 +128,28 @@ output_pass_setup(j_decompress_ptr cinfo) } /* Process some data */ last_scanline = cinfo->output_scanline; - if (cinfo->data_precision <= 8) + if (cinfo->data_precision <= 8) { + if (cinfo->main->process_data == NULL) + ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision); (*cinfo->main->process_data) (cinfo, (JSAMPARRAY)NULL, &cinfo->output_scanline, (JDIMENSION)0); - else if (cinfo->data_precision <= 12) + } else if (cinfo->data_precision <= 12) { + if (cinfo->main->process_data_12 == NULL) + ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision); (*cinfo->main->process_data_12) (cinfo, (J12SAMPARRAY)NULL, &cinfo->output_scanline, (JDIMENSION)0); + } else { #ifdef D_LOSSLESS_SUPPORTED - else + if (cinfo->main->process_data_16 == NULL) + ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision); (*cinfo->main->process_data_16) (cinfo, (J16SAMPARRAY)NULL, &cinfo->output_scanline, (JDIMENSION)0); +#else + ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision); #endif + } if (cinfo->output_scanline == last_scanline) return FALSE; /* No progress made, must suspend */ } @@ -345,6 +354,8 @@ _jpeg_read_scanlines(j_decompress_ptr cinfo, _JSAMPARRAY scanlines, /* Process some data */ row_ctr = 0; + if (cinfo->main->_process_data == NULL) + ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision); (*cinfo->main->_process_data) (cinfo, scanlines, &row_ctr, max_lines); cinfo->output_scanline += row_ctr; return row_ctr; @@ -397,7 +408,8 @@ read_and_discard_scanlines(j_decompress_ptr cinfo, JDIMENSION num_lines) void (*color_quantize) (j_decompress_ptr cinfo, _JSAMPARRAY input_buf, _JSAMPARRAY output_buf, int num_rows) = NULL; - if (cinfo->cconvert && cinfo->cconvert->_color_convert) { + if (!master->using_merged_upsample && cinfo->cconvert && + cinfo->cconvert->_color_convert) { color_convert = cinfo->cconvert->_color_convert; cinfo->cconvert->_color_convert = noop_convert; /* This just prevents UBSan from complaining about adding 0 to a NULL @@ -406,7 +418,8 @@ read_and_discard_scanlines(j_decompress_ptr cinfo, JDIMENSION num_lines) scanlines = &dummy_row; } - if (cinfo->cquantize && cinfo->cquantize->_color_quantize) { + if (cinfo->quantize_colors && cinfo->cquantize && + cinfo->cquantize->_color_quantize) { color_quantize = cinfo->cquantize->_color_quantize; cinfo->cquantize->_color_quantize = noop_quantize; } @@ -691,6 +704,8 @@ _jpeg_read_raw_data(j_decompress_ptr cinfo, _JSAMPIMAGE data, ERREXIT(cinfo, JERR_BUFFER_SIZE); /* Decompress directly into user's buffer. */ + if (cinfo->coef->_decompress_data == NULL) + ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision); if (!(*cinfo->coef->_decompress_data) (cinfo, data)) return 0; /* suspension forced, can do nothing more */ diff --git a/3rdparty/libjpeg-turbo/src/jdcoefct.c b/3rdparty/libjpeg-turbo/src/jdcoefct.c index 40ce27259b..194d5a5cb7 100644 --- a/3rdparty/libjpeg-turbo/src/jdcoefct.c +++ b/3rdparty/libjpeg-turbo/src/jdcoefct.c @@ -5,7 +5,7 @@ * Copyright (C) 1994-1997, Thomas G. Lane. * libjpeg-turbo Modifications: * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright (C) 2010, 2015-2016, 2019-2020, 2022-2023, D. R. Commander. + * Copyright (C) 2010, 2015-2016, 2019-2020, 2022-2024, D. R. Commander. * Copyright (C) 2015, 2020, Google, Inc. * For conditions of distribution and use, see the accompanying README.ijg * file. @@ -824,6 +824,7 @@ _jinit_d_coef_controller(j_decompress_ptr cinfo, boolean need_full_buffer) coef = (my_coef_ptr) (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, sizeof(my_coef_controller)); + memset(coef, 0, sizeof(my_coef_controller)); cinfo->coef = (struct jpeg_d_coef_controller *)coef; coef->pub.start_input_pass = start_input_pass; coef->pub.start_output_pass = start_output_pass; diff --git a/3rdparty/libjpeg-turbo/src/jdmainct.c b/3rdparty/libjpeg-turbo/src/jdmainct.c index fed1866ee9..fc97073e3d 100644 --- a/3rdparty/libjpeg-turbo/src/jdmainct.c +++ b/3rdparty/libjpeg-turbo/src/jdmainct.c @@ -450,6 +450,7 @@ _jinit_d_main_controller(j_decompress_ptr cinfo, boolean need_full_buffer) main_ptr = (my_main_ptr) (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, sizeof(my_main_controller)); + memset(main_ptr, 0, sizeof(my_main_controller)); cinfo->main = (struct jpeg_d_main_controller *)main_ptr; main_ptr->pub.start_pass = start_pass_main; diff --git a/3rdparty/libjpeg-turbo/src/jdsample.c b/3rdparty/libjpeg-turbo/src/jdsample.c index e5a127de42..022471dc37 100644 --- a/3rdparty/libjpeg-turbo/src/jdsample.c +++ b/3rdparty/libjpeg-turbo/src/jdsample.c @@ -5,7 +5,7 @@ * Copyright (C) 1991-1996, Thomas G. Lane. * libjpeg-turbo Modifications: * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright (C) 2010, 2015-2016, 2022, 2024, D. R. Commander. + * Copyright (C) 2010, 2015-2016, 2022, 2024-2025, D. R. Commander. * Copyright (C) 2014, MIPS Technologies, Inc., California. * Copyright (C) 2015, Google, Inc. * Copyright (C) 2019-2020, Arm Limited. @@ -501,7 +501,8 @@ _jinit_upsampler(j_decompress_ptr cinfo) v_in_group * 2 == v_out_group && do_fancy) { /* Non-fancy upsampling is handled by the generic method */ #if defined(WITH_SIMD) && (defined(__arm__) || defined(__aarch64__) || \ - defined(_M_ARM) || defined(_M_ARM64)) + defined(_M_ARM) || defined(_M_ARM64) || \ + defined(_M_ARM64EC)) if (jsimd_can_h1v2_fancy_upsample()) upsample->methods[ci] = jsimd_h1v2_fancy_upsample; else diff --git a/3rdparty/libjpeg-turbo/src/jpeg_nbits.c b/3rdparty/libjpeg-turbo/src/jpeg_nbits.c index c8ee6b056c..752a163653 100644 --- a/3rdparty/libjpeg-turbo/src/jpeg_nbits.c +++ b/3rdparty/libjpeg-turbo/src/jpeg_nbits.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024, D. R. Commander. + * Copyright (C) 2024-2025, D. R. Commander. * * For conditions of distribution and use, see the accompanying README.ijg * file. @@ -17,7 +17,7 @@ * encoders can reuse jpeg_nbits_table from the SSE2 baseline Huffman encoder. */ #if (defined(__x86_64__) || defined(__i386__) || defined(_M_IX86) || \ - defined(_M_X64)) && defined(WITH_SIMD) + (defined(_M_X64) && !defined(_M_ARM64EC))) && defined(WITH_SIMD) #undef INCLUDE_JPEG_NBITS_TABLE #endif diff --git a/3rdparty/libjpeg-turbo/src/jpeg_nbits.h b/3rdparty/libjpeg-turbo/src/jpeg_nbits.h index 6481a1228d..61666fd57a 100644 --- a/3rdparty/libjpeg-turbo/src/jpeg_nbits.h +++ b/3rdparty/libjpeg-turbo/src/jpeg_nbits.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014, 2021, 2024, D. R. Commander. + * Copyright (C) 2014, 2021, 2024-2025, D. R. Commander. * Copyright (C) 2014, Olle Liljenzin. * Copyright (C) 2020, Arm Limited. * @@ -23,7 +23,7 @@ /* NOTE: Both GCC and Clang define __GNUC__ */ #if (defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__))) || \ - defined(_M_ARM) || defined(_M_ARM64) + defined(_M_ARM) || defined(_M_ARM64) || defined(_M_ARM64EC) #if !defined(__thumb__) || defined(__thumb2__) #define USE_CLZ_INTRINSIC #endif