GraphicsMagick: jp2/* Update lib jasper to 2.0.0.
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.37933.1672568451.1459.graphicsmagick-commit@lists.sourceforge.net> |
changeset 6767d8d8906b in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=6767d8d8906b summary: jp2/* Update lib jasper to 2.0.0. diffstat: ChangeLog | 4 + jp2/CMakeLists.txt | 282 + jp2/ChangeLog | 1242 +- jp2/INSTALL | 130 +- jp2/Makefile.am | 96 - jp2/Makefile.in | 910 - jp2/NEWS | 2 - jp2/README | 67 +- 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_aux/test-driver | 139 - 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_append_flag.m4 | 71 - jp2/ac_m4/m4_ax_cflags_gcc_option.m4 | 191 - jp2/ac_m4/m4_ax_check_compile_flag.m4 | 74 - jp2/ac_m4/m4_ax_generate_changelog.m4 | 99 - jp2/aclocal.m4 | 1154 - jp2/build/cmake/modules/FindMakeDist.cmake | 250 + jp2/build/cmake/modules/InSourceBuild.cmake | 17 + jp2/build/cmake/modules/Sanitizers.cmake | 36 + jp2/build/jasper.pc.in | 11 + jp2/build/jasper.spec.in | 101 + jp2/configure | 16371 ---------- jp2/configure.ac | 524 - jp2/data/test/bad/00047-jasper-stackoverflow-jpc_tsfb_getbands2.jpc | Bin jp2/data/test/bad/00052-jasper-misalignedaddress.jp2 | Bin jp2/data/test/good/PoC1.jpc | Bin jp2/data/test/good/PoC2.jpc | Bin jp2/doc/CMakeLists.txt | 15 + jp2/doc/Doxyfile.in | 1803 + jp2/doc/html/arrowdown.png | Bin jp2/doc/html/arrowright.png | Bin jp2/doc/html/bc_s.png | Bin jp2/doc/html/bdwn.png | Bin jp2/doc/html/bmp__cod_8h_source.html | 323 + jp2/doc/html/bmp__enc_8h_source.html | 180 + jp2/doc/html/closed.png | Bin jp2/doc/html/dir_01fa95eb1f0c9de91eda0f793bde0975.html | 126 + jp2/doc/html/dir_183aa360c78c3d5d76d0e37fb3928592.html | 122 + jp2/doc/html/dir_239fa1a8a79e6f38585ef78fb6b47da0.html | 116 + jp2/doc/html/dir_29762712327dae1c325573027ed44f50.html | 116 + jp2/doc/html/dir_3312c1fcef0e3604e67bd913df2806c1.html | 122 + jp2/doc/html/dir_355cf9e37591c428e55f8d720ff2e3f9.html | 132 + jp2/doc/html/dir_3a97f55f20a9bb1bb712bd1e3de7e50d.html | 122 + jp2/doc/html/dir_41a91b98527d9d10cb5af78598e9ec93.html | 194 + jp2/doc/html/dir_4e3ad3b29458a04166c2dfc7f820c9fd.html | 146 + jp2/doc/html/dir_9ea6cd8469528c7d7cd4b60976b7e9e9.html | 126 + jp2/doc/html/dir_a879a77586bbd06cafa40df29c6b4c6b.html | 140 + jp2/doc/html/dir_a8d89ff3798d339732e1396510c4b3c0.html | 114 + jp2/doc/html/dir_d9847df2aafba42ed7b063bd6c8fa1e0.html | 122 + jp2/doc/html/dir_df316ee5e3a6c42026ee5b61f836f0b9.html | 122 + jp2/doc/html/dir_eae9862bfeebbfa87c946295a16425e9.html | 114 + jp2/doc/html/doc.png | Bin jp2/doc/html/doxygen.css | 1449 + jp2/doc/html/doxygen.png | Bin jp2/doc/html/dynsections.js | 97 + jp2/doc/html/faq.html | 112 + jp2/doc/html/files.html | 164 + jp2/doc/html/files.js | 56 + jp2/doc/html/folderclosed.png | Bin jp2/doc/html/folderopen.png | Bin jp2/doc/html/getting_started.html | 113 + jp2/doc/html/getting_started.js | 5 + jp2/doc/html/index.html | 167 + jp2/doc/html/install.html | 227 + jp2/doc/html/jas__cm_8h_source.html | 376 + jp2/doc/html/jas__debug_8h_source.html | 233 + jp2/doc/html/jas__fix_8h_source.html | 469 + jp2/doc/html/jas__getopt_8h_source.html | 240 + jp2/doc/html/jas__icc_8h_source.html | 517 + jp2/doc/html/jas__image_8h_source.html | 684 + jp2/doc/html/jas__init_8h_source.html | 192 + jp2/doc/html/jas__malloc_8h_source.html | 232 + jp2/doc/html/jas__math_8h_source.html | 410 + jp2/doc/html/jas__seq_8h_source.html | 424 + jp2/doc/html/jas__stream_8h_source.html | 577 + jp2/doc/html/jas__string_8h_source.html | 205 + jp2/doc/html/jas__tmr_8h_source.html | 213 + jp2/doc/html/jas__tvp_8h_source.html | 260 + jp2/doc/html/jas__types_8h_source.html | 239 + jp2/doc/html/jas__version_8h_source.html | 229 + jp2/doc/html/jasper_8h_source.html | 203 + jp2/doc/html/jp2__cod_8h_source.html | 412 + jp2/doc/html/jp2__dec_8h_source.html | 193 + jp2/doc/html/jpc__bs_8h_source.html | 339 + jp2/doc/html/jpc__cod_8h_source.html | 186 + jp2/doc/html/jpc__cs_8h_source.html | 871 + jp2/doc/html/jpc__dec_8h_source.html | 808 + jp2/doc/html/jpc__enc_8h_source.html | 754 + jp2/doc/html/jpc__fix_8h_source.html | 254 + jp2/doc/html/jpc__flt_8h_source.html | 188 + jp2/doc/html/jpc__math_8h_source.html | 207 + jp2/doc/html/jpc__mct_8h_source.html | 219 + jp2/doc/html/jpc__mqcod_8h_source.html | 232 + jp2/doc/html/jpc__mqdec_8h_source.html | 379 + jp2/doc/html/jpc__mqenc_8h_source.html | 344 + jp2/doc/html/jpc__qmfb_8h_source.html | 222 + jp2/doc/html/jpc__t1cod_8h_source.html | 403 + jp2/doc/html/jpc__t1dec_8h_source.html | 196 + jp2/doc/html/jpc__t1enc_8h_source.html | 201 + jp2/doc/html/jpc__t2cod_8h_source.html | 407 + jp2/doc/html/jpc__t2dec_8h_source.html | 203 + jp2/doc/html/jpc__t2enc_8h_source.html | 214 + jp2/doc/html/jpc__tagtree_8h_source.html | 275 + jp2/doc/html/jpc__tsfb_8h_source.html | 252 + jp2/doc/html/jpc__util_8h_source.html | 185 + jp2/doc/html/jpg__cod_8h_source.html | 190 + jp2/doc/html/jpg__enc_8h_source.html | 178 + jp2/doc/html/jpg__jpeglib_8h_source.html | 184 + jp2/doc/html/jquery.js | 68 + jp2/doc/html/known_bugs.html | 108 + jp2/doc/html/mif__cod_8h_source.html | 231 + jp2/doc/html/nav_f.png | Bin jp2/doc/html/nav_g.png | Bin jp2/doc/html/nav_h.png | Bin jp2/doc/html/navtree.css | 143 + jp2/doc/html/navtree.js | 523 + jp2/doc/html/navtreedata.js | 24 + jp2/doc/html/navtreeindex0.js | 68 + jp2/doc/html/open.png | Bin jp2/doc/html/organization.html | 108 + jp2/doc/html/pages.html | 116 + jp2/doc/html/pgx__cod_8h_source.html | 226 + jp2/doc/html/pgx__enc_8h_source.html | 177 + jp2/doc/html/pnm__cod_8h_source.html | 265 + jp2/doc/html/pnm__enc_8h_source.html | 178 + jp2/doc/html/ras__cod_8h_source.html | 272 + jp2/doc/html/ras__enc_8h_source.html | 178 + jp2/doc/html/resize.js | 97 + jp2/doc/html/search/all_0.html | 26 + jp2/doc/html/search/all_0.js | 4 + jp2/doc/html/search/all_1.html | 26 + jp2/doc/html/search/all_1.js | 4 + jp2/doc/html/search/all_2.html | 26 + jp2/doc/html/search/all_2.js | 4 + jp2/doc/html/search/all_3.html | 26 + jp2/doc/html/search/all_3.js | 4 + jp2/doc/html/search/all_4.html | 26 + jp2/doc/html/search/all_4.js | 4 + jp2/doc/html/search/all_5.html | 26 + jp2/doc/html/search/all_5.js | 4 + jp2/doc/html/search/close.png | Bin jp2/doc/html/search/mag_sel.png | Bin jp2/doc/html/search/nomatches.html | 12 + jp2/doc/html/search/pages_0.html | 26 + jp2/doc/html/search/pages_0.js | 4 + jp2/doc/html/search/pages_1.html | 26 + jp2/doc/html/search/pages_1.js | 4 + jp2/doc/html/search/pages_2.html | 26 + jp2/doc/html/search/pages_2.js | 4 + jp2/doc/html/search/pages_3.html | 26 + jp2/doc/html/search/pages_3.js | 4 + jp2/doc/html/search/pages_4.html | 26 + jp2/doc/html/search/pages_4.js | 4 + jp2/doc/html/search/pages_5.html | 26 + jp2/doc/html/search/pages_5.js | 4 + jp2/doc/html/search/search.css | 271 + jp2/doc/html/search/search.js | 791 + jp2/doc/html/search/search_l.png | Bin jp2/doc/html/search/search_m.png | Bin jp2/doc/html/search/search_r.png | Bin jp2/doc/html/search/searchdata.js | 18 + jp2/doc/html/splitbar.png | Bin jp2/doc/html/sync_off.png | Bin jp2/doc/html/sync_on.png | Bin jp2/doc/html/tab_a.png | Bin jp2/doc/html/tab_b.png | Bin jp2/doc/html/tab_h.png | Bin jp2/doc/html/tab_s.png | Bin jp2/doc/html/tabs.css | 60 + jp2/doc/manual.pdf | Bin jp2/doc/src/bugs.dox | 7 + jp2/doc/src/faq.dox | 11 + jp2/doc/src/getting_started.dox.in | 31 + jp2/doc/src/mainpage.dox.in | 34 + jp2/doc/src/modules.dox | 4 + jp2/jasper.spec | 101 - jp2/jasper.spec.in | 101 - jp2/pkgconfig/Makefile.am | 5 - jp2/pkgconfig/Makefile.in | 515 - jp2/pkgconfig/jasper.pc.in | 11 - jp2/src/Makefile.am | 61 - jp2/src/Makefile.in | 692 - jp2/src/appl/CMakeLists.txt | 36 + jp2/src/appl/Makefile.am | 98 - jp2/src/appl/Makefile.in | 862 - jp2/src/appl/imginfo.c | 19 +- jp2/src/appl/jasper.c | 5 +- jp2/src/appl/jiv.c | 2 +- jp2/src/libjasper/CMakeLists.txt | 155 + jp2/src/libjasper/Makefile.am | 89 - jp2/src/libjasper/Makefile.in | 864 - jp2/src/libjasper/base/Makefile.am | 76 - jp2/src/libjasper/base/Makefile.in | 691 - jp2/src/libjasper/base/jas_debug.c | 2 +- jp2/src/libjasper/base/jas_image.c | 6 +- jp2/src/libjasper/base/jas_stream.c | 2 +- jp2/src/libjasper/base/jas_version.c | 162 +- jp2/src/libjasper/bmp/Makefile.am | 67 - jp2/src/libjasper/bmp/Makefile.in | 668 - jp2/src/libjasper/bmp/bmp_dec.c | 46 +- jp2/src/libjasper/dummy.c | 3 - jp2/src/libjasper/include/Makefile.am | 59 - jp2/src/libjasper/include/Makefile.in | 691 - jp2/src/libjasper/include/jasper/Makefile.am | 79 - jp2/src/libjasper/include/jasper/Makefile.in | 671 - jp2/src/libjasper/include/jasper/jas_config.h | 10 +- jp2/src/libjasper/include/jasper/jas_config.h.in | 16 +- jp2/src/libjasper/include/jasper/jas_debug.h | 6 + jp2/src/libjasper/include/jasper/jas_pconf.h.in | 128 - jp2/src/libjasper/include/jasper/jas_types.h | 4 + jp2/src/libjasper/jp2/Makefile.am | 67 - jp2/src/libjasper/jp2/Makefile.in | 668 - jp2/src/libjasper/jpc/Makefile.am | 105 - jp2/src/libjasper/jpc/Makefile.in | 726 - jp2/src/libjasper/jpc/jpc_dec.c | 2 +- jp2/src/libjasper/jpc/jpc_qmfb.c | 28 +- jp2/src/libjasper/jpc/jpc_t2cod.c | 131 +- jp2/src/libjasper/jpc/jpc_t2dec.c | 42 +- jp2/src/libjasper/jpc/jpc_util.c | 2 +- jp2/src/libjasper/jpc/jpc_util.h | 2 +- jp2/src/libjasper/jpg/Makefile.am | 79 - jp2/src/libjasper/jpg/Makefile.in | 682 - jp2/src/libjasper/jpg/jpg_dec.c | 51 +- jp2/src/libjasper/jpg/jpg_dummy.c | 4 +- jp2/src/libjasper/mif/Makefile.am | 66 - jp2/src/libjasper/mif/Makefile.in | 664 - jp2/src/libjasper/pgx/Makefile.am | 67 - jp2/src/libjasper/pgx/Makefile.in | 668 - jp2/src/libjasper/pgx/pgx_cod.c | 2 +- jp2/src/libjasper/pnm/Makefile.am | 67 - jp2/src/libjasper/pnm/Makefile.in | 668 - jp2/src/libjasper/ras/Makefile.am | 67 - jp2/src/libjasper/ras/Makefile.in | 668 - jp2/src/msvc/Makefile.am | 77 - jp2/src/msvc/Makefile.in | 530 - jp2/src/msvc/README | 2 - jp2/src/msvc/imgcmp.dsp | 100 - jp2/src/msvc/imgcmp.vcxproj | 138 - jp2/src/msvc/imginfo.dsp | 102 - jp2/src/msvc/imginfo.vcxproj | 149 - jp2/src/msvc/jasper.dsp | 102 - jp2/src/msvc/jasper.dsw | 86 - jp2/src/msvc/jasper.sln | 56 - jp2/src/msvc/jasper.vcxproj | 149 - jp2/src/msvc/jiv.dsp | 102 - jp2/src/msvc/jiv.vcxproj | 143 - jp2/src/msvc/libjasper.dsp | 428 - jp2/src/msvc/libjasper.vcxproj | 215 - jp2/test/Makefile.am | 59 - jp2/test/Makefile.in | 691 - jp2/test/bin/Makefile.am | 82 - jp2/test/bin/Makefile.in | 930 - jp2/test/bin/jpcod | 3 +- jp2/test/bin/run_codec_test | 4 +- jp2/test/bin/run_test | 466 - jp2/test/bin/run_test_1 | 74 +- jp2/test/bin/run_test_2 | 9 +- jp2/test/bin/run_test_3 | 9 + jp2/test/bin/tests | 456 - jp2/test/bin/utilities | 4 + jp2/test/bin/wrapper | 19 + 270 files changed, 27944 insertions(+), 60041 deletions(-) diffs (truncated from 89546 to 500 lines): diff -r 996b3ee79e10 -r 6767d8d8906b ChangeLog --- a/ChangeLog Sat Dec 31 00:40:44 2022 +0100 +++ b/ChangeLog Sun Jan 01 11:19:55 2023 +0100 @@ -1,3 +1,7 @@ +2023-01-01 Fojtik Jaroslav <[email protected]> + + * jp2/* Update lib jasper to 2.0.0. + 2022-12-30 Fojtik Jaroslav <[email protected]> * coders/pcx.c (WritePCXImage): Meke default RLE compression. diff -r 996b3ee79e10 -r 6767d8d8906b jp2/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jp2/CMakeLists.txt Sun Jan 01 11:19:55 2023 +0100 @@ -0,0 +1,282 @@ +cmake_minimum_required (VERSION 2.8.11) + +set(JAS_PROJECT_NAME "JasPer") + +project("${JAS_PROJECT_NAME}") + +set(CMAKE_MODULE_PATH + ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/cmake/modules/") + +# This include should be placed as early as possible. +include(InSourceBuild) + +################################################################################ +# Version information. +################################################################################ + +# The major, minor, and micro version numbers of the project. +set(JAS_VERSION_MAJOR 2) +set(JAS_VERSION_MINOR 0) +set(JAS_VERSION_PATCH 0) + +# The project version. +set(JAS_VERSION + "${JAS_VERSION_MAJOR}.${JAS_VERSION_MINOR}.${JAS_VERSION_PATCH}") + +# The RPM version information. +set(JAS_RPM_RELEASE 1) + +# The shared library versioning information, which is specified by the +# following variables: JAS_SO_VERSION, JAS_SO_MINOR, and JAS_SO_RELEASE. +# Each new software release should update the values of these variables. +# +# Guidelines for updating this information: +# If the code did not change (e.g., only documentation was updated), do +# nothing. +# If the code changed and the binary interface for the library did not change +# from the previous release (e.g., most bug fixes), increment JAS_SO_RELEASE. +# If the binary interface changed, but remains compatible with the previous +# release (e.g., only new functions were added), increment JAS_SO_MINOR and +# set JAS_SO_RELEASE to 0. +# If the binary interface changed in a way that breaks compatibility with the +# previous release (e.g., a function was deleted), increment JAS_SO_VERSION and +# set both JAS_SO_MINOR and JAS_SO_RELEASE to 0. +# +# History of shared library versioning information: +# JasPer 2.0.0: 4.0.0 + +set(JAS_SO_VERSION 4) +set(JAS_SO_MINOR 0) +set(JAS_SO_RELEASE 0) +set(JAS_SO_NAME "${JAS_SO_VERSION}.${JAS_SO_MINOR}.${JAS_SO_RELEASE}") + +################################################################################ + +set(CMAKE_C_STANDARD 11) +set(CMAKE_VERBOSE_MAKEFILE on) + +include(CheckIncludeFiles) +include(CheckFunctionExists) +include(CTest) +include(Sanitizers) +cmake_policy(SET CMP0012 NEW) + +option(JAS_ENABLE_LIBJPEG "Enable use of JPEG Library" true) +option(JAS_ENABLE_OPENGL "Enable use of OpenGL Library" true) +option(JAS_ENABLE_STRICT "Enable pedantic error checking" false) +option(JAS_ENABLE_SHARED "Enable building of shared library" true) + +if (APPLE AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(MACOSX true) +endif() + +if (UNIX) + if (MACOSX) + set(JAS_PLATFORM "UNIX (OSX)") + else() + set(JAS_PLATFORM "UNIX (Not OSX)") + endif() +elseif (WIN32) + set(JAS_PLATFORM "Microsoft Windows") +else() + set(JAS_PLATFORM "Unknown") +endif() +message("Platform ${JAS_PLATFORM}") + +if (WIN32) + if (JAS_ENABLE_SHARED) + message(WARNING + "Disabling the building of shared libraries " + "(since this does not currently work on this platform). " + "Setting JAS_ENABLE_SHARED to false." + ) + set(JAS_ENABLE_SHARED false) + endif() +endif() + +if (JAS_ENABLE_SHARED AND MACOSX) + set(CMAKE_MACOSX_RPATH true) +endif() + +message("CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE}") +message("CMAKE_C_COMPILER_ID ${CMAKE_C_COMPILER_ID}") +message("CMAKE_C_COMPILER ${CMAKE_C_COMPILER}") +message("CMAKE_C_FLAGS ${CMAKE_C_FLAGS}") +if (${CMAKE_BUILD_TYPE} MATCHES Debug) + if (${CMAKE_C_COMPILER_ID} MATCHES GNU OR ${CMAKE_C_COMPILER_ID} MATCHES Clang) + add_definitions("-O0") + endif() +endif() + +INCLUDE(InstallRequiredSystemLibraries) +SET(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}") +SET(CPACK_PACKAGE_VERSION "${JAS_VERSION}") +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "JasPer Image Processing Tool Kit") +SET(CPACK_PACKAGE_VENDOR "Michael Adams") +SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") +SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") +SET(CPACK_PACKAGE_VERSION_MAJOR "${JAS_VERSION_MAJOR}") +SET(CPACK_PACKAGE_VERSION_MINOR "${JAS_VERSION_MINOR}") +SET(CPACK_PACKAGE_VERSION_PATCH "${JAS_VERSION_PATCH}") +SET(CPACK_PACKAGE_INSTALL_DIRECTORY + "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") +SET(CPACK_PACKAGE_FILE_NAME + "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +SET(CPACK_GENERATOR "TGZ") +include(CPack) + +find_package(Doxygen) + +find_program(BASH_PROGRAM bash) +# HACK to disable tests +#set(BASH_PROGRAM "") + +check_include_files(fcntl.h JAS_HAVE_FCNTL_H) +check_include_files(io.h JAS_HAVE_IO_H) +check_include_files(unistd.h JAS_HAVE_UNISTD_H) +check_include_files(windows.h JAS_HAVE_WINDOWS_H) +check_include_files(sys/time.h JAS_HAVE_SYS_TIME_H) +check_include_files(sys/types.h JAS_HAVE_SYS_TYPES_H) + +check_function_exists(gettimeofday JAS_HAVE_GETTIMEOFDAY) +check_function_exists(getrusage JAS_HAVE_GETRUSAGE) + +if (JAS_STRICT) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-unused") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W -Wformat -Wmissing-prototypes -Wstrict-prototypes") +endif() + +find_package(JPEG) +if (JPEG_FOUND) + include_directories("${JPEG_INCLUDE_DIR}") +endif() +#check_include_files(jpeglib.h JAS_HAVE_JPEGLIB_H) +# HACK +set(JAS_HAVE_JPEGLIB_H 1) +message("JPEG library found: ${JPEG_FOUND}") +message("JPEG libraries: ${JPEG_LIBRARIES}") +message("JPEG include directory: ${JPEG_INCLUDE_DIR}") +message("JAS_ENABLE_LIBJPEG: ${JAS_ENABLE_LIBJPEG}") +message("JAS_HAVE_JPEGLIB_H: ${JAS_HAVE_JPEGLIB_H}") +if(JPEG_FOUND AND (NOT JAS_ENABLE_LIBJPEG OR NOT JAS_HAVE_JPEGLIB_H)) + message("disabling LIBJPEG") + set(JPEG_FOUND false) + set(JPEG_LIBRARIES "") + set(JPEG_INCLUDE_DIR "") +endif() +# HACK +#if (MACOSX) +# message("disabling LIBJPEG") +# set(JPEG_FOUND false) +# set(JPEG_LIBRARIES "") +# set(JPEG_INCLUDE_DIR "") +#endif() + +find_package(GLUT) +if(GLUT_FOUND) + include_directories("${GLUT_INCLUDE_DIR}") +endif() +check_include_files(GL/glut.h JAS_HAVE_GL_GLUT_H) +message("GLUT library found: ${GLUT_FOUND}") +message("GLUT libraries: ${GLUT_LIBRARIES}") +message("GLUT include directory: ${GLUT_INCLUDE_DIR}") +message("JAS_ENABLE_OPENGL: ${JAS_ENABLE_OPENGL}") +message("JAS_HAVE_GL_GLUT_H: ${JAS_HAVE_GL_GLUT_H}") +if(GLUT_FOUND AND (NOT JAS_HAVE_GL_GLUT_H OR NOT JAS_ENABLE_OPENGL)) + message("disabling GLUT") + set(GLUT_FOUND false) + set(GLUT_LIBRARIES "") + set(GLUT_INCLUDE_DIR "") +endif() + +if(UNIX) + set(MATH_LIBRARY m) +else() + set(MATH_LIBRARY "") +endif() + +if (JAS_MEMORY_LIMIT) + add_definitions(-DJAS_MEMORY_LIMIT=${JAS_MEMORY_LIMIT}) +endif() + +################################################################################ + +# use, i.e. don't skip the full RPATH for the build tree +SET(CMAKE_SKIP_BUILD_RPATH FALSE) + +# when building, don't use the install RPATH already +# (but later on when installing) +SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + +SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") + +# add the automatically determined parts of the RPATH +# which point to directories outside the build tree to the install RPATH +SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + + +# the RPATH to be used when installing, but only if it's not a system directory +LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) +IF("${isSystemDir}" STREQUAL "-1") + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") +ENDIF("${isSystemDir}" STREQUAL "-1") + +################################################################################ + +subdirs(src/libjasper src/appl doc) + +#include_directories(${CMAKE_CURRENT_BINARY_DIR}/src/libjasper/include) +#include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/libjasper/include) +#target_include_directories(libjasper PUBLIC +#"${CMAKE_CURRENT_BINARY_DIR}/src/libjasper/include" +#"${CMAKE_CURRENT_SOURCE_DIR}/src/libjasper/include") + +set(ENV{JAS_ABS_TOP_BUILDDIR} "${CMAKE_CURRENT_BINARY_DIR}") +set(ENV{JAS_ABS_TOP_SRCDIR} "${CMAKE_CURRENT_SOURCE_DIR}") +set(ENV{JAS_TOP_BUILDDIR} "${CMAKE_CURRENT_BINARY_DIR}") +set(ENV{JAS_TOP_SRCDIR} "${CMAKE_CURRENT_SOURCE_DIR}") +# "JAS_TOP_BUILDDIR=../../build" +# "JAS_TOP_SRCDIR=../.." + +if (BASH_PROGRAM) + add_test(run_test_1 + "${BASH_PROGRAM}" "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/wrapper" + "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_1") + add_test(run_test_2 + "${BASH_PROGRAM}" "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/wrapper" + "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_2") + add_test(run_test_3 + "${BASH_PROGRAM}" "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/wrapper" + "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_3") + add_test(run_test_4 + "${BASH_PROGRAM}" "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/wrapper" + "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_4") +endif() + +#find_package(MakeDist) + +#set(EXTRA_DIST data) + +#add_makedist( +# ${CMAKE_CURRENT_BINARY_DIR}/README +# ${CMAKE_CURRENT_BINARY_DIR}/LICENSE +#) + +#file(GENERATE OUTPUT ChangeLog2 CONTENT echo) +execute_process(COMMAND git log OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog2) + +# The package configuation (pc) file should be installed in +# ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig. +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/build/jasper.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/build/jasper.pc @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build/jasper.pc + DESTINATION lib/pkgconfig) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/build/jasper.spec.in + ${CMAKE_CURRENT_BINARY_DIR}/build/jasper.spec @ONLY) + diff -r 996b3ee79e10 -r 6767d8d8906b jp2/ChangeLog --- a/jp2/ChangeLog Sat Dec 31 00:40:44 2022 +0100 +++ b/jp2/ChangeLog Sun Jan 01 11:19:55 2023 +0100 @@ -1,6 +1,1246 @@ +commit 58b2bc12f377e64fca99ea7f3517d7fff1c39ac9 +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 22:42:31 2016 -0800 + + Made further revisions to the reference manual. + +M doc/src/mainpage.dox.in + +commit ce9f63084e13e759442884c4cd913b68096660ac +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 22:19:12 2016 -0800 + + Added more functionality to the make_dist script. + +M build/make_dist + +commit c8ba13c4fef0478ab5e778d14bcce2e6477fd2cd +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 21:59:26 2016 -0800 + + Modify CMakeLists.txt to install man pages. + +M src/appl/CMakeLists.txt + +commit 2f5f0893cde9c790b1a45c71a193405e3f20de49 +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 21:23:40 2016 -0800 + + Made some editorial changes to the Appveyor build script. + +M build/appveyor/build.bat + +commit 431f67de63be9c1268806c7604f27aeb97951334 +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 21:21:55 2016 -0800 + + Improved the installation instructions. + +M INSTALL + +commit f25486c3d4aa472fec79150f2c41ed4333395d3d +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 20:54:24 2016 -0800 + + Fixed a bug in the packet iterator code. + Added a new regression test case. + +A data/test/good/PoC2.jpc +M src/libjasper/jpc/jpc_t2cod.c + +commit da11593fc485dd3c47af0f3118f11a102e1aa3d9 +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 20:46:31 2016 -0800 + + Fixed the incorrect placement of a test file. + +R100 data/test/bad/PoC1.jpc data/test/good/PoC1.jpc + +commit 4a59cfaf9ab3d48fca4a15c0d2674bf7138e3d1a +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 20:23:23 2016 -0800 + + Fixed a buffer overrun problem in the QMFB code in the JPC codec + that was caused by a buffer being allocated with a size that was + too small + in some cases. + Added a new regression test case. + +A data/test/bad/PoC1.jpc +M src/libjasper/jpc/jpc_qmfb.c + +commit ed355a69d1884d4cb9e13a8b885914601853b604 +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 18:41:49 2016 -0800 + + Made some changes to build scripts/files. + +M CMakeLists.txt +M INSTALL +M build/my_build + +commit aa0b0f79ade5eef8b0e7a214c03f5af54b36ba7d +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 17:14:09 2016 -0800 + + Fixed numerous integer overflow problems in the code for packet + iterators + in the JPC decoder. + +M src/libjasper/include/jasper/jas_types.h +M src/libjasper/jpc/jpc_t2cod.c +M src/libjasper/jpc/jpc_t2dec.c + +commit f4a6b95d721901320f228a382b07b85e37d842c7 +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 17:08:48 2016 -0800 + + Reduced the verbosity of some test scripts. + +M test/bin/utilities +M test/bin/wrapper + +commit dcf27b2c5beaaae333df30cf25bde66ffab5c728 +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 16:39:03 2016 -0800 + + Modified some build/package-related scripts. + +M build/make_dist +A build/my_build + +commit 9ae142347c1342667329f31e66146cda2039bd2e +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 10:44:59 2016 -0800 + + Remove some of the autotools cruft from .gitignore + +M .gitignore + +commit 082a41a616dc87e4b4bebf266752563f308302fb +Merge: 142c8e0 71cbb49 +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 10:19:53 2016 -0800 + + Merge branch 'cmake' of https://github.com/mdadams/jasper + + Merge all of the changes necessary to convert from an autotools-based + build to a cmake-based build. + +commit 71cbb49e72f01a06396e99abc20ceac918bd8765 +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 10:08:56 2016 -0800 + + Updated the documentation and the make_dist script. + +M INSTALL +M README +M build/make_dist + +commit c367738eb8678ba989d05c9e95f45c7791bcaf8a +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 09:26:19 2016 -0800 + + Added new script for making release tarballs. + +A build/make_dist + +commit a934e70036efdc6dbe08a96acd0fead41a7b6c40 +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 03:16:22 2016 -0800 + + The pkgconfig file is now correctly generated and installed. + +M CMakeLists.txt +M build/jasper.pc.in + +commit 2baa2f1bd65e54141e15f370f4624f08a20bdc20 +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 03:00:42 2016 -0800 + + Reorganized numerous files used for building. + +M .travis.yml +M CMakeLists.txt +D NEWS +M appveyor.yml +R100 ci/appveyor/build.bat build/appveyor/build.bat +R100 cmake/modules/FindMakeDist.cmake +build/cmake/modules/FindMakeDist.cmake +R100 cmake/modules/InSourceBuild.cmake +build/cmake/modules/InSourceBuild.cmake +R100 cmake/modules/Sanitizers.cmake +build/cmake/modules/Sanitizers.cmake +R100 pkgconfig/jasper.pc.in build/jasper.pc.in +R100 jasper.spec.in build/jasper.spec.in +R100 ci/travis/build build/travis/build +D pkgconfig/Makefile.am + +commit ff88ab26c45de8970b374cc3bfe3c0beca0dcb61 +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 02:25:37 2016 -0800 + + More CI changes. + Improved installation instructions. + +M INSTALL +M ci/travis/build + +commit 6441dd978840d4601884cf3e545df3d9e017959d +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 01:45:02 2016 -0800 + + Some Appveyor changes + +M appveyor.yml + +commit 14f43917bd807d570fb5907bdcaf52fdf051db3e +Author: Michael Adams <[email protected]> +Date: Sat Nov 26 01:39:22 2016 -0800