Update libjpeg-turbo version:3.1.0

3rdparty/libjpeg-turbo/CMakeLists.txt

@@ -18,7 +18,7 @@ if(CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13)
   ocv_warnings_disable(CMAKE_C_FLAGS -Wstringop-overflow)
 endif()
 
-set(VERSION 3.0.3)
+set(VERSION 3.1.0)
 set(COPYRIGHT_YEAR "1991-2024")
 string(REPLACE "." ";" VERSION_TRIPLET ${VERSION})
 list(GET VERSION_TRIPLET 0 VERSION_MAJOR)
@@ -203,7 +203,7 @@ check_type_size("size_t" SIZE_T)
 check_type_size("unsigned long" UNSIGNED_LONG)
 
 if(ENABLE_LIBJPEG_TURBO_SIMD)
-  add_subdirectory(src/simd)
+  add_subdirectory(simd)
   if(NEON_INTRINSICS)
     add_definitions(-DNEON_INTRINSICS)
   endif()

3rdparty/libjpeg-turbo/LICENSE.md

@@ -94,7 +94,7 @@ intended solely for clarification.
 The Modified (3-clause) BSD License
 ===================================
 
-Copyright (C)2009-2023 D. R. Commander.  All Rights Reserved.<br>
+Copyright (C)2009-2024 D. R. Commander.  All Rights Reserved.<br>
 Copyright (C)2015 Viktor Szathmáry.  All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without

3rdparty/libjpeg-turbo/README.ijg

@@ -36,16 +36,18 @@ TO DO               Plans for future IJG releases.
 Other documentation files in the distribution are:
 
 User documentation:
