[packages/libjpeg12] - updated to 9d - updated 12bit patch
qboosh
qboosh at pld-linux.org
Sat Aug 22 18:45:21 CEST 2020
commit dd2bac0fcfb3b075c35b222783213294b5790438
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Aug 22 18:47:43 2020 +0200
- updated to 9d
- updated 12bit patch
libjpeg-12bit.patch | 174 +++++++++++++++++++++++++++++-----------------------
libjpeg12.spec | 4 +-
2 files changed, 100 insertions(+), 78 deletions(-)
---
diff --git a/libjpeg12.spec b/libjpeg12.spec
index 2efd83d..8ae55d7 100644
--- a/libjpeg12.spec
+++ b/libjpeg12.spec
@@ -1,12 +1,12 @@
Summary: Library for handling different JPEG files - 12-bit version
Summary(pl.UTF-8): Biblioteka do manipulacji plikami w formacie JPEG - wersja 12-bitowa
Name: libjpeg12
-Version: 9c
+Version: 9d
Release: 1
License: distributable
Group: Libraries
Source0: http://www.ijg.org/files/jpegsrc.v%{version}.tar.gz
-# Source0-md5: 93c62597eeef81a84d988bccbda1e990
+# Source0-md5: 693a4e10906e66467ca21f045547fe15
Patch0: libjpeg-maxmem-sysconf.patch
Patch1: libjpeg-12bit.patch
URL: http://www.ijg.org/
diff --git a/libjpeg-12bit.patch b/libjpeg-12bit.patch
index ad23764..53dd7e0 100644
--- a/libjpeg-12bit.patch
+++ b/libjpeg-12bit.patch
@@ -1,97 +1,119 @@
---- jpeg-8d.orig/jcparam.c 2008-12-30 12:38:14.000000000 +0100
-+++ jpeg-8d/jcparam.c 2012-01-30 18:37:08.314031841 +0100
-@@ -195,6 +195,7 @@
- }
+--- jpeg-9d/jcomapi.c.orig 2019-01-23 21:18:26.000000000 +0100
++++ jpeg-9d/jcomapi.c 2020-08-22 18:12:39.274326726 +0200
+@@ -109,7 +109,6 @@
+ /*
+ * Set up the standard Huffman tables (cf. JPEG standard section K.3).
+- * IMPORTANT: these are only valid for 8-bit data precision!
+ * (Would jutils.c be a more reasonable place to put this?)
+ */
+
+@@ -120,6 +119,9 @@
+ const UINT8 *bits, *val;
+ int nsymbols, len;
+#if BITS_IN_JSAMPLE == 8
- LOCAL(void)
- std_huff_tables (j_compress_ptr cinfo)
- /* Set up the standard Huffman tables (cf. JPEG standard section K.3) */
-@@ -269,6 +270,83 @@
- add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[1],
- bits_ac_chrominance, val_ac_chrominance);
- }
-+#endif /* BITS_IN_JSAMPLE == 8 */
++/* IMPORTANT: these are only valid for 8-bit data precision! */
+
-+#if BITS_IN_JSAMPLE == 12
-+LOCAL(void)
-+std_huff_tables (j_compress_ptr cinfo)
+ static const UINT8 bits_dc_luminance[17] =
+ { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 };
+ static const UINT8 val_dc_luminance[] =
+@@ -179,6 +181,95 @@
+ 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
+ 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
+ 0xf9, 0xfa };
++#elif BITS_IN_JSAMPLE == 12
+/*
+ * Note: these are not really "standard" since the specification includes
+ * no 12bit tables. But they should work with any image, and at least
+ * moderately adequate as default tables.
+ * https://sourceforge.net/tracker/?func=detail&aid=2809979&group_id=159521&atid=812162
+ */
-+{
+ static const UINT8 bits_dc_luminance[17] =
-+ { 0, 0, 2, 3, 1, 0, 3, 1, 0, 3, 1, 1, 1, 0, 0, 0 };
++ { /* 0-base */ 0, 0, 2, 3, 1, 0, 3, 1, 0, 3, 1, 1, 1, 0, 0, 0 };
+ static const UINT8 val_dc_luminance[] =
-+ { 11, 12, 9, 10, 13, 8, 6, 7, 14, 5, 0, 3, 4, 1, 15, 2 };
++ { 11, 12, 9, 10, 13, 8, 6, 7, 14, 5, 0, 3, 4, 1, 15, 2 };
+
+ static const UINT8 bits_dc_chrominance[17] =
-+ { 0, 0, 2, 2, 2, 3, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 };
++ { /* 0-base */ 0, 0, 2, 2, 2, 3, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0 };
+ static const UINT8 val_dc_chrominance[] =
-+ { 9, 10, 8, 11, 7, 12, 5, 6, 13, 14, 4, 3, 2, 1, 0, 15 };
++ { 9, 10, 8, 11, 7, 12, 5, 6, 13, 14, 4, 3, 2, 1, 0, 15 };
+
+ static const UINT8 bits_ac_luminance[17] =
-+ { 0, 0, 1, 4, 2, 2, 2, 1, 4, 1, 2, 0, 1, 0, 1, 0, 235 };
-+
++ { /* 0-base */ 0, 0, 1, 4, 2, 2, 2, 1, 4, 1, 2, 0, 1, 0, 1, 0, 235 };
+ static const UINT8 val_ac_luminance[] =
-+ {
-+0x02,0x01,0x03,0x04,0x05,0x06,0x07,0x08,0x12,0x09,0x11,0x13,0x00,0x14,0x21,0x22
-+,0x15,0x0a,0x23,0x31,0x16,0x32,0x17,0x24,0x33,0x41,0x18,0x25,0x42,0x51,0x0b,0x26
-+,0x19,0x43,0x52,0x61,0x35,0x62,0x71,0x0c,0x0d,0x0e,0x0f,0x10,0x1a,0x1b,0x1c,0x1d
-+,0x1e,0x1f,0x20,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,0x30,0x34,0x36,0x37
-+,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,0x40,0x44,0x45,0x46,0x47,0x48,0x49,0x4a
-+,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x5b,0x5c
-+,0x5d,0x5e,0x5f,0x60,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e
-+,0x6f,0x70,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f
-+,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f
-+,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0x9b,0x9c,0x9d,0x9e,0x9f
-+,0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf
-+,0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,0xbe,0xbf
-+,0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf
-+,0xd0,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xdb,0xdc,0xdd,0xde,0xdf
-+,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xeb,0xec,0xed,0xee,0xef
-+,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff
-+ };
++ { 0x02, 0x01, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
++ 0x12, 0x09, 0x11, 0x13, 0x00, 0x14, 0x21, 0x22,
++ 0x15, 0x0a, 0x23, 0x31, 0x16, 0x32, 0x17, 0x24,
++ 0x33, 0x41, 0x18, 0x25, 0x42, 0x51, 0x0b, 0x26,
++ 0x19, 0x43, 0x52, 0x61, 0x35, 0x62, 0x71, 0x0c,
++ 0x0d, 0x0e, 0x0f, 0x10, 0x1a, 0x1b, 0x1c, 0x1d,
++ 0x1e, 0x1f, 0x20, 0x27, 0x28, 0x29, 0x2a, 0x2b,
++ 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x34, 0x36, 0x37,
++ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
++ 0x40, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a,
++ 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x53, 0x54,
++ 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c,
++ 0x5d, 0x5e, 0x5f, 0x60, 0x63, 0x64, 0x65, 0x66,
++ 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e,
++ 0x6f, 0x70, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
++ 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
++ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
++ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
++ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
++ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
++ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
++ 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
++ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
++ 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
++ 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
++ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
++ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
++ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
++ 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
++ 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
++ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
++ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff };
+
+ static const UINT8 bits_ac_chrominance[17] =
-+ { 0, 0, 1, 3, 2, 5, 1, 5, 5, 3, 7, 4, 4, 3, 4, 6, 203 };
-+ static const UINT8 val_ac_chrominance[] =
-+ {
-+0x01,0x02,0x03,0x11,0x04,0x21,0x00,0x05,0x06,0x12,0x31,0x41,0x07,0x13,0x22,0x51
-+,0x61,0x08,0x14,0x32,0x71,0x81,0x42,0x91,0xa1,0x09,0x15,0x23,0x52,0xb1,0xc1,0xf0
-+,0x16,0x62,0xd1,0xe1,0x0a,0x24,0x72,0xf1,0x17,0x82,0x92,0x33,0x43,0x53,0xb2,0x0b
-+,0x0c,0x18,0x35,0xa2,0xc2,0x0d,0x0e,0x0f,0x10,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f
-+,0x20,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,0x30,0x34,0x36,0x37
-+,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,0x40,0x44,0x45,0x46,0x47,0x48,0x49,0x4a
-+,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x5b,0x5c,0x5d
-+,0x5e,0x5f,0x60,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f
-+,0x70,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f,0x80,0x83
-+,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x93,0x94,0x95
-+,0x96,0x97,0x98,0x99,0x9a,0x9b,0x9c,0x9d,0x9e,0x9f,0xa0,0xa3,0xa4,0xa5,0xa6,0xa7
-+,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9
-+,0xba,0xbb,0xbc,0xbd,0xbe,0xbf,0xc0,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb
-+,0xcc,0xcd,0xce,0xcf,0xd0,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xdb,0xdc
-+,0xdd,0xde,0xdf,0xe0,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xeb,0xec,0xed
-+,0xee,0xef,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff
-+ };
-+
-+ add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[0],
-+ bits_dc_luminance, val_dc_luminance);
-+ add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[0],
-+ bits_ac_luminance, val_ac_luminance);
-+ add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[1],
-+ bits_dc_chrominance, val_dc_chrominance);
-+ add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[1],
-+ bits_ac_chrominance, val_ac_chrominance);
-+}
-+#endif /* BITS_IN_JSAMPLE == 12 */
-
++ { /* 0-base */ 0, 0, 1, 3, 2, 5, 1, 5, 5, 3, 7, 4, 4, 3, 4, 6, 203 };
++ static const UINT8 val_ac_chrominance[] =
++ { 0x01, 0x02, 0x03, 0x11, 0x04, 0x21, 0x00, 0x05,
++ 0x06,0x12,0x31,0x41,0x07,0x13,0x22,0x51,
++ 0x61,0x08,0x14,0x32,0x71,0x81,0x42,0x91,
++ 0xa1,0x09,0x15,0x23,0x52,0xb1,0xc1,0xf0,
++ 0x16,0x62,0xd1,0xe1,0x0a,0x24,0x72,0xf1,
++ 0x17,0x82,0x92,0x33,0x43,0x53,0xb2,0x0b,
++ 0x0c,0x18,0x35,0xa2,0xc2,0x0d,0x0e,0x0f,
++ 0x10,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,
++ 0x20,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,
++ 0x2c,0x2d,0x2e,0x2f,0x30,0x34,0x36,0x37,
++ 0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
++ 0x40,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,
++ 0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x54,0x55,
++ 0x56,0x57,0x58,0x59,0x5a,0x5b,0x5c,0x5d,
++ 0x5e,0x5f,0x60,0x63,0x64,0x65,0x66,0x67,
++ 0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,
++ 0x70,0x73,0x74,0x75,0x76,0x77,0x78,0x79,
++ 0x7a,0x7b,0x7c,0x7d,0x7e,0x7f,0x80,0x83,
++ 0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,
++ 0x8c,0x8d,0x8e,0x8f,0x90,0x93,0x94,0x95,
++ 0x96,0x97,0x98,0x99,0x9a,0x9b,0x9c,0x9d,
++ 0x9e,0x9f,0xa0,0xa3,0xa4,0xa5,0xa6,0xa7,
++ 0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,
++ 0xb0,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,
++ 0xba,0xbb,0xbc,0xbd,0xbe,0xbf,0xc0,0xc3,
++ 0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,
++ 0xcc,0xcd,0xce,0xcf,0xd0,0xd2,0xd3,0xd4,
++ 0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xdb,0xdc,
++ 0xdd,0xde,0xdf,0xe0,0xe2,0xe3,0xe4,0xe5,
++ 0xe6,0xe7,0xe8,0xe9,0xea,0xeb,0xec,0xed,
++ 0xee,0xef,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,
++ 0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff };
++#endif
- /*
+ if (cinfo->is_decompressor) {
+ if (isDC)
--- jpeg-8d.orig/jdct.h 2004-03-06 20:18:30.000000000 +0100
+++ jpeg-8d/jdct.h 2012-01-30 18:50:43.737392477 +0100
@@ -160,6 +160,77 @@
@@ -397,15 +419,15 @@
-AC_CONFIG_FILES([Makefile libjpeg.pc])
+AC_CONFIG_FILES([Makefile libjpeg12.pc:libjpeg.pc.in])
AC_OUTPUT
---- jpeg-9c/libjpeg.pc.in.orig 2018-04-14 08:59:59.494085415 +0200
-+++ jpeg-9c/libjpeg.pc.in 2018-04-14 09:00:18.150751868 +0200
+--- jpeg-9d/libjpeg.pc.in.orig
++++ jpeg-9d/libjpeg.pc.in
@@ -4,7 +4,7 @@
includedir=@includedir@
Name: libjpeg
-Description: Reads and writes JPEG files
+Description: Reads and writes JPEG files, 12bpp
- Version: @JPEG_LIB_VERSION@
+ Version: @JPEG_LIB_VERSION_MAJOR at .@JPEG_LIB_VERSION_MINOR at .0
-Libs: -L${libdir} -ljpeg
+Libs: -L${libdir} -ljpeg12
Cflags: -I${includedir}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libjpeg12.git/commitdiff/dd2bac0fcfb3b075c35b222783213294b5790438
More information about the pld-cvs-commit
mailing list