diff --git a/packaging/3rdParty-devel/Licenses/jpeg/README b/packaging/3rdParty-devel/Licenses/jpeg/README index d288f41b8..0f4ee1522 100644 --- a/packaging/3rdParty-devel/Licenses/jpeg/README +++ b/packaging/3rdParty-devel/Licenses/jpeg/README @@ -1,7 +1,7 @@ The Independent JPEG Group's JPEG software ========================================== -README for release 9e of 16-Jan-2022 +README for release 9f of 14-Jan-2024 ==================================== This distribution contains the ninth public release of the Independent JPEG @@ -116,7 +116,7 @@ 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-2022, Thomas G. Lane, Guido Vollbeding. +This software is copyright (C) 1991-2024, Thomas G. Lane, Guido Vollbeding. All Rights Reserved except as specified below. Permission is hereby granted to use, copy, modify, and distribute this @@ -240,9 +240,9 @@ The "official" archive site for this software is www.ijg.org. The most recent released version can always be found there in directory "files". This particular version will be archived in Windows-compatible "zip" archive format as -https://www.ijg.org/files/jpegsr9e.zip, and +https://www.ijg.org/files/jpegsr9f.zip, and in Unix-compatible "tar.gz" archive format as -https://www.ijg.org/files/jpegsrc.v9e.tar.gz. +https://www.ijg.org/files/jpegsrc.v9f.tar.gz. The JPEG FAQ (Frequently Asked Questions) article is a source of some general information about JPEG. @@ -371,4 +371,4 @@ to overcome the limitations of the original JPEG specification, and is the first true source reference JPEG codec. More features are being prepared for coming releases... -Please send bug reports, offers of help, etc. to jpeg-info@jpegclub.org. +Please send bug reports, offers of help, etc. to jpeg-info@ijg.org. diff --git a/packaging/3rdParty-devel/Licenses/jpeg/libjpeg.txt b/packaging/3rdParty-devel/Licenses/jpeg/libjpeg.txt index 546a86e2d..37068b9f1 100644 --- a/packaging/3rdParty-devel/Licenses/jpeg/libjpeg.txt +++ b/packaging/3rdParty-devel/Licenses/jpeg/libjpeg.txt @@ -1,6 +1,6 @@ USING THE IJG JPEG LIBRARY -Copyright (C) 1994-2019, Thomas G. Lane, Guido Vollbeding. +Copyright (C) 1994-2023, Thomas G. Lane, Guido Vollbeding. This file is part of the Independent JPEG Group's software. For conditions of distribution and use, see the accompanying README file. @@ -285,8 +285,9 @@ that's why the error handler must be initialized first. As previously mentioned, the JPEG library delivers compressed data to a "data destination" module. The library includes one data destination -module which knows how to write to a stdio stream. You can use your own -destination module if you want to do something else, as discussed later. +module which knows how to write to memory or to a file (or any stdio stream). +You can use your own destination module if you want to do something else, +as discussed later. If you use the standard destination module, you must open the target stdio stream beforehand. Typical code for this step looks like: @@ -532,8 +533,8 @@ both compression and decompression objects.) As previously mentioned, the JPEG library reads compressed data from a "data source" module. The library includes one data source module which knows how -to read from a stdio stream. You can use your own source module if you want -to do something else, as discussed later. +to read from memory or from a file (or any stdio stream). You can use your +own source module if you want to do something else, as discussed later. If you use the standard source module, you must open the source stdio stream beforehand. Typical code for this step looks like: @@ -886,7 +887,7 @@ int block_size Larger values produce higher compression, smaller values produce higher quality. An exact DCT stage is possible with 1 or 2. - With the default quality of 75 and default Luminance qtable + With the default quality of 75 and default quantization tables the DCT+Quantization stage is lossless for value 1. Note that values other than 8 require a SmartScale capable decoder, introduced with IJG JPEG 8. Setting the block_size parameter for diff --git a/packaging/3rdParty-devel/patches/jpeg-9f.CMakeLists.txt b/packaging/3rdParty-devel/patches/jpeg-9f.CMakeLists.txt new file mode 100644 index 000000000..6f54b92dd --- /dev/null +++ b/packaging/3rdParty-devel/patches/jpeg-9f.CMakeLists.txt @@ -0,0 +1,108 @@ +# +#============================================================================== +# +# file : CMakeLists.txt +# created : Feb 11 2020 +# copyright : (C) 2020 Joe Thompson +# email : beaglejoe@users.sourceforge.net +# version : $Id: jpeg-9e.CMakeLists.txt 7914 2022-01-17 17:16:37Z beaglejoe $ +# +#============================================================================== +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +#============================================================================== +# +cmake_minimum_required(VERSION 2.8) + +project(jpeg C) + +set(VERSION "9f") + + +include_directories(include) + +set(jpeg_SOURCES jaricom.c + jcapimin.c + jcapistd.c + jcarith.c + jccoefct.c + jccolor.c + jcdctmgr.c + jchuff.c + jcinit.c + jcmainct.c + jcmarker.c + jcmaster.c + jcomapi.c + jcparam.c + jcprepct.c + jcsample.c + jctrans.c + jdapimin.c + jdapistd.c + jdarith.c + jdatadst.c + jdatasrc.c + jdcoefct.c + jdcolor.c + jddctmgr.c + jdhuff.c + jdinput.c + jdmainct.c + jdmarker.c + jdmaster.c + jdmerge.c + jdpostct.c + jdsample.c + jdtrans.c + jerror.c + jfdctflt.c + jfdctfst.c + jfdctint.c + jidctflt.c + jidctfst.c + jidctint.c + jmemmgr.c + jmemnobs.c + jquant1.c + jquant2.c + jutils.c + ) + +set(jpeg_HEADERS jconfig.h + jdct.h + jerror.h + jinclude.h + jmemsys.h + jmorecfg.h + jpegint.h + jpeglib.h + jversion.h + ) + + +add_library(jpeg STATIC ${jpeg_SOURCES} ${jpeg_HEADERS}) + + +install(FILES jconfig.h + jerror.h + jmorecfg.h + jpeglib.h + DESTINATION include) + +install(TARGETS jpeg + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) \ No newline at end of file diff --git a/packaging/3rdParty-devel/thirdpartydefinitions.cmake b/packaging/3rdParty-devel/thirdpartydefinitions.cmake index bd9c4e5e2..48abeae11 100644 --- a/packaging/3rdParty-devel/thirdpartydefinitions.cmake +++ b/packaging/3rdParty-devel/thirdpartydefinitions.cmake @@ -101,11 +101,11 @@ set(PLIB_URL http://plib.sourceforge.net/dist/${PLIB_FILE}) set(PLIB_HASH SHA256=485b22bf6fdc0da067e34ead5e26f002b76326f6371e2ae006415dea6a380a32) # jpeg -set(JPEG_VERSION 9e) +set(JPEG_VERSION 9f) set(JPEG_PROJECT jpeg-${JPEG_VERSION}) set(JPEG_FILE jpegsrc.v${JPEG_VERSION}.tar.gz) set(JPEG_URL https://ijg.org/files/${JPEG_FILE}) -set(JPEG_HASH SHA256=4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d) +set(JPEG_HASH SHA256=04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b) # freeSOLID set(FREESOLID_VERSION 2.1.2)