-  usage.txt         Usage instructions for cjpeg, djpeg, jpegtran,
+  doc/usage.txt         Usage instructions for cjpeg, djpeg, jpegtran,
-                    rdjpgcom, and wrjpgcom.
+                        rdjpgcom, and wrjpgcom.
-  *.1               Unix-style man pages for programs (same info as usage.txt).
+  doc/*.1               Unix-style man pages for programs (same info as
-  wizard.txt        Advanced usage instructions for JPEG wizards only.
+                        usage.txt).
-  change.log        Version-to-version change highlights.
+  doc/wizard.txt        Advanced usage instructions for JPEG wizards only.
+  doc/change.log        Version-to-version change highlights.
 Programmer and internal documentation:
-  libjpeg.txt       How to use the JPEG library in your own programs.
+  doc/libjpeg.txt       How to use the JPEG library in your own programs.
-  example.c         Sample code for calling the JPEG library.
+  src/example.c         Sample code for calling the JPEG library.
-  structure.txt     Overview of the JPEG library's internal structure.
+  doc/structure.txt     Overview of the JPEG library's internal structure.
-  coderules.txt     Coding style rules --- please read if you contribute code.
+  doc/coderules.txt     Coding style rules --- please read if you contribute
+                        code.
 
 Please read at least usage.txt.  Some information can also be found in the JPEG
 FAQ (Frequently Asked Questions) article.  See ARCHIVE LOCATIONS below to find
@@ -89,9 +91,9 @@ The library is intended to be reused in other applications.
 In order to support file conversion and viewing software, we have included
 considerable functionality beyond the bare JPEG coding/decoding capability;
 for example, the color quantization modules are not strictly part of JPEG
-decoding, but they are essential for output to colormapped file formats or
+decoding, but they are essential for output to colormapped file formats.  These
-colormapped displays.  These extra functions can be compiled out of the
+extra functions can be compiled out of the library if not required for a
-library if not required for a particular application.
+particular application.
 
 We have also included "jpegtran", a utility for lossless transcoding between
 different JPEG processes, and "rdjpgcom" and "wrjpgcom", two simple

3rdparty/libjpeg-turbo/README.md

@@ -69,9 +69,12 @@ JPEG images:
   generating planar YUV images and performing multiple simultaneous lossless
   transforms on an image.  The Java interface for libjpeg-turbo is written on
   top of the TurboJPEG API.  The TurboJPEG API is recommended for first-time
-  users of libjpeg-turbo.  Refer to [tjexample.c](tjexample.c) and
+  users of libjpeg-turbo.  Refer to [tjcomp.c](src/tjcomp.c),
-  [TJExample.java](java/TJExample.java) for examples of its usage and to
+  [tjdecomp.c](src/tjdecomp.c), [tjtran.c](src/tjtran.c),
-  <http://libjpeg-turbo.org/Documentation/Documentation> for API documentation.
+  [TJComp.java](java/TJComp.java), [TJDecomp.java](java/TJDecomp.java), and
+  [TJTran.java](java/TJTran.java) for examples of its usage and to
+  <https://libjpeg-turbo.org/Documentation/Documentation> for API
+  documentation.
 
 - **libjpeg API**<br>
   This is the de facto industry-standard API for compressing and decompressing
@@ -79,8 +82,9 @@ JPEG images:
   more powerful.  The libjpeg API implementation in libjpeg-turbo is both
   API/ABI-compatible and mathematically compatible with libjpeg v6b.  It can
   also optionally be configured to be API/ABI-compatible with libjpeg v7 and v8
-  (see below.)  Refer to [cjpeg.c](cjpeg.c) and [djpeg.c](djpeg.c) for examples
+  (see below.)  Refer to [cjpeg.c](src/cjpeg.c) and [djpeg.c](src/djpeg.c) for
-  of its usage and to [libjpeg.txt](libjpeg.txt) for API documentation.
+  examples of its usage and to [libjpeg.txt](doc/libjpeg.txt) for API
+  documentation.
 
 There is no significant performance advantage to either API when both are used
 to perform similar operations.
@@ -132,9 +136,9 @@ extensions at compile time with:
 
     #ifdef JCS_ALPHA_EXTENSIONS
 
-[jcstest.c](jcstest.c), located in the libjpeg-turbo source tree, demonstrates
+[jcstest.c](src/jcstest.c), located in the libjpeg-turbo source tree,
-how to check for the existence of the colorspace extensions at compile time and
+demonstrates how to check for the existence of the colorspace extensions at
-run time.
+compile time and run time.
 
 libjpeg v7 and v8 API/ABI Emulation
 -----------------------------------
@@ -199,7 +203,7 @@ supported and which aren't.
 NOTE:  As of this writing, extensive research has been conducted into the
 usefulness of DCT scaling as a means of data reduction and SmartScale as a
 means of quality improvement.  Readers are invited to peruse the research at
-<http://www.libjpeg-turbo.org/About/SmartScale> and draw their own conclusions,
+<https://libjpeg-turbo.org/About/SmartScale> and draw their own conclusions,
 but it is the general belief of our project that these features have not
 demonstrated sufficient usefulness to justify inclusion in libjpeg-turbo.
 

3rdparty/libjpeg-turbo/simd/CMakeLists.txt

@@ -273,48 +273,33 @@ endif()
 check_c_source_compiles("
   #include <arm_neon.h>
   int main(int argc, char **argv) {
-    int16_t input[] = {
+    int16_t input[12];
-      (int16_t)argc, (int16_t)argc, (int16_t)argc, (int16_t)argc,
+    int16x4x3_t output;
-      (int16_t)argc, (int16_t)argc, (int16_t)argc, (int16_t)argc,
+    int i;
-      (int16_t)argc, (int16_t)argc, (int16_t)argc, (int16_t)argc
+    for (i = 0; i < 12; i++) input[i] = (int16_t)argc;
-    };
+    output = vld1_s16_x3(input);
-    int16x4x3_t output = vld1_s16_x3(input);
     vst3_s16(input, output);
     return (int)input[0];
   }" HAVE_VLD1_S16_X3)
 check_c_source_compiles("
   #include <arm_neon.h>
   int main(int argc, char **argv) {
-    uint16_t input[] = {
+    uint16_t input[8];
-      (uint16_t)argc, (uint16_t)argc, (uint16_t)argc, (uint16_t)argc,
+    uint16x4x2_t output;
-      (uint16_t)argc, (uint16_t)argc, (uint16_t)argc, (uint16_t)argc
+    int i;
-    };
+    for (i = 0; i < 8; i++) input[i] = (uint16_t)argc;
-    uint16x4x2_t output = vld1_u16_x2(input);
+    output = vld1_u16_x2(input);
     vst2_u16(input, output);
     return (int)input[0];
   }" HAVE_VLD1_U16_X2)
 check_c_source_compiles("
   #include <arm_neon.h>
   int main(int argc, char **argv) {
-    uint8_t input[] = {
+    uint8_t input[64];
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
+    uint8x16x4_t output;
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
+    int i;
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
+    for (i = 0; i < 64; i++) input[i] = (uint8_t)argc;
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
+    output = vld1q_u8_x4(input);
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc,
-      (uint8_t)argc, (uint8_t)argc, (uint8_t)argc, (uint8_t)argc
-    };
-    uint8x16x4_t output = vld1q_u8_x4(input);
     vst4q_u8(input, output);
     return (int)input[0];
   }" HAVE_VLD1Q_U8_X4)
@@ -369,7 +354,8 @@ if(NOT NEON_INTRINSICS)
   separate_arguments(CMAKE_ASM_FLAGS_SEP UNIX_COMMAND "${CMAKE_ASM_FLAGS}")
   execute_process(COMMAND ${CMAKE_ASM_COMPILER} ${CMAKE_ASM_FLAGS_SEP}
       -x assembler-with-cpp -c ${CMAKE_CURRENT_BINARY_DIR}/gastest.S
-    RESULT_VARIABLE RESULT OUTPUT_VARIABLE OUTPUT ERROR_VARIABLE ERROR)
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} RESULT_VARIABLE RESULT
+    OUTPUT_VARIABLE OUTPUT ERROR_VARIABLE ERROR)
   if(NOT RESULT EQUAL 0)
     message(WARNING "GAS appears to be broken.  Using the full Neon SIMD intrinsics implementation.")
     set(NEON_INTRINSICS 1 CACHE INTERNAL "" FORCE)

3rdparty/libjpeg-turbo/simd/arm/aarch32/jchuff-neon.c

@@ -2,6 +2,7 @@
  * jchuff-neon.c - Huffman entropy encoding (32-bit Arm Neon)
  *
  * Copyright (C) 2020, Arm Limited.  All Rights Reserved.
+ * Copyright (C) 2024, 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
@@ -24,11 +25,11 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../../jinclude.h"
+#include "../../../src/jinclude.h"
-#include "../../../jpeglib.h"
+#include "../../../src/jpeglib.h"
-#include "../../../jsimd.h"
+#include "../../../src/jsimd.h"
-#include "../../../jdct.h"
+#include "../../../src/jdct.h"
-#include "../../../jsimddct.h"
+#include "../../../src/jsimddct.h"
 #include "../../jsimd.h"
 #include "../jchuff.h"
 #include "neon-compat.h"

3rdparty/libjpeg-turbo/simd/arm/aarch32/jsimd.c

@@ -3,7 +3,7 @@
  *
  * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
  * Copyright (C) 2011, Nokia Corporation and/or its subsidiary(-ies).
- * Copyright (C) 2009-2011, 2013-2014, 2016, 2018, 2022, D. R. Commander.
+ * Copyright (C) 2009-2011, 2013-2014, 2016, 2018, 2022, 2024, D. R. Commander.
  * Copyright (C) 2015-2016, 2018, 2022, Matthieu Darbois.
  * Copyright (C) 2019, Google LLC.
  * Copyright (C) 2020, Arm Limited.
@@ -18,11 +18,11 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../../jinclude.h"
+#include "../../../src/jinclude.h"
-#include "../../../jpeglib.h"
+#include "../../../src/jpeglib.h"
-#include "../../../jsimd.h"
+#include "../../../src/jsimd.h"
-#include "../../../jdct.h"
+#include "../../../src/jdct.h"
-#include "../../../jsimddct.h"
+#include "../../../src/jsimddct.h"
 #include "../../jsimd.h"
 
 #include <ctype.h>

3rdparty/libjpeg-turbo/simd/arm/aarch64/jchuff-neon.c

@@ -2,7 +2,7 @@
  * jchuff-neon.c - Huffman entropy encoding (64-bit Arm Neon)
  *
  * Copyright (C) 2020-2021, Arm Limited.  All Rights Reserved.
- * Copyright (C) 2020, 2022, D. R. Commander.  All Rights Reserved.
+ * Copyright (C) 2020, 2022, 2024, 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
@@ -25,11 +25,11 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../../jinclude.h"
+#include "../../../src/jinclude.h"
-#include "../../../jpeglib.h"
+#include "../../../src/jpeglib.h"
-#include "../../../jsimd.h"
+#include "../../../src/jsimd.h"
-#include "../../../jdct.h"
+#include "../../../src/jdct.h"
-#include "../../../jsimddct.h"
+#include "../../../src/jsimddct.h"
 #include "../../jsimd.h"
 #include "../align.h"
 #include "../jchuff.h"

3rdparty/libjpeg-turbo/simd/arm/aarch64/jsimd.c

@@ -3,7 +3,8 @@
  *
  * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
  * Copyright (C) 2011, Nokia Corporation and/or its subsidiary(-ies).
- * Copyright (C) 2009-2011, 2013-2014, 2016, 2018, 2020, 2022, D. R. Commander.
+ * Copyright (C) 2009-2011, 2013-2014, 2016, 2018, 2020, 2022, 2024,
+ *           D. R. Commander.
  * Copyright (C) 2015-2016, 2018, 2022, Matthieu Darbois.
  * Copyright (C) 2020, Arm Limited.
  *
@@ -17,11 +18,11 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../../jinclude.h"
+#include "../../../src/jinclude.h"
-#include "../../../jpeglib.h"
+#include "../../../src/jpeglib.h"
-#include "../../../jsimd.h"
+#include "../../../src/jsimd.h"
-#include "../../../jdct.h"
+#include "../../../src/jdct.h"
-#include "../../../jsimddct.h"
+#include "../../../src/jsimddct.h"
 #include "../../jsimd.h"
 
 #include <ctype.h>

3rdparty/libjpeg-turbo/simd/arm/jccolor-neon.c

@@ -2,7 +2,7 @@
  * jccolor-neon.c - colorspace conversion (Arm Neon)
  *
  * Copyright (C) 2020, Arm Limited.  All Rights Reserved.
- * Copyright (C) 2020, D. R. Commander.  All Rights Reserved.
+ * Copyright (C) 2020, 2024, 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
@@ -22,11 +22,11 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
 #include "align.h"
 #include "neon-compat.h"

3rdparty/libjpeg-turbo/simd/arm/jcgray-neon.c

@@ -2,6 +2,7 @@
  * jcgray-neon.c - grayscale colorspace conversion (Arm Neon)
  *
  * Copyright (C) 2020, Arm Limited.  All Rights Reserved.
+ * Copyright (C) 2024, 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
@@ -21,13 +22,14 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
 #include "align.h"
+#include "neon-compat.h"
 
 #include <arm_neon.h>
 

3rdparty/libjpeg-turbo/simd/arm/jcphuff-neon.c

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2020-2021, Arm Limited.  All Rights Reserved.
  * Copyright (C) 2022, Matthieu Darbois.  All Rights Reserved.
- * Copyright (C) 2022, D. R. Commander.  All Rights Reserved.
+ * Copyright (C) 2022, 2024, 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
@@ -23,11 +23,11 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
 #include "neon-compat.h"
 

3rdparty/libjpeg-turbo/simd/arm/jcsample-neon.c

@@ -2,6 +2,7 @@
  * jcsample-neon.c - downsampling (Arm Neon)
  *
  * Copyright (C) 2020, Arm Limited.  All Rights Reserved.
+ * Copyright (C) 2024, 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
@@ -21,13 +22,14 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
 #include "align.h"
+#include "neon-compat.h"
 
 #include <arm_neon.h>
 

3rdparty/libjpeg-turbo/simd/arm/jdcolor-neon.c

@@ -2,6 +2,7 @@
  * jdcolor-neon.c - colorspace conversion (Arm Neon)
  *
  * Copyright (C) 2020, Arm Limited.  All Rights Reserved.
+ * Copyright (C) 2024, 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
@@ -21,13 +22,14 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
 #include "align.h"
+#include "neon-compat.h"
 
 #include <arm_neon.h>
 

3rdparty/libjpeg-turbo/simd/arm/jdmerge-neon.c

@@ -2,6 +2,7 @@
  * jdmerge-neon.c - merged upsampling/color conversion (Arm Neon)
  *
  * Copyright (C) 2020, Arm Limited.  All Rights Reserved.
+ * Copyright (C) 2024, 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
@@ -21,13 +22,14 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
 #include "align.h"
+#include "neon-compat.h"
 
 #include <arm_neon.h>
 

3rdparty/libjpeg-turbo/simd/arm/jdsample-neon.c

@@ -2,7 +2,7 @@
  * jdsample-neon.c - upsampling (Arm Neon)
  *
  * Copyright (C) 2020, Arm Limited.  All Rights Reserved.
- * Copyright (C) 2020, D. R. Commander.  All Rights Reserved.
+ * Copyright (C) 2020, 2024, 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
@@ -22,12 +22,13 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
+#include "neon-compat.h"
 
 #include <arm_neon.h>
 

3rdparty/libjpeg-turbo/simd/arm/jfdctfst-neon.c

@@ -2,6 +2,7 @@
  * jfdctfst-neon.c - fast integer FDCT (Arm Neon)
  *
  * Copyright (C) 2020, Arm Limited.  All Rights Reserved.
+ * Copyright (C) 2024, 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
@@ -21,13 +22,14 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
 #include "align.h"
+#include "neon-compat.h"
 
 #include <arm_neon.h>
 

3rdparty/libjpeg-turbo/simd/arm/jfdctint-neon.c

@@ -2,7 +2,7 @@
  * jfdctint-neon.c - accurate integer FDCT (Arm Neon)
  *
  * Copyright (C) 2020, Arm Limited.  All Rights Reserved.
- * Copyright (C) 2020, D. R. Commander.  All Rights Reserved.
+ * Copyright (C) 2020, 2024, 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
@@ -22,11 +22,11 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
 #include "align.h"
 #include "neon-compat.h"

3rdparty/libjpeg-turbo/simd/arm/jidctfst-neon.c

@@ -2,6 +2,7 @@
  * jidctfst-neon.c - fast integer IDCT (Arm Neon)
  *
  * Copyright (C) 2020, Arm Limited.  All Rights Reserved.
+ * Copyright (C) 2024, 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
@@ -21,13 +22,14 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
 #include "align.h"
+#include "neon-compat.h"
 
 #include <arm_neon.h>
 

3rdparty/libjpeg-turbo/simd/arm/jidctint-neon.c

@@ -2,7 +2,7 @@
  * jidctint-neon.c - accurate integer IDCT (Arm Neon)
  *
  * Copyright (C) 2020, Arm Limited.  All Rights Reserved.
- * Copyright (C) 2020, D. R. Commander.  All Rights Reserved.
+ * Copyright (C) 2020, 2024, 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
@@ -22,11 +22,11 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
 #include "align.h"
 #include "neon-compat.h"

3rdparty/libjpeg-turbo/simd/arm/jidctred-neon.c

@@ -2,7 +2,7 @@
  * jidctred-neon.c - reduced-size IDCT (Arm Neon)
  *
  * Copyright (C) 2020, Arm Limited.  All Rights Reserved.
- * Copyright (C) 2020, D. R. Commander.  All Rights Reserved.
+ * Copyright (C) 2020, 2024, 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
@@ -22,11 +22,11 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
 #include "align.h"
 #include "neon-compat.h"

3rdparty/libjpeg-turbo/simd/arm/jquanti-neon.c

@@ -2,6 +2,7 @@
  * jquanti-neon.c - 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.
  *
  * This software is provided 'as-is', without any express or implied
  * warranty.  In no event will the authors be held liable for any damages
@@ -21,12 +22,13 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
+#include "neon-compat.h"
 
 #include <arm_neon.h>
 

3rdparty/libjpeg-turbo/simd/arm/neon-compat.h.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020, D. R. Commander.  All Rights Reserved.
+ * Copyright (C) 2020, 2024, D. R. Commander.  All Rights Reserved.
  * Copyright (C) 2020-2021, Arm Limited.  All Rights Reserved.
  *
  * This software is provided 'as-is', without any express or implied
@@ -35,3 +35,11 @@
 #else
 #error "Unknown compiler"
 #endif
+
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wdeclaration-after-statement"
+#pragma clang diagnostic ignored "-Wc99-extensions"
+#elif defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
+#pragma GCC diagnostic ignored "-Wpedantic"
+#endif

3rdparty/libjpeg-turbo/simd/i386/jccolext-avx2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jcolsamp.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jccolext-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jcolsamp.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jccolext-sse2.asm

@@ -7,11 +7,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jcolsamp.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jccolor-avx2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jccolor-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jccolor-sse2.asm

@@ -7,11 +7,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jcgray-avx2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jcgray-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jcgray-sse2.asm

@@ -7,11 +7,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jcgryext-avx2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jcolsamp.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jcgryext-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jcolsamp.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jcgryext-sse2.asm

@@ -7,11 +7,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jcolsamp.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jchuff-sse2.asm

@@ -9,11 +9,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains an SSE2 implementation for Huffman coding of one block.
 ; The following code is based on jchuff.c; see jchuff.c for more details.

3rdparty/libjpeg-turbo/simd/i386/jcphuff-sse2.asm

@@ -7,11 +7,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains an SSE2 implementation of data preparation for progressive
 ; Huffman encoding.  See jcphuff.c for more details.

3rdparty/libjpeg-turbo/simd/i386/jcsample-avx2.asm

@@ -9,11 +9,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jcsample-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jcsample-sse2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdcolext-avx2.asm

@@ -9,11 +9,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jcolsamp.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdcolext-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jcolsamp.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdcolext-sse2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jcolsamp.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdcolor-avx2.asm

@@ -9,11 +9,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdcolor-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdcolor-sse2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdmerge-avx2.asm

@@ -9,11 +9,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdmerge-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdmerge-sse2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdmrgext-avx2.asm

@@ -9,11 +9,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jcolsamp.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdmrgext-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jcolsamp.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdmrgext-sse2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jcolsamp.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdsample-avx2.asm

@@ -9,11 +9,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdsample-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jdsample-sse2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/i386/jfdctflt-3dn.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a floating-point implementation of the forward DCT
 ; (Discrete Cosine Transform). The following code is based directly on

3rdparty/libjpeg-turbo/simd/i386/jfdctflt-sse.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a floating-point implementation of the forward DCT
 ; (Discrete Cosine Transform). The following code is based directly on

3rdparty/libjpeg-turbo/simd/i386/jfdctfst-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a fast, not so accurate integer implementation of
 ; the forward DCT (Discrete Cosine Transform). The following code is

3rdparty/libjpeg-turbo/simd/i386/jfdctfst-sse2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a fast, not so accurate integer implementation of
 ; the forward DCT (Discrete Cosine Transform). The following code is

3rdparty/libjpeg-turbo/simd/i386/jfdctint-avx2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a slower but more accurate integer implementation of the
 ; forward DCT (Discrete Cosine Transform). The following code is based

3rdparty/libjpeg-turbo/simd/i386/jfdctint-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a slower but more accurate integer implementation of the
 ; forward DCT (Discrete Cosine Transform). The following code is based

3rdparty/libjpeg-turbo/simd/i386/jfdctint-sse2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a slower but more accurate integer implementation of the
 ; forward DCT (Discrete Cosine Transform). The following code is based

3rdparty/libjpeg-turbo/simd/i386/jidctflt-3dn.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a floating-point implementation of the inverse DCT
 ; (Discrete Cosine Transform). The following code is based directly on

3rdparty/libjpeg-turbo/simd/i386/jidctflt-sse.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a floating-point implementation of the inverse DCT
 ; (Discrete Cosine Transform). The following code is based directly on

3rdparty/libjpeg-turbo/simd/i386/jidctflt-sse2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a floating-point implementation of the inverse DCT
 ; (Discrete Cosine Transform). The following code is based directly on

3rdparty/libjpeg-turbo/simd/i386/jidctfst-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a fast, not so accurate integer implementation of
 ; the inverse DCT (Discrete Cosine Transform). The following code is

3rdparty/libjpeg-turbo/simd/i386/jidctfst-sse2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a fast, not so accurate integer implementation of
 ; the inverse DCT (Discrete Cosine Transform). The following code is

3rdparty/libjpeg-turbo/simd/i386/jidctint-avx2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a slower but more accurate integer implementation of the
 ; inverse DCT (Discrete Cosine Transform). The following code is based

3rdparty/libjpeg-turbo/simd/i386/jidctint-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a slower but more accurate integer implementation of the
 ; inverse DCT (Discrete Cosine Transform). The following code is based

3rdparty/libjpeg-turbo/simd/i386/jidctint-sse2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains a slower but more accurate integer implementation of the
 ; inverse DCT (Discrete Cosine Transform). The following code is based

3rdparty/libjpeg-turbo/simd/i386/jidctred-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains inverse-DCT routines that produce reduced-size
 ; output: either 4x4 or 2x2 pixels from an 8x8 DCT block.

3rdparty/libjpeg-turbo/simd/i386/jidctred-sse2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
 ; This file contains inverse-DCT routines that produce reduced-size
 ; output: either 4x4 or 2x2 pixels from an 8x8 DCT block.

3rdparty/libjpeg-turbo/simd/i386/jquant-3dn.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 %include "jdct.inc"

3rdparty/libjpeg-turbo/simd/i386/jquant-mmx.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 %include "jdct.inc"
@@ -120,8 +116,8 @@ EXTN(jsimd_convsamp_mmx):
 ; Quantize/descale the coefficients, and store into coef_block
 ;
 ; This implementation is based on an algorithm described in
-;   "How to optimize for the Pentium family of microprocessors"
+;   "Optimizing subroutines in assembly language:
-;   (http://www.agner.org/assem/).
+;   An optimization guide for x86 platforms" (https://agner.org/optimize).
 ;
 ; GLOBAL(void)
 ; jsimd_quantize_mmx(JCOEFPTR coef_block, DCTELEM *divisors,

3rdparty/libjpeg-turbo/simd/i386/jquant-sse.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 %include "jdct.inc"

3rdparty/libjpeg-turbo/simd/i386/jquantf-sse2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 %include "jdct.inc"

3rdparty/libjpeg-turbo/simd/i386/jquanti-avx2.asm

@@ -2,18 +2,14 @@
 ; jquanti.asm - sample data conversion and quantization (AVX2)
 ;
 ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright (C) 2016, 2018, D. R. Commander.
+; Copyright (C) 2016, 2018, 2024, D. R. Commander.
 ; Copyright (C) 2016, Matthieu Darbois.
 ;
 ; Based on the x86 SIMD extension for IJG JPEG library
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 %include "jdct.inc"
@@ -107,8 +103,8 @@ EXTN(jsimd_convsamp_avx2):
 ; Quantize/descale the coefficients, and store into coef_block
 ;
 ; This implementation is based on an algorithm described in
-;   "How to optimize for the Pentium family of microprocessors"
+;   "Optimizing subroutines in assembly language:
-;   (http://www.agner.org/assem/).
+;   An optimization guide for x86 platforms" (https://agner.org/optimize).
 ;
 ; GLOBAL(void)
 ; jsimd_quantize_avx2(JCOEFPTR coef_block, DCTELEM *divisors,

3rdparty/libjpeg-turbo/simd/i386/jquanti-sse2.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 %include "jdct.inc"
@@ -98,8 +94,8 @@ EXTN(jsimd_convsamp_sse2):
 ; Quantize/descale the coefficients, and store into coef_block
 ;
 ; This implementation is based on an algorithm described in
-;   "How to optimize for the Pentium family of microprocessors"
+;   "Optimizing subroutines in assembly language:
-;   (http://www.agner.org/assem/).
+;   An optimization guide for x86 platforms" (https://agner.org/optimize).
 ;
 ; GLOBAL(void)
 ; jsimd_quantize_sse2(JCOEFPTR coef_block, DCTELEM *divisors,

3rdparty/libjpeg-turbo/simd/i386/jsimd.c

@@ -2,7 +2,7 @@
  * jsimd_i386.c
  *
  * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright (C) 2009-2011, 2013-2014, 2016, 2018, 2022-2023, D. R. Commander.
+ * Copyright (C) 2009-2011, 2013-2014, 2016, 2018, 2022-2024, D. R. Commander.
  * Copyright (C) 2015-2016, 2018, 2022, Matthieu Darbois.
  *
  * Based on the x86 SIMD extension for IJG JPEG library,
@@ -15,11 +15,11 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
 
 /*

3rdparty/libjpeg-turbo/simd/i386/jsimdcpu.asm

@@ -8,11 +8,7 @@
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
 ; For conditions of distribution and use, see copyright notice in jsimdext.inc
 ;
-; This file should be assembled with NASM (Netwide Assembler),
+; This file should be assembled with NASM (Netwide Assembler) or Yasm.
-; can *not* be assembled with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).
-; NASM is available from http://nasm.sourceforge.net/ or
-; http://sourceforge.net/project/showfiles.php?group_id=6208
 
 %include "jsimdext.inc"
 

3rdparty/libjpeg-turbo/simd/mips/jsimd.c

@@ -2,7 +2,8 @@
  * jsimd_mips.c
  *
  * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright (C) 2009-2011, 2014, 2016, 2018, 2020, 2022, D. R. Commander.
+ * Copyright (C) 2009-2011, 2014, 2016, 2018, 2020, 2022, 2024,
+ *           D. R. Commander.
  * Copyright (C) 2013-2014, MIPS Technologies, Inc., California.
  * Copyright (C) 2015-2016, 2018, 2022, Matthieu Darbois.
  *
@@ -16,11 +17,11 @@
  */
 
 #define JPEG_INTERNALS
-#include "../../jinclude.h"
+#include "../../src/jinclude.h"
-#include "../../jpeglib.h"
+#include "../../src/jpeglib.h"
-#include "../../jsimd.h"
+#include "../../src/jsimd.h"
-#include "../../jdct.h"
+#include "../../src/jdct.h"
-#include "../../jsimddct.h"
+#include "../../src/jsimddct.h"
 #include "../jsimd.h"
 
 #include <ctype.h>