PR review feedback addressed

Co-authored-by: Rémi Verschelde <[email protected]>

Author: DanielKinsman

COPYRIGHT.txt

@@ -331,10 +331,10 @@ License: BSD-3-clause
 
 Files: thirdparty/libjpeg-turbo/*
 Comment: libjpeg-turbo
-Copyright: Copyright (C)2009-2024 D. R. Commander
- Copyright (C)2015 Viktor Szathmáry.
+Copyright: 2009-2024, D. R. Commander
+ 2015, Viktor Szathmáry.
  1991-2020, Thomas G. Lane, Guido Vollbeding
-License: TurboJPEG modified BSD-3-clause, IJG License
+License: BSD-3-clause and IJG
 
 Files: thirdparty/libktx/*
 Comment: KTX
@@ -1685,15 +1685,15 @@ License: HarfBuzz
  ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
  PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-License: IJG License
+License: IJG
  The authors make NO WARRANTY or representation, either express or implied,
  with respect to this software, its quality, accuracy, merchantability, or
  fitness for a particular purpose.  This software is provided "AS IS", and you,
  its user, assume the entire risk as to its quality and accuracy.
-
+ .
  This software is copyright (C) 1991-2020, Thomas G. Lane, Guido Vollbeding.
  All Rights Reserved except as specified below.
-
+ .
  Permission is hereby granted to use, copy, modify, and distribute this
  software (or portions thereof) for any purpose, without fee, subject to these
  conditions:
@@ -1707,16 +1707,16 @@ License: IJG License
  (3) Permission for use of this software is granted only if the user accepts
  full responsibility for any undesirable consequences; the authors accept
  NO LIABILITY for damages of any kind.
-
+ .
  These conditions apply to any software derived from or based on the IJG code,
  not just to the unmodified library.  If you use our work, you ought to
  acknowledge us.
-
+ .
  Permission is NOT granted for the use of any IJG author's name or company name
  in advertising or publicity relating to this software or products derived from
  it.  This software may be referred to only as "the Independent JPEG Group's
  software".
-
+ .
  We specifically permit and encourage the use of this software as the basis of
  commercial products, provided that all warranty or liability claims are
  assumed by the product vendor.
@@ -2179,34 +2179,6 @@ License: OFL-1.1
  DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE.
 
-License: TurboJPEG modified BSD-3-clause
- 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
- modification, are permitted provided that the following conditions are met:
-
- - Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- - Neither the name of the libjpeg-turbo Project nor the names of its
-   contributors may be used to endorse or promote products derived from this
-   software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS",
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
 License: Unicode
  COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)
  .

modules/jpg/SCsub

@@ -4,7 +4,7 @@ from misc.utility.scons_hints import *
 Import("env")
 Import("env_modules")
 
-env_jpeg_turbo = env_modules.Clone()
+env_jpg = env_modules.Clone()
 
 thirdparty_obj = []
 
@@ -72,48 +72,32 @@ thirdparty_sources_bit_dependent = [
     "jquant2.c",
 ]
 
-absent_in_16 = frozenset(
-    [
-        "jcdctmgr.c",
-        "jccoefct.c",
-        "jdcoefct.c",
-        "jddctmgr.c",
-        "jfdctfst.c",
-        "jfdctint.c",
-        "jidctflt.c",
-        "jidctfst.c",
-        "jidctint.c",
-        "jidctred.c",
-    ]
-)
-
 thirdparty_sources_by_bits = {
     8: list(thirdparty_sources_bit_dependent),
     12: list(thirdparty_sources_bit_dependent),
-    16: [x for x in thirdparty_sources_bit_dependent if x not in absent_in_16],
 }
 
 
 def source_paths(files):
     return [thirdparty_dir + "/src/" + f for f in files]
 
 
-env_jpeg_turbo.Prepend(CPPEXTPATH=[thirdparty_dir + "/src"])
+env_jpg.Prepend(CPPEXTPATH=[thirdparty_dir + "/src"])
 
 
 def add_bit_depth(bit_depth: int):
-    env_bit_depth = env_jpeg_turbo.Clone()
+    env_bit_depth = env_jpg.Clone()
     env_bit_depth.disable_warnings()
     env_bit_depth["OBJSUFFIX"] = f"_{bit_depth}{env_bit_depth['OBJSUFFIX']}"
-    env_bit_depth.AppendUnique(CPPDEFINES=[f"BITS_IN_JSAMPLE={bit_depth}"])  # to unique or not?
+    env_bit_depth.Append(CPPDEFINES=[f"BITS_IN_JSAMPLE={bit_depth}"])
     env_bit_depth.add_source_files(thirdparty_obj, source_paths(thirdparty_sources_by_bits[bit_depth]))
 
 
 add_bit_depth(8)
 add_bit_depth(12)
 # add_bit_depth(16)
 
-env_thirdparty = env_jpeg_turbo.Clone()
+env_thirdparty = env_jpg.Clone()
 env_thirdparty.disable_warnings()
 env_thirdparty.add_source_files(thirdparty_obj, source_paths(thirdparty_sources_common))
 env.modules_sources += thirdparty_obj
@@ -122,7 +106,7 @@ env.modules_sources += thirdparty_obj
 
 module_obj = []
 
-env_jpeg_turbo.add_source_files(module_obj, "*.cpp")
+env_jpg.add_source_files(module_obj, "*.cpp")
 env.modules_sources += module_obj
 
 # Needed to force rebuilding the module files when the thirdparty library is updated.

modules/jpg/image_loader_libjpeg_turbo.cpp

@@ -50,9 +50,9 @@ Error jpeg_turbo_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer,
 	const TJCS colorspace = (TJCS)tj3Get(tj_instance, TJPARAM_COLORSPACE);
 
 	if (tj3Get(tj_instance, TJPARAM_PRECISION) > 8) {
-		// proceed anyway and convert to rgb8?
+		// Proceed anyway and convert to rgb8?
 		tj3Destroy(tj_instance);
-		return ERR_UNAVAILABLE; // TODO what return code to use for unsupported image formats?
+		return ERR_UNAVAILABLE;
 	}
 
 	TJPF tj_pixel_format;
@@ -61,7 +61,7 @@ Error jpeg_turbo_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer,
 		tj_pixel_format = TJPF_GRAY;
 		gd_pixel_format = Image::FORMAT_L8;
 	} else {
-		// force everything else (RGB, CMYK etc) into RGB8
+		// Force everything else (RGB, CMYK etc) into RGB8.
 		tj_pixel_format = TJPF_RGB;
 		gd_pixel_format = Image::FORMAT_RGB8;
 	}
@@ -119,7 +119,7 @@ static Vector<uint8_t> _jpeg_turbo_buffer_save_func(const Ref<Image> &p_img, flo
 	}
 
 	if (image->get_format() != Image::FORMAT_RGB8) {
-		// TODO allow grayscale L8?
+		// Allow grayscale L8?
 		image = image->duplicate();
 		image->convert(Image::FORMAT_RGB8);
 	}
@@ -142,7 +142,8 @@ static Vector<uint8_t> _jpeg_turbo_buffer_save_func(const Ref<Image> &p_img, flo
 		ERR_FAIL_V_MSG(output, "Couldn't set jpg subsamples");
 	}
 
-	// TODO set colorspace?
+	// If the godot image format is `Image::FORMAT_L8` we could set the appropriate
+	// colour space here rather than defaulting to RGB.
 
 	unsigned char *jpeg_buff = NULL;
 	size_t jpeg_size = 0;

thirdparty/README.md

@@ -488,20 +488,21 @@ Patches:
 ## libjpeg-turbo
 
 - Upstream: https://github.com/libjpeg-turbo/libjpeg-turbo
-- Version: git (adbb328159b5558e846690c49f9458deccbb0f43, 2025)
-- License: TurboJPEG modified BSD-3-Clause, IJG License
+- Version: git (20ade4dea9589515a69793e447a6c6220b464535, 2024)
+- License: BSD-3-Clause and IJG
 
 Files extracted from upstream source:
 
--  src/*.{c,h} except for:
-	- cdjpeg.c, cjpeg.c, djpeg,c, example.c, jcdiffct.c jclhuff.c, jclossls.c, jpegtran.c, rdbmp.c, rdcolmap.c, rdgif.c, rdjpgcom.c, rdppm.c, rdswitch.c, rdtarga.c, strtestc, tjbench.c, tjcomp.c, tjdecomp.c, tjtran.c, tjunittest.c, tjutil.c, wrbmp.c, wrgif.c, wrjpgcom.c, wrppm.c, wrtarga.c
+- `src/*.{c,h}` except for:
+  * `cdjpeg.c cjpeg.c djpeg.c example.c jcdiffct.c jclhuff.c jclossls.c jcstest.c jddiffct.c jdlhuff.c jdlossls.c jlossls.h jpegtran.c rdbmp.c rdcolmap.c rdgif.c rdjpgcom.c rdppm.c rdswitch.c rdtarga.c strtest.c tjbench.c tjcomp.c tjdecomp.c tjtran.c tjunittest.c tjutil.c wrbmp.c wrgif.c wrjpgcom.c wrppm.c wrtarga.c`
 - `LICENSE.md`
 - `README.ijg`
 
 Patches:
 
-- `000-cmake_generated_headers.patch`
-- `001-disable-16bitlossless.patch`
+- `0001-cmake-generated-headers.patch` (GH-104347)
+- `0002-disable-16bitlossless.patch` (GH-104347)
+- `0003-remove-bmp-ppm-support.patch` (GH-104347)
 
 ## libktx
 

thirdparty/basis_universal/encoder/basisu_astc_hdr_6x6_enc.h

@@ -16,7 +16,7 @@ namespace astc_6x6_hdr
 	{
 		// Important: The Delta ITP colorspace error metric we use internally makes several assumptions about the nature of the HDR RGB inputs supplied to the encoder.
 		// This encoder computes colorspace error in the ICtCp (or more accurately the delta ITP, where CT is scaled by .5 vs. ICtCp to become T) colorspace, so getting this correct is important.
-		// By default the encoder assumes the input is in absolute luminance (in nits or candela per square meter, cd/m²), specified as positive-only linear light RGB, using the REC 709 colorspace gamut (but NOT the sRGB transfer function, i.e. linear light).
+		// By default the encoder assumes the input is in absolute luminance (in nits or candela per square meter, cd/m²), specified as positive-only linear light RGB, using the REC 709 colorspace gamut (but NOT the sRGB transfer function, i.e. linear light).
 		// If the m_rec2020_bt2100_color_gamut flag is true, the input colorspace is treated as REC 2020/BT.2100 (which is wider than 709).
 		// For SDR/LDR->HDR upconversion, the REC 709 sRGB input should be converted to linear light (sRGB->linear) and the resulting normalized linear RGB values scaled by either 80 or 100 nits (the luminance of a typical SDR monitor). 
 		// SDR upconversion to normalized [0,1] (i.e. non-absolute) luminances may work but is not supported because ITP errors will not be predicted correctly.

thirdparty/libjpeg-turbo/patches/000-cmake_generated_headers.patch renamed to thirdparty/libjpeg-turbo/patches/0001-cmake-generated-headers.patch

@@ -12,10 +12,10 @@ index 0000000000..22ed4b4c32
 +#define JPEG_LIB_VERSION  62
 +
 +/* libjpeg-turbo version */
-+#define LIBJPEG_TURBO_VERSION  3.1.1
++#define LIBJPEG_TURBO_VERSION  3.1.0
 +
 +/* libjpeg-turbo version in integer form */
-+#define LIBJPEG_TURBO_VERSION_NUMBER  3001001
++#define LIBJPEG_TURBO_VERSION_NUMBER  3001000
 +
 +/* Support arithmetic encoding when using 8-bit samples */
 +#define C_ARITH_CODING_SUPPORTED 1

thirdparty/libjpeg-turbo/patches/001-disable-16bitlossless.patch renamed to thirdparty/libjpeg-turbo/patches/0002-disable-16bitlossless.patch

@@ -195,19 +195,13 @@ 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

thirdparty/libjpeg-turbo/patches/002-remove-bmp-ppm-support.patch renamed to thirdparty/libjpeg-turbo/patches/0003-remove-bmp-ppm-support.patch

@@ -130,8 +130,6 @@ _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;
@@ -189,8 +187,6 @@ _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;