GraphicsMagick: jp2/* Update lib jasper from 1.900.1 to 1.900.2.
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.34864.1671668694.1459.graphicsmagick-commit@lists.sourceforge.net> |
changeset 3605c291d167 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=3605c291d167 summary: jp2/* Update lib jasper from 1.900.1 to 1.900.2. diffstat: ChangeLog | 4 + VisualMagick/magick/magick_config.h.in | 4 +- VisualMagick/tests/run_constitute.bat | 2 +- VisualMagick/tests/run_rwblob.bat | 2 +- VisualMagick/tests/run_rwfile.bat | 2 +- VisualMagick/tests/runtest.bat | 12 +- jp2/ChangeLog | 728 + jp2/INSTALL | 19 + jp2/Makefile.am | 29 +- jp2/Makefile.in | 679 +- jp2/NEWS | 21 +- jp2/ac_aux/compile | 347 + jp2/ac_aux/config.guess | 1420 + jp2/ac_aux/config.sub | 1798 + jp2/ac_aux/depcomp | 791 + jp2/ac_aux/install-sh | 527 + jp2/ac_aux/ltmain.sh | 9655 ++++++ jp2/ac_aux/missing | 215 + jp2/ac_m4/libtool.m4 | 7992 +++++ jp2/ac_m4/ltoptions.m4 | 384 + jp2/ac_m4/ltsugar.m4 | 123 + jp2/ac_m4/ltversion.m4 | 23 + jp2/ac_m4/m4_ax_generate_changelog.m4 | 99 + jp2/acaux/config.guess | 1411 - jp2/acaux/config.sub | 1500 - jp2/acaux/depcomp | 423 - jp2/acaux/install-sh | 251 - jp2/acaux/ltmain.sh | 6911 ---- jp2/acaux/missing | 336 - jp2/acaux/mkinstalldirs | 99 - jp2/aclocal.m4 | 7365 +---- jp2/configure | 30465 +++++++------------- jp2/configure.ac | 30 +- jp2/jasper.spec | 4 +- jp2/pkgconfig/Makefile.am | 5 + jp2/pkgconfig/Makefile.in | 509 + jp2/pkgconfig/jasper.pc.in | 11 + jp2/src/Makefile.in | 514 +- jp2/src/appl/Makefile.am | 2 +- jp2/src/appl/Makefile.in | 640 +- jp2/src/appl/jasper.c | 6 +- jp2/src/libjasper/Makefile.in | 637 +- jp2/src/libjasper/base/Makefile.am | 2 +- jp2/src/libjasper/base/Makefile.in | 432 +- jp2/src/libjasper/base/jas_debug.c | 2 +- jp2/src/libjasper/base/jas_icc.c | 12 +- jp2/src/libjasper/base/jas_init.c | 2 +- jp2/src/libjasper/base/jas_seq.c | 2 +- jp2/src/libjasper/base/jas_stream.c | 6 +- jp2/src/libjasper/base/jas_string.c | 2 +- jp2/src/libjasper/bmp/Makefile.am | 2 +- jp2/src/libjasper/bmp/Makefile.in | 432 +- jp2/src/libjasper/include/Makefile.in | 514 +- jp2/src/libjasper/include/jasper/Makefile.in | 425 +- jp2/src/libjasper/include/jasper/jas_config.h | 10 +- jp2/src/libjasper/include/jasper/jas_config.h.in | 12 +- jp2/src/libjasper/include/jasper/jas_config2.h | 2 - jp2/src/libjasper/jp2/Makefile.am | 2 +- jp2/src/libjasper/jp2/Makefile.in | 432 +- jp2/src/libjasper/jp2/jp2_dec.c | 5 + jp2/src/libjasper/jpc/Makefile.am | 2 +- jp2/src/libjasper/jpc/Makefile.in | 432 +- jp2/src/libjasper/jpc/jpc_cs.c | 38 +- jp2/src/libjasper/jpc/jpc_dec.c | 16 +- jp2/src/libjasper/jpc/jpc_enc.c | 8 +- jp2/src/libjasper/jpc/jpc_mqdec.c | 6 +- jp2/src/libjasper/jpc/jpc_mqenc.c | 2 +- jp2/src/libjasper/jpc/jpc_qmfb.c | 64 - jp2/src/libjasper/jpc/jpc_t1enc.c | 4 +- jp2/src/libjasper/jpc/jpc_t2cod.c | 2 +- jp2/src/libjasper/jpc/jpc_t2enc.c | 4 +- jp2/src/libjasper/jpg/Makefile.am | 2 +- jp2/src/libjasper/jpg/Makefile.in | 432 +- jp2/src/libjasper/mif/Makefile.am | 2 +- jp2/src/libjasper/mif/Makefile.in | 432 +- jp2/src/libjasper/mif/mif_cod.c | 2 +- jp2/src/libjasper/pgx/Makefile.am | 2 +- jp2/src/libjasper/pgx/Makefile.in | 432 +- jp2/src/libjasper/pnm/Makefile.am | 2 +- jp2/src/libjasper/pnm/Makefile.in | 432 +- jp2/src/libjasper/ras/Makefile.am | 2 +- jp2/src/libjasper/ras/Makefile.in | 432 +- jp2/src/libjasper/ras/ras_enc.c | 6 +- jp2/src/msvc/Makefile.in | 265 +- 84 files changed, 41878 insertions(+), 39434 deletions(-) diffs (truncated from 90191 to 500 lines): diff -r c439972d424f -r 3605c291d167 ChangeLog --- a/ChangeLog Wed Dec 21 17:35:50 2022 -0600 +++ b/ChangeLog Thu Dec 22 01:27:34 2022 +0100 @@ -1,3 +1,7 @@ +2022-12-22 Fojtik Jaroslav <[email protected]> + + * jp2/* Update lib jasper from 1.900.1 to 1.900.2. + 2022-12-21 Bob Friesenhahn <[email protected]> * coders/jxl.c (ReadJXLImage): Now based on diff -r c439972d424f -r 3605c291d167 VisualMagick/magick/magick_config.h.in --- a/VisualMagick/magick/magick_config.h.in Wed Dec 21 17:35:50 2022 -0600 +++ b/VisualMagick/magick/magick_config.h.in Thu Dec 22 01:27:34 2022 +0100 @@ -148,7 +148,7 @@ #define HasJBIG // Define to use the Jasper JPEG v2 library (3.0.0 or later is recommended) -#undef HasJP2 +#define HasJP2 // Define to use the IJG JPEG v1 library #define HasJPEG @@ -213,7 +213,7 @@ // Optional: Specify where operating system specific files are installed // #define MagickLibPath "c:\\GraphicsMagick\\" -// Optional: Specify name of the library that contains the mgk resource files +// Optional: Specify name of the library that contains the mgk resource files // #define MagickLibName "MyGraphicsMagick.dll" // Optional: Specify where operating system independent files are installed diff -r c439972d424f -r 3605c291d167 VisualMagick/tests/run_constitute.bat --- a/VisualMagick/tests/run_constitute.bat Wed Dec 21 17:35:50 2022 -0600 +++ b/VisualMagick/tests/run_constitute.bat Thu Dec 22 01:27:34 2022 +0100 @@ -1,5 +1,5 @@ @echo off -set exedir=..\bin\ +set exedir=..\binmt\ set srcdir=..\..\tests\ %exedir%constitute.exe -storagetype char %srcdir%input_truecolor.miff RGB %exedir%constitute.exe -storagetype char %srcdir%input_truecolor.miff rgb diff -r c439972d424f -r 3605c291d167 VisualMagick/tests/run_rwblob.bat --- a/VisualMagick/tests/run_rwblob.bat Wed Dec 21 17:35:50 2022 -0600 +++ b/VisualMagick/tests/run_rwblob.bat Thu Dec 22 01:27:34 2022 +0100 @@ -1,5 +1,5 @@ @echo off -set exedir=..\bin\ +set exedir=..\binmt\ set srcdir=..\..\tests\ set events="exception" set bilevel_file=%srcdir%input_bilevel.miff diff -r c439972d424f -r 3605c291d167 VisualMagick/tests/run_rwfile.bat --- a/VisualMagick/tests/run_rwfile.bat Wed Dec 21 17:35:50 2022 -0600 +++ b/VisualMagick/tests/run_rwfile.bat Thu Dec 22 01:27:34 2022 +0100 @@ -1,5 +1,5 @@ @echo off -set exedir=..\bin\ +set exedir=..\binmt\ set srcdir=..\..\tests\ set events="exception" set bilevel_file=%srcdir%input_bilevel.miff diff -r c439972d424f -r 3605c291d167 VisualMagick/tests/runtest.bat --- a/VisualMagick/tests/runtest.bat Wed Dec 21 17:35:50 2022 -0600 +++ b/VisualMagick/tests/runtest.bat Thu Dec 22 01:27:34 2022 +0100 @@ -140,24 +140,24 @@ if {%1}=={blob} goto :_doblob if {%1}=={file} goto :_dofile :_dofile -..\bin\rwfile ..\..\PerlMagick\t\input_p4.pbm %TYPE% +..\binmt\rwfile ..\..\PerlMagick\t\input_p4.pbm %TYPE% if not %ERRORLEVEL% EQU 0 goto :_problem set /a COUNT += 1 -..\bin\rwfile ..\..\PerlMagick\t\input_p5.pgm %TYPE% +..\binmt\rwfile ..\..\PerlMagick\t\input_p5.pgm %TYPE% if not %ERRORLEVEL% EQU 0 goto :_problem set /a COUNT += 1 -..\bin\rwfile ..\..\PerlMagick\t\input_p6.ppm %TYPE% +..\binmt\rwfile ..\..\PerlMagick\t\input_p6.ppm %TYPE% if not %ERRORLEVEL% EQU 0 goto :_problem set /a COUNT += 1 if not {%1}=={both} goto :EOF :_doblob -..\bin\rwblob ..\..\PerlMagick\t\input_p4.pbm %TYPE% +..\binmt\rwblob ..\..\PerlMagick\t\input_p4.pbm %TYPE% if not %ERRORLEVEL% EQU 0 goto :_problem set /a COUNT += 1 -..\bin\rwblob ..\..\PerlMagick\t\input_p5.pgm %TYPE% +..\binmt\rwblob ..\..\PerlMagick\t\input_p5.pgm %TYPE% if not %ERRORLEVEL% EQU 0 goto :_problem set /a COUNT += 1 -..\bin\rwblob ..\..\PerlMagick\t\input_p6.ppm %TYPE% +..\binmt\rwblob ..\..\PerlMagick\t\input_p6.ppm %TYPE% if not %ERRORLEVEL% EQU 0 goto :_problem set /a COUNT += 1 goto :EOF diff -r c439972d424f -r 3605c291d167 jp2/ChangeLog --- a/jp2/ChangeLog Wed Dec 21 17:35:50 2022 -0600 +++ b/jp2/ChangeLog Thu Dec 22 01:27:34 2022 +0100 @@ -0,0 +1,728 @@ +commit 063ab4e30d9dff0b1142ca659f4af14ee1ec4296 +Author: Michael Adams <[email protected]> +Date: Tue Oct 4 20:19:58 2016 -0700 + + Bump the version number + +M configure.ac + +commit 2f7f2d1adc1100b41d96d04cc548fc55832cb645 +Author: Michael Adams <[email protected]> +Date: Tue Oct 4 20:13:25 2016 -0700 + + More changes for an automatically generated ChangeLog + +M NEWS + +commit c0cdb38de26763acf5c6c11960458beced4215e5 +Author: Michael Adams <[email protected]> +Date: Tue Oct 4 19:58:03 2016 -0700 + + Added automatic ChangeLog generation from git commit history + +M Makefile.am +A ac_m4/m4_ax_generate_changelog.m4 +M configure.ac + +commit be0e91a38b701a0daa943daee99436b63cc7db33 +Author: Michael Adams <[email protected]> +Date: Sun Sep 25 14:44:28 2016 -0700 + + Modified the installation instructions in the INSTALL file to explain + how to install the JasPer software directly from the files in the + git repository (for users who might be unfamiliar with Autotools). + +M INSTALL + +commit 30a262b65b4f6fdb965caaa9d44ae8470cd6d577 +Merge: 9d3a5fc 773e70c +Author: Michael Adams <[email protected]> +Date: Wed Sep 21 23:30:22 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/CVE-2016-1867' + +commit 773e70cbab3ca723bd6431a33c9601417c8e39cd +Merge: 9d3a5fc 980da43 +Author: Michael Adams <[email protected]> +Date: Wed Sep 21 23:28:41 2016 -0700 + + Merge branch 'wip/hughsie/CVE-2016-1867' + of https://github.com/hughsie/jasper into + hughsie-wip/hughsie/CVE-2016-1867 + +commit 9d3a5fc8aa37e09d83772f122d43cb2b2428d9d7 +Merge: 8c0cb3e 7793a89 +Author: Michael Adams <[email protected]> +Date: Wed Sep 21 23:24:47 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/CVE-2014-9029' + +commit 7793a893c252929b4808624655dde8d04ebe4adc +Merge: 8c0cb3e 5dbe57e +Author: Michael Adams <[email protected]> +Date: Wed Sep 21 23:22:21 2016 -0700 + + Merge branch 'wip/hughsie/CVE-2014-9029' + of https://github.com/hughsie/jasper into + hughsie-wip/hughsie/CVE-2014-9029 + +commit 8c0cb3e569094d064fc34891b8ec035b2944789a +Author: Michael Adams <[email protected]> +Date: Wed Sep 21 23:18:28 2016 -0700 + + Use a gzipped tar file for distribution + +M Makefile.am + +commit 9cc3435a48ceaf26ad6e35458e47bac9ab0ae1cb +Author: Michael Adams <[email protected]> +Date: Wed Sep 21 23:00:32 2016 -0700 + + Removed another derived file + +D src/libjasper/include/jasper/jas_config.h + +commit 63dea34b7ea5fb93cb68d2a5268d9209e9c1231e +Author: Michael Adams <[email protected]> +Date: Wed Sep 21 22:53:09 2016 -0700 + + Removed some derived files + +D Makefile.in +D acaux/config.guess +D acaux/config.sub +D acaux/depcomp +D acaux/install-sh +D acaux/ltmain.sh +D acaux/missing +D acaux/mkinstalldirs +D configure +D jasper.spec +D src/Makefile.in +D src/appl/Makefile.in +D src/libjasper/Makefile.in +D src/libjasper/base/Makefile.in +D src/libjasper/bmp/Makefile.in +D src/libjasper/include/Makefile.in +D src/libjasper/include/jasper/Makefile.in +D src/libjasper/jp2/Makefile.in +D src/libjasper/jpc/Makefile.in +D src/libjasper/jpg/Makefile.in +D src/libjasper/mif/Makefile.in +D src/libjasper/pgx/Makefile.in +D src/libjasper/pnm/Makefile.in +D src/libjasper/ras/Makefile.in +D src/msvc/Makefile.in + +commit 2177d4859fc131dda4006109159fe8c293ae42e0 +Author: Michael Adams <[email protected]> +Date: Wed Sep 21 22:16:46 2016 -0700 + + Removed HAVE_VLA stuff from various configuration and build files. + Also, changed a few INCLUDES to AM_CPPFLAGS in automake files + (since INCLUDES + is deprecated). + +M Makefile.in +M acaux/ltmain.sh +M aclocal.m4 +M configure +M configure.ac +M src/Makefile.in +M src/appl/Makefile.am +M src/appl/Makefile.in +M src/libjasper/Makefile.in +M src/libjasper/base/Makefile.am +M src/libjasper/base/Makefile.in +M src/libjasper/bmp/Makefile.am +M src/libjasper/bmp/Makefile.in +M src/libjasper/include/Makefile.in +M src/libjasper/include/jasper/Makefile.in +M src/libjasper/include/jasper/jas_config.h +M src/libjasper/include/jasper/jas_config.h.in +M src/libjasper/jp2/Makefile.am +M src/libjasper/jp2/Makefile.in +M src/libjasper/jpc/Makefile.am +M src/libjasper/jpc/Makefile.in +M src/libjasper/jpg/Makefile.am +M src/libjasper/jpg/Makefile.in +M src/libjasper/mif/Makefile.am +M src/libjasper/mif/Makefile.in +M src/libjasper/pgx/Makefile.am +M src/libjasper/pgx/Makefile.in +M src/libjasper/pnm/Makefile.am +M src/libjasper/pnm/Makefile.in +M src/libjasper/ras/Makefile.am +M src/libjasper/ras/Makefile.in +M src/msvc/Makefile.in + +commit e31a992d3869037680bd1e18305146f79a1569ee +Merge: 268ab23 137628a +Author: Michael Adams <[email protected]> +Date: Wed Sep 21 21:41:58 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/CVE-2014-8158' + I am merging some changes to eliminate the use of VLAs in the + filter bank + code (for security reasons). + +commit 137628a9ebc798b8681f900adf83a8a9953d156e +Merge: 268ab23 0d64bde +Author: Michael Adams <[email protected]> +Date: Wed Sep 21 21:36:39 2016 -0700 + + Merge branch 'wip/hughsie/CVE-2014-8158' + of https://github.com/hughsie/jasper into + hughsie-wip/hughsie/CVE-2014-8158 + +commit 268ab239b23542552742ae4ab29052dd1e88072c +Merge: 95c5a55 2144881 +Author: Michael Adams <[email protected]> +Date: Wed Sep 21 21:23:50 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/CVE-2014-8157' + +commit 214488123f5746bc4a56967d1632b068ef4ef497 +Merge: 95c5a55 3fd4067 +Author: Michael Adams <[email protected]> +Date: Wed Sep 21 21:22:30 2016 -0700 + + Merge branch 'wip/hughsie/CVE-2014-8157' + of https://github.com/hughsie/jasper into + hughsie-wip/hughsie/CVE-2014-8157 + +commit 95c5a55f1a166b1553c6e8259ee851d3764e3455 +Merge: c966a36 3933ab6 +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 15:59:01 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/CVE-2014-8138' + +commit 3933ab687ca9a0abcaa8bc769088d41d72c6013a +Merge: c966a36 c54113d +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 15:57:23 2016 -0700 + + Merge branch 'wip/hughsie/CVE-2014-8138' + of https://github.com/hughsie/jasper into + hughsie-wip/hughsie/CVE-2014-8138 + +commit c966a3642f3eb7aac1376505c1d1087a7e15ff59 +Merge: fc6d908 d23c795 +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 15:52:16 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/CVE-2015-5221' + +commit d23c7955bc8ddb12e88036ada09443ce54cd6495 +Merge: fc6d908 df5d286 +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 15:50:16 2016 -0700 + + Merge branch 'wip/hughsie/CVE-2015-5221' + of https://github.com/hughsie/jasper into + hughsie-wip/hughsie/CVE-2015-5221 + +commit fc6d908725af4fb674fcaf897c809dc12b522585 +Merge: e9e328d ad3a21e +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 15:48:25 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/CVE-2016-2116' + +commit ad3a21efb4750872ef86308c2cae3a6be1334348 +Merge: e9e328d 142245b +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 15:47:24 2016 -0700 + + Merge branch 'wip/hughsie/CVE-2016-2116' + of https://github.com/hughsie/jasper into + hughsie-wip/hughsie/CVE-2016-2116 + +commit e9e328de659958ad8b15af736eb907772d73ad24 +Merge: fe94610 876698f +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 15:45:09 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/Coverity-FORWARD_NULL' + +commit 876698f9f80a4cc540470f3ec51f70c800eec504 +Merge: fe94610 3e304e5 +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 15:40:36 2016 -0700 + + Merge branch 'wip/hughsie/Coverity-FORWARD_NULL' + of https://github.com/hughsie/jasper into + hughsie-wip/hughsie/Coverity-FORWARD_NULL + +commit fe94610fed75619b537c5c4b820e8e6cbcc02d6c +Merge: b8b9fbd b87cb52 +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 15:34:28 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/jpc_dec.c' + +commit b87cb5259c088c7c383cb084d215e71c0ac6c5a7 +Merge: b8b9fbd d5314a0 +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 15:34:03 2016 -0700 + + Merge branch 'wip/hughsie/jpc_dec.c' of + https://github.com/hughsie/jasper into hughsie-wip/hughsie/jpc_dec.c + +commit b8b9fbd98eab117108f4da1760644ae871c56e8b +Merge: e72cddd 2a66a50 +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 15:28:51 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/Coverity-CHECKED_RETURN' + +commit 2a66a504dae1cb485c95505c222d3db9282fef22 +Merge: e72cddd f1b6eba +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 15:28:16 2016 -0700 + + Merge branch 'wip/hughsie/Coverity-CHECKED_RETURN' + of https://github.com/hughsie/jasper into + hughsie-wip/hughsie/Coverity-CHECKED_RETURN + +commit e72cddde1ab3156fa5d199728eafab4633659e47 +Merge: 462c382 5d4290e +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 08:06:38 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/pkgconfig' + +commit 5d4290eeb81ecd79d45fc1969a7e0dfdba4a1092 +Merge: 462c382 3cb180b +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 08:06:25 2016 -0700 + + Merge branch 'wip/hughsie/pkgconfig' of + https://github.com/hughsie/jasper into hughsie-wip/hughsie/pkgconfig + +commit 462c38279036a5c480db9fac73ddb31d936d0bcb +Merge: 00b33e9 e8f510f +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 07:55:19 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/CVE-2016-1577' + +commit e8f510fc36bd22af6bd84113669406b218ab4d2d +Merge: 00b33e9 74ea22a +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 07:54:54 2016 -0700 + + Merge branch 'wip/hughsie/CVE-2016-1577' + of https://github.com/hughsie/jasper into + hughsie-wip/hughsie/CVE-2016-1577 + +commit 00b33e9e2ba02c32f76d8a231bce5f33b4809350 +Merge: f40b31c 57c9355 +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 07:48:46 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/Coverity-UNUSED_VALUE' + +commit 57c9355612d917214dc223e3383c4bee89383fa3 +Merge: f40b31c 0a5a633 +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 07:48:17 2016 -0700 + + Merge branch 'wip/hughsie/Coverity-UNUSED_VALUE' + of https://github.com/hughsie/jasper into + hughsie-wip/hughsie/Coverity-UNUSED_VALUE + +commit f40b31c7a54f10eb232516ef8774dfc55be1987f +Merge: 530805c b1c9b99 +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 07:43:00 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/Coverity-BAD_SIZEOF' + +commit b1c9b99c246e8341169c3a1308204d725f412f7d +Merge: 530805c 28b05c0 +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 07:42:25 2016 -0700 + + Merge branch 'wip/hughsie/Coverity-BAD_SIZEOF' + of https://github.com/hughsie/jasper into + hughsie-wip/hughsie/Coverity-BAD_SIZEOF + +commit 530805cec4e099e8a0816a6ff481ea67a2832328 +Merge: b702259 413a496 +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 07:36:46 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/CVE-2008-3522' + +commit 413a496481e53ba75d9808085a6e988a86e684dd +Merge: b702259 d678ccd +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 07:35:39 2016 -0700 + + Merge branch 'wip/hughsie/CVE-2008-3522' + of https://github.com/hughsie/jasper into + hughsie-wip/hughsie/CVE-2008-3522 + +commit b70225947cd1eb9c1dee5e0844389eeb9f72dd64 +Merge: b13b8c8 58c3a5f +Author: Michael Adams <[email protected]> +Date: Mon Sep 19 07:27:27 2016 -0700 + + Merge branch 'hughsie-wip/hughsie/1.701.0-GL' + +commit 58c3a5fe07701726c941551b3d1547f4ad449d10 +Author: Richard Hughes <[email protected]> +Date: Mon Sep 19 10:03:36 2016 +0100 + + 1.701.0-GL + +M configure +M configure.ac + +commit 3cb180b862d36b73f56e111ec2e99333b05ac6ae +Author: Richard Hughes <[email protected]> +Date: Mon Sep 19 10:03:36 2016 +0100 + + pkgconfig + +M Makefile.am +M configure.ac +A pkgconfig/Makefile.am +A pkgconfig/jasper.pc.in + +commit 980da43d8d388a67cac505e734423b2a5aa4cede +Author: Richard Hughes <[email protected]> +Date: Mon Sep 19 10:03:36 2016 +0100 + + CVE-2016-1867 +