From ee681aa304f470b41d21b52d3d2158c3381b8663 Mon Sep 17 00:00:00 2001 From: DRC Date: Sun, 1 May 2016 11:42:15 -0500 Subject: [PATCH 01/10] Fix CMake fallback BUILD var on non-U.S. machines If wmic.exe wasn't available, then CMakeLists.txt would call "cmd /C date /T" and parse the result in order to set the BUILD variable. However, the parser assumed that the date was in MM/DD/YYYY format, which is not generally the case unless the user's locale is U.S. English with the default region/language settings for that locale. This commit modifies CMakeLists.txt such that it uses the string(TIMESTAMP) function available in CMake 2.8.11 and later to set the BUILD variable, thus eliminating the need to use wmic.exe or any other platform-specific hack. This commit also modifies the build instructions to remove any reference to CMake 2.6 (which hasn't been supported by our build system since libjpeg-turbo 1.3.x.) Closes #74 --- BUILDING.txt | 13 ++++++------- CMakeLists.txt | 16 ++++------------ 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index c68225b4..8f4893b5 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -484,7 +484,7 @@ CFLAGS and -pie from LDFLAGS. Build Requirements ================== --- CMake (http://www.cmake.org) v2.8.8 or later +-- CMake (http://www.cmake.org) v2.8.11 or later -- Microsoft Visual C++ 2005 or later @@ -688,12 +688,11 @@ Native Interface wrapper into the TurboJPEG shared library and build the Java front-end classes to support it. This allows the TurboJPEG shared library to be used directly from Java applications. See java/README for more details. -If you are using CMake 2.8, you can set the Java_JAVAC_EXECUTABLE, -Java_JAVA_EXECUTABLE, and Java_JAR_EXECUTABLE CMake variables to specify -alternate commands or locations for javac, jar, and java (respectively.) If -you are using CMake 2.6, set JAVA_COMPILE, JAVA_RUNTIME, and JAVA_ARCHIVE -instead. You can also set the JAVACFLAGS CMake variable to specify arguments -that should be passed to the Java compiler when building the front-end classes. +You can set the Java_JAVAC_EXECUTABLE, Java_JAVA_EXECUTABLE, and +Java_JAR_EXECUTABLE CMake variables to specify alternate commands or locations +for javac, jar, and java (respectively.) You can also set the JAVACFLAGS CMake +variable to specify arguments that should be passed to the Java compiler when +building the front-end classes. ======================== diff --git a/CMakeLists.txt b/CMakeLists.txt index 425e3cdb..0e837984 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # Setup # -cmake_minimum_required(VERSION 2.8.8) +cmake_minimum_required(VERSION 2.8.11) # Use LINK_INTERFACE_LIBRARIES instead of INTERFACE_LINK_LIBRARIES if(POLICY CMP0022) cmake_policy(SET CMP0022 OLD) @@ -11,20 +11,12 @@ endif() project(libjpeg-turbo C) set(VERSION 1.4.3) -if(WIN32) - execute_process(COMMAND "wmic.exe" "os" "get" "LocalDateTime" OUTPUT_VARIABLE - BUILD) - string(REGEX REPLACE "[^0-9]" "" BUILD "${BUILD}") - if (BUILD STREQUAL "") - execute_process(COMMAND "cmd.exe" "/C" "DATE" "/T" OUTPUT_VARIABLE BUILD) - string(REGEX REPLACE ".*[ ]([0-9]*)[/.]([0-9]*)[/.]([0-9]*).*" "\\3\\2\\1" BUILD "${BUILD}") - else() - string(SUBSTRING "${BUILD}" 0 8 BUILD) - endif() -else() +if(NOT WIN32) message(FATAL_ERROR "Platform not supported by this build system. Use autotools instead.") endif() +string(TIMESTAMP BUILD "%Y%m%d") + # This does nothing except when using MinGW. CMAKE_BUILD_TYPE has no meaning # in Visual Studio, and it always defaults to Debug when using NMake. if(NOT CMAKE_BUILD_TYPE) From 5e576386b57663bbe9d934edf7c276eb0150cd59 Mon Sep 17 00:00:00 2001 From: mattsarett Date: Mon, 2 May 2016 12:31:51 -0400 Subject: [PATCH 02/10] ARMv7 SIMD: Fix clang compatibility By design, clang only supports Unified Assembler Language (and not pre-UAL syntax): https://llvm.org/bugs/show_bug.cgi?id=23507 http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0473c/BABJIHGJ.html Thus, clang only supports the strbeq instruction and not streqb, but unfortunately some versions of GCC only support streqb. Go, go Gadget #ifdef... Based on https://github.com/mattsarett/libjpeg-turbo/commit/a82e63aac63f8fa3 95fa4caad4de6859623ee2e2 Closes #75 --- ChangeLog.md | 3 +++ simd/jsimd_arm_neon.S | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 99ab5956..06c05088 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -27,6 +27,9 @@ calling `tjDecompressHeader3()`, or if the return value from `tjDecompressHeader3()` was ignored (both cases represent incorrect usage of the TurboJPEG API.) +5. Fixed an issue in the ARM 32-bit SIMD-accelerated Huffman encoder that +prevented the code from assembling properly with clang. + 1.4.90 (1.5 beta1) ================== diff --git a/simd/jsimd_arm_neon.S b/simd/jsimd_arm_neon.S index 15c54095..06b72402 100644 --- a/simd/jsimd_arm_neon.S +++ b/simd/jsimd_arm_neon.S @@ -2457,7 +2457,11 @@ asm_function jsimd_h2v1_fancy_upsample_neon strb \TMP, [\BUFFER, #1]! cmp \TMP, #0xff /*it eq*/ +#if defined(__clang__) + strbeq \ZERO, [\BUFFER, #1]! +#else streqb \ZERO, [\BUFFER, #1]! +#endif .endm .macro put_bits PUT_BUFFER, PUT_BITS, CODE, SIZE From 2e480fa2a3285d9ff83a780ab3417badeb3f2d37 Mon Sep 17 00:00:00 2001 From: mattsarett Date: Tue, 3 May 2016 10:33:43 -0400 Subject: [PATCH 03/10] ARMv7 SIMD: Fix clang compatibility (Part 2) GCC does support UAL syntax (strbeq) if the ".syntax unified" directive is supplied. This directive is supported by all versions of GCC and clang going back to 2003, so it should not create any backward compatibility issues. Based on https://github.com/mattsarett/libjpeg-turbo/commit/1264349e2fa6f098178c37abfa7b059ad8b405a2 Closes #76 --- simd/jsimd_arm_neon.S | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/simd/jsimd_arm_neon.S b/simd/jsimd_arm_neon.S index 06b72402..568768f7 100644 --- a/simd/jsimd_arm_neon.S +++ b/simd/jsimd_arm_neon.S @@ -35,6 +35,7 @@ .arch armv7a .object_arch armv4 .arm +.syntax unified #define RESPECT_STRICT_ALIGNMENT 1 @@ -2457,11 +2458,7 @@ asm_function jsimd_h2v1_fancy_upsample_neon strb \TMP, [\BUFFER, #1]! cmp \TMP, #0xff /*it eq*/ -#if defined(__clang__) strbeq \ZERO, [\BUFFER, #1]! -#else - streqb \ZERO, [\BUFFER, #1]! -#endif .endm .macro put_bits PUT_BUFFER, PUT_BITS, CODE, SIZE From 5c064de10dc544ceeecfc63f6a781b9f71576f57 Mon Sep 17 00:00:00 2001 From: DRC Date: Mon, 9 May 2016 20:00:46 -0500 Subject: [PATCH 04/10] Build: Don't allow jpeg-7+ emul. w/o arith coding The jpeg-7/jpeg-8 APIs/ABIs require arithmetic coding, and the jpeg-8 API/ABI requires the memory source/destination manager, so this commit causes the build system to ignore --with-arith-enc/--without-arith-enc and --with-arith-dec/--without-arith-dec (and the equivalent CMake variables-- WITH_ARITH_ENC and WITH_ARITH_DEC) when v7/v8 API/ABI emulation is enabled. Furthermore, the CMake build system now ignores WITH_MEM_SRCDST whenever WITH_JPEG8 is specified (the autotools build system already did that.) --- CMakeLists.txt | 12 ++++++++++-- configure.ac | 10 ++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c4a46b7..1ad29f06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,8 +34,8 @@ endif() message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}") option(WITH_SIMD "Include SIMD extensions" TRUE) -option(WITH_ARITH_ENC "Include arithmetic encoding support" TRUE) -option(WITH_ARITH_DEC "Include arithmetic decoding support" TRUE) +option(WITH_ARITH_ENC "Include arithmetic encoding support when emulating the libjpeg v6b API/ABI" TRUE) +option(WITH_ARITH_DEC "Include arithmetic decoding support when emulating the libjpeg v6b API/ABI" TRUE) option(WITH_JPEG7 "Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b)" FALSE) option(WITH_JPEG8 "Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b)" FALSE) option(WITH_MEM_SRCDST "Include in-memory source/destination manager functions when emulating the libjpeg v6b or v7 API/ABI" TRUE) @@ -57,6 +57,14 @@ else() set(BITS_IN_JSAMPLE 8) endif() +if(WITH_JPEG8 OR WITH_JPEG7) + set(WITH_ARITH_ENC 1) + set(WITH_ARITH_DEC 1) +endif() +if(WITH_JPEG8) + set(WITH_MEM_SRCDST 1) +endif() + if(WITH_ARITH_ENC) set(C_ARITH_CODING_SUPPORTED 1) message(STATUS "Arithmetic encoding support enabled") diff --git a/configure.ac b/configure.ac index d6a3e33e..9b2c573c 100644 --- a/configure.ac +++ b/configure.ac @@ -279,10 +279,13 @@ AC_DEFINE_UNQUOTED([INLINE],[$ljt_cv_inline],[How to obtain function inlining.]) AC_MSG_CHECKING([whether to include arithmetic encoding support]) AC_ARG_WITH([arith-enc], AC_HELP_STRING([--without-arith-enc], - [Do not include arithmetic encoding support])) + [Do not include arithmetic encoding support when emulating the libjpeg v6b API/ABI])) if test "x$with_12bit" = "xyes"; then with_arith_enc=no fi +if test "x${with_jpeg8}" = "xyes" -o "x${with_jpeg7}" = "xyes"; then + with_arith_enc=yes +fi if test "x$with_arith_enc" = "xno"; then AC_MSG_RESULT(no) RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-arith-enc" @@ -295,10 +298,13 @@ AM_CONDITIONAL([WITH_ARITH_ENC], [test "x$with_arith_enc" != "xno"]) AC_MSG_CHECKING([whether to include arithmetic decoding support]) AC_ARG_WITH([arith-dec], AC_HELP_STRING([--without-arith-dec], - [Do not include arithmetic decoding support])) + [Do not include arithmetic decoding support when emulating the libjpeg v6b API/ABI])) if test "x$with_12bit" = "xyes"; then with_arith_dec=no fi +if test "x${with_jpeg8}" = "xyes" -o "x${with_jpeg7}" = "xyes"; then + with_arith_dec=yes +fi if test "x$with_arith_dec" = "xno"; then AC_MSG_RESULT(no) RPM_CONFIG_ARGS="$RPM_CONFIG_ARGS --without-arith-dec" From f06cc1200fd5f61b63479d7099ccf4a7457a89bd Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 10 May 2016 19:36:34 -0500 Subject: [PATCH 05/10] Build: Add integer version macro to jconfig.h This makes it significantly easier to do conditional compilation based on the libjpeg-turbo version. Based on: https://github.com/hasinoff/libjpeg-turbo/commit/e6d5b3e50b8b07488cb7b4d26ab2061685bc6875 https://github.com/hasinoff/libjpeg-turbo/commit/1394a89ba6f3cd8abb556c1b65bac4a5f09760d0 Closes #80 --- CMakeLists.txt | 18 ++++++++++++++++++ configure.ac | 10 ++++++++++ jconfig.h.in | 3 +++ win/jconfig.h.in | 1 + 4 files changed, 32 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ad29f06..5924f0cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,24 @@ endif() project(libjpeg-turbo C) set(VERSION 1.4.90) +string(REPLACE "." ";" VERSION_TRIPLET ${VERSION}) +list(GET VERSION_TRIPLET 0 VERSION_MAJOR) +list(GET VERSION_TRIPLET 1 VERSION_MINOR) +list(GET VERSION_TRIPLET 2 VERSION_REVISION) +function(pad_number NUMBER OUTPUT_LEN) + string(LENGTH "${${NUMBER}}" INPUT_LEN) + if(INPUT_LEN LESS OUTPUT_LEN) + math(EXPR ZEROES "${OUTPUT_LEN} - ${INPUT_LEN} - 1") + set(NUM ${${NUMBER}}) + foreach(C RANGE ${ZEROES}) + set(NUM "0${NUM}") + endforeach() + set(${NUMBER} ${NUM} PARENT_SCOPE) + endif() +endfunction() +pad_number(VERSION_MINOR 3) +pad_number(VERSION_REVISION 3) +set(LIBJPEG_TURBO_VERSION_NUMBER ${VERSION_MAJOR}${VERSION_MINOR}${VERSION_REVISION}) if(NOT WIN32) message(FATAL_ERROR "Platform not supported by this build system. Use autotools instead.") diff --git a/configure.ac b/configure.ac index 9b2c573c..c728ee81 100644 --- a/configure.ac +++ b/configure.ac @@ -224,6 +224,16 @@ AC_SUBST(MEM_SRCDST_FUNCTIONS) AC_DEFINE_UNQUOTED(LIBJPEG_TURBO_VERSION, [$VERSION], [libjpeg-turbo version]) +m4_define(version_triplet,m4_split(AC_PACKAGE_VERSION,[[.]])) +m4_define(version_major,m4_argn(1,version_triplet)) +m4_define(version_minor,m4_argn(2,version_triplet)) +m4_define(version_revision,m4_argn(3,version_triplet)) +VERSION_MAJOR=version_major +VERSION_MINOR=version_minor +VERSION_REVISION=version_revision +LIBJPEG_TURBO_VERSION_NUMBER=`printf "%d%03d%03d" $VERSION_MAJOR $VERSION_MINOR $VERSION_REVISION` +AC_DEFINE_UNQUOTED(LIBJPEG_TURBO_VERSION_NUMBER, [$LIBJPEG_TURBO_VERSION_NUMBER], [libjpeg-turbo version in integer form]) + VERSION_SCRIPT=yes AC_ARG_ENABLE([ld-version-script], AS_HELP_STRING([--disable-ld-version-script], diff --git a/jconfig.h.in b/jconfig.h.in index 42d86f24..02c12cc1 100644 --- a/jconfig.h.in +++ b/jconfig.h.in @@ -6,6 +6,9 @@ /* libjpeg-turbo version */ #define LIBJPEG_TURBO_VERSION 0 +/* libjpeg-turbo version in integer form */ +#define LIBJPEG_TURBO_VERSION_NUMBER 0 + /* Support arithmetic encoding */ #undef C_ARITH_CODING_SUPPORTED diff --git a/win/jconfig.h.in b/win/jconfig.h.in index 8783900e..9d35121e 100644 --- a/win/jconfig.h.in +++ b/win/jconfig.h.in @@ -3,6 +3,7 @@ #define JPEG_LIB_VERSION @JPEG_LIB_VERSION@ #define LIBJPEG_TURBO_VERSION @VERSION@ +#define LIBJPEG_TURBO_VERSION_NUMBER @LIBJPEG_TURBO_VERSION_NUMBER@ #cmakedefine C_ARITH_CODING_SUPPORTED #cmakedefine D_ARITH_CODING_SUPPORTED #cmakedefine MEM_SRCDST_SUPPORTED From 68cf83db5647104d9d7ea289c399fe6a5c77da64 Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 10 May 2016 21:04:02 -0500 Subject: [PATCH 06/10] Don't allow opaque source/dest mgrs to be swapped Calling jpeg_stdio_dest() followed by jpeg_mem_dest(), or jpeg_mem_src() followed by jpeg_stdio_src(), is dangerous, because the existing opaque structure would not be big enough to accommodate the new source/dest manager. This issue was non-obvious to libjpeg-turbo consumers, since it was only documented in code comments. Furthermore, the issue could also occur if the source/dest manager was allocated by the calling program, but it was not allocated with enough space to accommodate the opaque stdio or memory source/dest manager structs. The safest thing to do is to throw an error if one of these functions is called when there is already a source/dest manager assigned to the object and it was allocated elsewhere. Closes #78, #79 --- ChangeLog.md | 8 ++++++++ jdatadst-tj.c | 7 ++++++- jdatadst.c | 18 ++++++++++++++---- jdatasrc-tj.c | 7 ++++++- jdatasrc.c | 17 ++++++++++++++--- 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 06c05088..0691ccce 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -30,6 +30,14 @@ the TurboJPEG API.) 5. Fixed an issue in the ARM 32-bit SIMD-accelerated Huffman encoder that prevented the code from assembling properly with clang. +6. The `jpeg_stdio_src()`, `jpeg_mem_src()`, `jpeg_stdio_dest()`, and +`jpeg_mem_dest()` functions in the libjpeg API will now throw an error if a +source/destination manager has already been assigned to the compress or +decompress object by a different function or by the calling program. This +prevents these functions from attempting to reuse a source/destination manager +structure that was allocated elsewhere, because there is no way to ensure that +it would be big enough to accommodate the new source/destination manager. + 1.4.90 (1.5 beta1) ================== diff --git a/jdatadst-tj.c b/jdatadst-tj.c index 5d4260a9..c6144ecb 100644 --- a/jdatadst-tj.c +++ b/jdatadst-tj.c @@ -5,7 +5,7 @@ * Copyright (C) 1994-1996, Thomas G. Lane. * Modified 2009-2012 by Guido Vollbeding. * libjpeg-turbo Modifications: - * Copyright (C) 2011, 2014 D. R. Commander. + * Copyright (C) 2011, 2014, 2016, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * @@ -167,6 +167,11 @@ jpeg_mem_dest_tj (j_compress_ptr cinfo, dest = (my_mem_dest_ptr) cinfo->dest; dest->newbuffer = NULL; dest->buffer = NULL; + } else if (cinfo->dest->init_destination != init_mem_destination) { + /* It is unsafe to reuse the existing destination manager unless it was + * created by this function. + */ + ERREXIT(cinfo, JERR_BUFFER_SIZE); } dest = (my_mem_dest_ptr) cinfo->dest; diff --git a/jdatadst.c b/jdatadst.c index 21018b0f..dcaf6f0f 100644 --- a/jdatadst.c +++ b/jdatadst.c @@ -5,7 +5,7 @@ * Copyright (C) 1994-1996, Thomas G. Lane. * Modified 2009-2012 by Guido Vollbeding. * libjpeg-turbo Modifications: - * Copyright (C) 2013, D. R. Commander. + * Copyright (C) 2013, 2016, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * @@ -210,14 +210,19 @@ jpeg_stdio_dest (j_compress_ptr cinfo, FILE *outfile) /* The destination object is made permanent so that multiple JPEG images * can be written to the same file without re-executing jpeg_stdio_dest. - * This makes it dangerous to use this manager and a different destination - * manager serially with the same JPEG object, because their private object - * sizes may be different. Caveat programmer. */ if (cinfo->dest == NULL) { /* first time for this JPEG object? */ cinfo->dest = (struct jpeg_destination_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(my_destination_mgr)); + } else if (cinfo->dest->init_destination != init_destination) { + /* It is unsafe to reuse the existing destination manager unless it was + * created by this function. Otherwise, there is no guarantee that the + * opaque structure is the right size. Note that we could just create a + * new structure, but the old structure would not be freed until + * jpeg_destroy_compress() was called. + */ + ERREXIT(cinfo, JERR_BUFFER_SIZE); } dest = (my_dest_ptr) cinfo->dest; @@ -259,6 +264,11 @@ jpeg_mem_dest (j_compress_ptr cinfo, cinfo->dest = (struct jpeg_destination_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(my_mem_destination_mgr)); + } else if (cinfo->dest->init_destination != init_mem_destination) { + /* It is unsafe to reuse the existing destination manager unless it was + * created by this function. + */ + ERREXIT(cinfo, JERR_BUFFER_SIZE); } dest = (my_mem_dest_ptr) cinfo->dest; diff --git a/jdatasrc-tj.c b/jdatasrc-tj.c index 0b99ee18..05456c8d 100644 --- a/jdatasrc-tj.c +++ b/jdatasrc-tj.c @@ -5,7 +5,7 @@ * Copyright (C) 1994-1996, Thomas G. Lane. * Modified 2009-2011 by Guido Vollbeding. * libjpeg-turbo Modifications: - * Copyright (C) 2011, D. R. Commander. + * Copyright (C) 2011, 2016, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * @@ -173,6 +173,11 @@ jpeg_mem_src_tj (j_decompress_ptr cinfo, cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr)); + } else if (cinfo->src->init_source != init_mem_source) { + /* It is unsafe to reuse the existing source manager unless it was created + * by this function. + */ + ERREXIT(cinfo, JERR_BUFFER_SIZE); } src = cinfo->src; diff --git a/jdatasrc.c b/jdatasrc.c index acbeb8a7..c83183fe 100644 --- a/jdatasrc.c +++ b/jdatasrc.c @@ -5,7 +5,7 @@ * Copyright (C) 1994-1996, Thomas G. Lane. * Modified 2009-2011 by Guido Vollbeding. * libjpeg-turbo Modifications: - * Copyright (C) 2013, D. R. Commander. + * Copyright (C) 2013, 2016, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * @@ -222,8 +222,6 @@ jpeg_stdio_src (j_decompress_ptr cinfo, FILE *infile) * of JPEG images can be read from the same file by calling jpeg_stdio_src * only before the first one. (If we discarded the buffer at the end of * one image, we'd likely lose the start of the next one.) - * This makes it unsafe to use this manager and a different source - * manager serially with the same JPEG object. Caveat programmer. */ if (cinfo->src == NULL) { /* first time for this JPEG object? */ cinfo->src = (struct jpeg_source_mgr *) @@ -233,6 +231,14 @@ jpeg_stdio_src (j_decompress_ptr cinfo, FILE *infile) src->buffer = (JOCTET *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, INPUT_BUF_SIZE * sizeof(JOCTET)); + } else if (cinfo->src->init_source != init_source) { + /* It is unsafe to reuse the existing source manager unless it was created + * by this function. Otherwise, there is no guarantee that the opaque + * structure is the right size. Note that we could just create a new + * structure, but the old structure would not be freed until + * jpeg_destroy_decompress() was called. + */ + ERREXIT(cinfo, JERR_BUFFER_SIZE); } src = (my_src_ptr) cinfo->src; @@ -270,6 +276,11 @@ jpeg_mem_src (j_decompress_ptr cinfo, cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr)); + } else if (cinfo->src->init_source != init_mem_source) { + /* It is unsafe to reuse the existing source manager unless it was created + * by this function. + */ + ERREXIT(cinfo, JERR_BUFFER_SIZE); } src = cinfo->src; From 8f1c0a681cd34e8e80ba7b06f356d6080a7172c9 Mon Sep 17 00:00:00 2001 From: DRC Date: Sat, 28 May 2016 18:08:22 -0500 Subject: [PATCH 07/10] BUILDING.txt: Clarify NASM build requirements The version requirements only apply to NASM (not YASM.) Also, 2.11.09 was never actually released (the first release containing the OS X fix is 2.12.) --- BUILDING.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index 8f4893b5..38581ea6 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -15,13 +15,13 @@ Build Requirements (http://www.macports.org/). -- NASM or YASM (if building x86 or x86-64 SIMD extensions) - * NASM 0.98, or 2.01 or later is required for an x86 build (0.99 and 2.00 do - not work properly with libjpeg-turbo's x86 SIMD code.) - * NASM 2.00 or later is required for an x86-64 build. - * NASM 2.07, or 2.11.09 or later is required for an x86-64 Mac build - (2.11.08 does not work properly with libjpeg-turbo's x86-64 SIMD code when - building macho64 objects.) NASM or YASM can be obtained from MacPorts - (http://www.macports.org/). + * If using NASM, 0.98, or 2.01 or later is required for an x86 build (0.99 + and 2.00 do not work properly with libjpeg-turbo's x86 SIMD code.) + * If using NASM, 2.00 or later is required for an x86-64 build. + * If using NASM, 2.07 or later (except 2.11.08) is required for an x86-64 + Mac build (2.11.08 does not work properly with libjpeg-turbo's x86-64 SIMD + code when building macho64 objects.) NASM or YASM can be obtained from + MacPorts (http://www.macports.org/). The binary RPMs released by the NASM project do not work on older Linux systems, such as Red Hat Enterprise Linux 4. On such systems, you can @@ -518,8 +518,9 @@ Build Requirements launch a command prompt with the appropriate compiler paths automatically set. --- NASM (http://www.nasm.us/) 0.98 or later (NASM 2.05 or later is required for - a 64-bit build) +-- NASM (http://www.nasm.us) or YASM (http://yasm.tortall.net) + * If using NASM, 0.98 or later is required for an x86 build. + * If using NASM, 2.05 or later is required for an x86-64 build. -- If building the TurboJPEG Java wrapper, JDK 1.5 or later is required. This can be downloaded from http://www.java.com. From 123f7258a86e9e701e9c4cf9ce1a1ace00eca98f Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 24 May 2016 10:23:56 -0500 Subject: [PATCH 08/10] Format copyright headers more consistently The IJG convention is to format copyright notices as: Copyright (C) YYYY, Owner. We try to maintain this convention for any code that is part of the libjpeg API library (with the exception of preserving the copyright notices from Cendio's code verbatim, since those predate libjpeg-turbo.) Note that the phrase "All Rights Reserved" is no longer necessary, since all Buenos Aires Convention signatories signed onto the Berne Convention in 2000. However, our convention is to retain this phrase for any files that have a self-contained copyright header but to leave it off of any files that refer to another file for conditions of distribution and use. For instance, all of the non-SIMD files in the libjpeg API library refer to README.ijg, and the copyright message in that file contains "All Rights Reserved", so it is unnecessary to add it to the individual files. The TurboJPEG code retains my preferred formatting convention for copyright notices, which is based on that of VirtualGL (where the TurboJPEG API originated.) --- jccolor.c | 4 ++-- jchuff.c | 4 ++-- jcsample.c | 2 +- jddctmgr.c | 2 +- jdsample.c | 2 +- jfdctfst.c | 2 +- jfdctint.c | 2 +- jidctint.c | 2 +- jidctred.c | 2 +- jpegcomp.h | 2 +- jpegint.h | 2 +- jsimd.h | 4 ++-- jsimd_none.c | 4 ++-- md5/md5hl.c | 2 +- simd/jccolext-altivec.c | 6 +++--- simd/jccolext-mmx.asm | 3 +-- simd/jccolext-sse2-64.asm | 5 +++-- simd/jccolor-altivec.c | 4 ++-- simd/jccolor-mmx.asm | 5 ++--- simd/jccolor-sse2-64.asm | 5 +++-- simd/jccolor-sse2.asm | 5 +++-- simd/jcgray-altivec.c | 4 ++-- simd/jcgray-mmx.asm | 5 ++--- simd/jcgray-sse2-64.asm | 5 +++-- simd/jcgray-sse2.asm | 5 +++-- simd/jcgryext-altivec.c | 6 +++--- simd/jcgryext-mmx.asm | 5 ++--- simd/jcgryext-sse2-64.asm | 5 +++-- simd/jcgryext-sse2.asm | 5 +++-- simd/jchuff-sse2-64.asm | 7 +++---- simd/jchuff-sse2.asm | 7 +++---- simd/jcolsamp.inc | 3 +-- simd/jcsample-altivec.c | 4 ++-- simd/jcsample-mmx.asm | 3 +-- simd/jcsample-sse2-64.asm | 5 ++--- simd/jcsample-sse2.asm | 3 +-- simd/jdcolext-altivec.c | 4 ++-- simd/jdcolext-mmx.asm | 3 +-- simd/jdcolext-sse2-64.asm | 5 ++--- simd/jdcolext-sse2.asm | 5 ++--- simd/jdcolor-altivec.c | 4 ++-- simd/jdcolor-mmx.asm | 5 ++--- simd/jdcolor-sse2-64.asm | 5 ++--- simd/jdcolor-sse2.asm | 5 ++--- simd/jdct.inc | 3 +-- simd/jdmerge-altivec.c | 4 ++-- simd/jdmerge-mmx.asm | 5 ++--- simd/jdmerge-sse2-64.asm | 5 ++--- simd/jdmerge-sse2.asm | 5 ++--- simd/jdmrgext-altivec.c | 4 ++-- simd/jdmrgext-mmx.asm | 3 +-- simd/jdmrgext-sse2-64.asm | 5 ++--- simd/jdmrgext-sse2.asm | 5 ++--- simd/jdsample-altivec.c | 4 ++-- simd/jdsample-mmx.asm | 3 +-- simd/jdsample-sse2-64.asm | 5 ++--- simd/jdsample-sse2.asm | 3 +-- simd/jfdctflt-3dn.asm | 3 +-- simd/jfdctflt-sse-64.asm | 5 ++--- simd/jfdctflt-sse.asm | 3 +-- simd/jfdctfst-altivec.c | 4 ++-- simd/jfdctfst-mmx.asm | 3 +-- simd/jfdctfst-sse2-64.asm | 5 ++--- simd/jfdctfst-sse2.asm | 3 +-- simd/jfdctint-altivec.c | 4 ++-- simd/jfdctint-mmx.asm | 3 +-- simd/jfdctint-sse2-64.asm | 5 ++--- simd/jfdctint-sse2.asm | 3 +-- simd/jidctflt-3dn.asm | 3 +-- simd/jidctflt-sse.asm | 3 +-- simd/jidctflt-sse2-64.asm | 5 ++--- simd/jidctflt-sse2.asm | 3 +-- simd/jidctfst-altivec.c | 4 ++-- simd/jidctfst-mmx.asm | 3 +-- simd/jidctfst-sse2-64.asm | 5 ++--- simd/jidctfst-sse2.asm | 3 +-- simd/jidctint-altivec.c | 4 ++-- simd/jidctint-mmx.asm | 3 +-- simd/jidctint-sse2-64.asm | 5 ++--- simd/jidctint-sse2.asm | 3 +-- simd/jidctred-mmx.asm | 3 +-- simd/jidctred-sse2-64.asm | 5 ++--- simd/jidctred-sse2.asm | 3 +-- simd/jquant-3dn.asm | 3 +-- simd/jquant-mmx.asm | 3 +-- simd/jquant-sse.asm | 3 +-- simd/jquantf-sse2-64.asm | 5 ++--- simd/jquantf-sse2.asm | 3 +-- simd/jquanti-altivec.c | 4 ++-- simd/jquanti-sse2-64.asm | 5 ++--- simd/jquanti-sse2.asm | 3 +-- simd/jsimd.h | 8 ++++---- simd/jsimd_altivec.h | 4 ++-- simd/jsimd_arm.c | 4 ++-- simd/jsimd_arm64.c | 4 ++-- simd/jsimd_arm64_neon.S | 6 +++--- simd/jsimd_arm_neon.S | 12 ++++++------ simd/jsimd_i386.c | 4 ++-- simd/jsimd_mips.c | 6 +++--- simd/jsimd_mips_dspr2.S | 2 +- simd/jsimd_mips_dspr2_asm.h | 2 +- simd/jsimd_powerpc.c | 4 ++-- simd/jsimd_x86_64.c | 4 ++-- simd/jsimdcpu.asm | 3 +-- simd/jsimdext.inc | 5 ++--- wrjpgcom.c | 2 +- 106 files changed, 188 insertions(+), 238 deletions(-) diff --git a/jccolor.c b/jccolor.c index a93498ab..b973d101 100644 --- a/jccolor.c +++ b/jccolor.c @@ -5,8 +5,8 @@ * Copyright (C) 1991-1996, Thomas G. Lane. * libjpeg-turbo Modifications: * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright (C) 2009-2012, 2015 D. R. Commander. - * Copyright (C) 2014, MIPS Technologies, Inc., California + * Copyright (C) 2009-2012, 2015, D. R. Commander. + * Copyright (C) 2014, MIPS Technologies, Inc., California. * For conditions of distribution and use, see the accompanying README.ijg * file. * diff --git a/jchuff.c b/jchuff.c index 58acd705..fffaaceb 100644 --- a/jchuff.c +++ b/jchuff.c @@ -4,8 +4,8 @@ * This file was part of the Independent JPEG Group's software: * Copyright (C) 1991-1997, Thomas G. Lane. * libjpeg-turbo Modifications: - * Copyright (C) 2009-2011, 2014-2016 D. R. Commander. - * Copyright (C) 2015 Matthieu Darbois. + * Copyright (C) 2009-2011, 2014-2016, D. R. Commander. + * Copyright (C) 2015, Matthieu Darbois. * For conditions of distribution and use, see the accompanying README.ijg * file. * diff --git a/jcsample.c b/jcsample.c index 879bd515..c4b49914 100644 --- a/jcsample.c +++ b/jcsample.c @@ -5,7 +5,7 @@ * Copyright (C) 1991-1996, Thomas G. Lane. * libjpeg-turbo Modifications: * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright (C) 2014, MIPS Technologies, Inc., California + * Copyright (C) 2014, MIPS Technologies, Inc., California. * Copyright (C) 2015, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. diff --git a/jddctmgr.c b/jddctmgr.c index bdf7c533..3a5ba7e8 100644 --- a/jddctmgr.c +++ b/jddctmgr.c @@ -7,7 +7,7 @@ * libjpeg-turbo Modifications: * Copyright 2009 Pierre Ossman for Cendio AB * Copyright (C) 2010, 2015, D. R. Commander. - * Copyright (C) 2013, MIPS Technologies, Inc., California + * Copyright (C) 2013, MIPS Technologies, Inc., California. * For conditions of distribution and use, see the accompanying README.ijg * file. * diff --git a/jdsample.c b/jdsample.c index 39b37250..91e29dfb 100644 --- a/jdsample.c +++ b/jdsample.c @@ -6,7 +6,7 @@ * libjpeg-turbo Modifications: * Copyright 2009 Pierre Ossman for Cendio AB * Copyright (C) 2010, 2015-2016, D. R. Commander. - * Copyright (C) 2014, MIPS Technologies, Inc., California + * Copyright (C) 2014, MIPS Technologies, Inc., California. * Copyright (C) 2015, Google, Inc. * For conditions of distribution and use, see the accompanying README.ijg * file. diff --git a/jfdctfst.c b/jfdctfst.c index 82b2515a..5cd83a7b 100644 --- a/jfdctfst.c +++ b/jfdctfst.c @@ -4,7 +4,7 @@ * This file was part of the Independent JPEG Group's software: * Copyright (C) 1994-1996, Thomas G. Lane. * libjpeg-turbo Modifications: - * Copyright (C) 2015, D. R. Commander + * Copyright (C) 2015, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * diff --git a/jfdctint.c b/jfdctint.c index 73e0b590..169bb942 100644 --- a/jfdctint.c +++ b/jfdctint.c @@ -4,7 +4,7 @@ * This file was part of the Independent JPEG Group's software. * Copyright (C) 1991-1996, Thomas G. Lane. * libjpeg-turbo Modifications: - * Copyright (C) 2015, D. R. Commander + * Copyright (C) 2015, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * diff --git a/jidctint.c b/jidctint.c index a2d03fca..3ac6caf6 100644 --- a/jidctint.c +++ b/jidctint.c @@ -5,7 +5,7 @@ * Copyright (C) 1991-1998, Thomas G. Lane. * Modification developed 2002-2009 by Guido Vollbeding. * libjpeg-turbo Modifications: - * Copyright (C) 2015, D. R. Commander + * Copyright (C) 2015, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * diff --git a/jidctred.c b/jidctred.c index 2d5b5466..7a81803b 100644 --- a/jidctred.c +++ b/jidctred.c @@ -4,7 +4,7 @@ * This file was part of the Independent JPEG Group's software. * Copyright (C) 1994-1998, Thomas G. Lane. * libjpeg-turbo Modifications: - * Copyright (C) 2015, D. R. Commander + * Copyright (C) 2015, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * diff --git a/jpegcomp.h b/jpegcomp.h index c39275b2..ade0d1ed 100644 --- a/jpegcomp.h +++ b/jpegcomp.h @@ -1,7 +1,7 @@ /* * jpegcomp.h * - * Copyright (C) 2010, D. R. Commander + * Copyright (C) 2010, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * diff --git a/jpegint.h b/jpegint.h index c3b4320f..f0adbf53 100644 --- a/jpegint.h +++ b/jpegint.h @@ -5,7 +5,7 @@ * Copyright (C) 1991-1997, Thomas G. Lane. * Modified 1997-2009 by Guido Vollbeding. * libjpeg-turbo Modifications: - * Copyright (C) 2015-2016, D. R. Commander + * Copyright (C) 2015-2016, D. R. Commander. * Copyright (C) 2015, Google, Inc. * For conditions of distribution and use, see the accompanying README.ijg * file. diff --git a/jsimd.h b/jsimd.h index f2e24846..3aa0779b 100644 --- a/jsimd.h +++ b/jsimd.h @@ -2,8 +2,8 @@ * jsimd.h * * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright 2011, 2014 D. R. Commander - * Copyright 2015 Matthieu Darbois + * Copyright (C) 2011, 2014, D. R. Commander. + * Copyright (C) 2015, Matthieu Darbois. * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. diff --git a/jsimd_none.c b/jsimd_none.c index 90dc9651..f29030cf 100644 --- a/jsimd_none.c +++ b/jsimd_none.c @@ -2,8 +2,8 @@ * jsimd_none.c * * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright 2009-2011, 2014 D. R. Commander - * Copyright 2015 Matthieu Darbois + * Copyright (C) 2009-2011, 2014, D. R. Commander. + * Copyright (C) 2015, Matthieu Darbois. * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. diff --git a/md5/md5hl.c b/md5/md5hl.c index d2b7ca45..983ea76f 100644 --- a/md5/md5hl.c +++ b/md5/md5hl.c @@ -5,7 +5,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * libjpeg-turbo Modifications: - * Copyright (C) 2016, D. R. Commander + * Copyright (C) 2016, D. R. Commander. * Modifications are under the same license as the original code (see above) * ---------------------------------------------------------------------------- */ diff --git a/simd/jccolext-altivec.c b/simd/jccolext-altivec.c index 403aa964..849825eb 100644 --- a/simd/jccolext-altivec.c +++ b/simd/jccolext-altivec.c @@ -1,9 +1,9 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2014-2015, D. R. Commander. - * Copyright (C) 2014, Jay Foad. - * All rights reserved. + * Copyright (C) 2014-2015, D. R. Commander. All Rights Reserved. + * Copyright (C) 2014, Jay Foad. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jccolext-mmx.asm b/simd/jccolext-mmx.asm index d3d47a56..96a0372b 100644 --- a/simd/jccolext-mmx.asm +++ b/simd/jccolext-mmx.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jccolext-sse2-64.asm b/simd/jccolext-sse2-64.asm index 7ad43438..8e4642d3 100644 --- a/simd/jccolext-sse2-64.asm +++ b/simd/jccolext-sse2-64.asm @@ -1,9 +1,10 @@ ; ; jccolext.asm - colorspace conversion (64-bit SSE2) ; -; x86 SIMD extension for IJG JPEG library -; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 2009, D. R. Commander. +; +; Based on the x86 SIMD extension for IJG JPEG library +; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; ; This file should be assembled with NASM (Netwide Assembler), diff --git a/simd/jccolor-altivec.c b/simd/jccolor-altivec.c index 04b8708d..ec473320 100644 --- a/simd/jccolor-altivec.c +++ b/simd/jccolor-altivec.c @@ -1,8 +1,8 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2014, D. R. Commander. - * All rights reserved. + * Copyright (C) 2014, D. R. Commander. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jccolor-mmx.asm b/simd/jccolor-mmx.asm index c5d37644..c4e6d88b 100644 --- a/simd/jccolor-mmx.asm +++ b/simd/jccolor-mmx.asm @@ -2,10 +2,9 @@ ; jccolor.asm - colorspace conversion (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jccolor-sse2-64.asm b/simd/jccolor-sse2-64.asm index 55c7e12e..bd2188b4 100644 --- a/simd/jccolor-sse2-64.asm +++ b/simd/jccolor-sse2-64.asm @@ -1,9 +1,10 @@ ; ; jccolor.asm - colorspace conversion (64-bit SSE2) ; -; x86 SIMD extension for IJG JPEG library -; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 2009, D. R. Commander. +; +; Based on the x86 SIMD extension for IJG JPEG library +; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; ; This file should be assembled with NASM (Netwide Assembler), diff --git a/simd/jccolor-sse2.asm b/simd/jccolor-sse2.asm index 890e2a3b..13124d13 100644 --- a/simd/jccolor-sse2.asm +++ b/simd/jccolor-sse2.asm @@ -1,9 +1,10 @@ ; ; jccolor.asm - colorspace conversion (SSE2) ; -; x86 SIMD extension for IJG JPEG library -; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 2009, D. R. Commander. +; +; Based on the x86 SIMD extension for IJG JPEG library +; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; ; This file should be assembled with NASM (Netwide Assembler), diff --git a/simd/jcgray-altivec.c b/simd/jcgray-altivec.c index b52fade0..684df5ef 100644 --- a/simd/jcgray-altivec.c +++ b/simd/jcgray-altivec.c @@ -1,8 +1,8 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2014, D. R. Commander. - * All rights reserved. + * Copyright (C) 2014, D. R. Commander. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jcgray-mmx.asm b/simd/jcgray-mmx.asm index b2708ad4..0819b6ca 100644 --- a/simd/jcgray-mmx.asm +++ b/simd/jcgray-mmx.asm @@ -2,10 +2,9 @@ ; jcgray.asm - grayscale colorspace conversion (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2011 D. R. Commander +; Copyright (C) 2011, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jcgray-sse2-64.asm b/simd/jcgray-sse2-64.asm index dfc05776..bafd302a 100644 --- a/simd/jcgray-sse2-64.asm +++ b/simd/jcgray-sse2-64.asm @@ -1,9 +1,10 @@ ; ; jcgray.asm - grayscale colorspace conversion (64-bit SSE2) ; -; x86 SIMD extension for IJG JPEG library -; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 2011, D. R. Commander. +; +; Based on the x86 SIMD extension for IJG JPEG library +; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; ; This file should be assembled with NASM (Netwide Assembler), diff --git a/simd/jcgray-sse2.asm b/simd/jcgray-sse2.asm index 5fa72736..5b0b4669 100644 --- a/simd/jcgray-sse2.asm +++ b/simd/jcgray-sse2.asm @@ -1,9 +1,10 @@ ; ; jcgray.asm - grayscale colorspace conversion (SSE2) ; -; x86 SIMD extension for IJG JPEG library -; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 2011, D. R. Commander. +; +; Based on the x86 SIMD extension for IJG JPEG library +; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; ; This file should be assembled with NASM (Netwide Assembler), diff --git a/simd/jcgryext-altivec.c b/simd/jcgryext-altivec.c index c171615d..7f8232bb 100644 --- a/simd/jcgryext-altivec.c +++ b/simd/jcgryext-altivec.c @@ -1,9 +1,9 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2014-2015, D. R. Commander. - * Copyright (C) 2014, Jay Foad. - * All rights reserved. + * Copyright (C) 2014-2015, D. R. Commander. All Rights Reserved. + * Copyright (C) 2014, Jay Foad. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jcgryext-mmx.asm b/simd/jcgryext-mmx.asm index 13b96008..1c1b8d8b 100644 --- a/simd/jcgryext-mmx.asm +++ b/simd/jcgryext-mmx.asm @@ -2,10 +2,9 @@ ; jcgryext.asm - grayscale colorspace conversion (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2011 D. R. Commander +; Copyright (C) 2011, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jcgryext-sse2-64.asm b/simd/jcgryext-sse2-64.asm index 82c0fc81..541355af 100644 --- a/simd/jcgryext-sse2-64.asm +++ b/simd/jcgryext-sse2-64.asm @@ -1,9 +1,10 @@ ; ; jcgryext.asm - grayscale colorspace conversion (64-bit SSE2) ; -; x86 SIMD extension for IJG JPEG library -; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 2011, D. R. Commander. +; +; Based on the x86 SIMD extension for IJG JPEG library +; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; ; This file should be assembled with NASM (Netwide Assembler), diff --git a/simd/jcgryext-sse2.asm b/simd/jcgryext-sse2.asm index 1097b29d..cd16dd19 100644 --- a/simd/jcgryext-sse2.asm +++ b/simd/jcgryext-sse2.asm @@ -1,9 +1,10 @@ ; ; jcgryext.asm - grayscale colorspace conversion (SSE2) ; -; x86 SIMD extension for IJG JPEG library -; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 2011, D. R. Commander. +; +; Based on the x86 SIMD extension for IJG JPEG library +; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; ; This file should be assembled with NASM (Netwide Assembler), diff --git a/simd/jchuff-sse2-64.asm b/simd/jchuff-sse2-64.asm index 84eaeebf..b1144d1c 100644 --- a/simd/jchuff-sse2-64.asm +++ b/simd/jchuff-sse2-64.asm @@ -1,11 +1,10 @@ ; ; jchuff-sse2-64.asm - Huffman entropy encoding (64-bit SSE2) ; -; Copyright 2009-2011, 2014-2016 D. R. Commander. -; Copyright 2015 Matthieu Darbois +; Copyright (C) 2009-2011, 2014-2016, D. R. Commander. +; Copyright (C) 2015, Matthieu Darbois. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jchuff-sse2.asm b/simd/jchuff-sse2.asm index 1d82273f..36d1f2db 100644 --- a/simd/jchuff-sse2.asm +++ b/simd/jchuff-sse2.asm @@ -1,11 +1,10 @@ ; ; jchuff-sse2.asm - Huffman entropy encoding (SSE2) ; -; Copyright 2009-2011, 2014-2016 D. R. Commander. -; Copyright 2015 Matthieu Darbois +; Copyright (C) 2009-2011, 2014-2016, D. R. Commander. +; Copyright (C) 2015, Matthieu Darbois. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jcolsamp.inc b/simd/jcolsamp.inc index 79751b7c..3be446e8 100644 --- a/simd/jcolsamp.inc +++ b/simd/jcolsamp.inc @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jcsample-altivec.c b/simd/jcsample-altivec.c index 603492db..11609d9d 100644 --- a/simd/jcsample-altivec.c +++ b/simd/jcsample-altivec.c @@ -1,8 +1,8 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2015, D. R. Commander. - * All rights reserved. + * Copyright (C) 2015, D. R. Commander. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jcsample-mmx.asm b/simd/jcsample-mmx.asm index 6881a56d..6cd544e7 100644 --- a/simd/jcsample-mmx.asm +++ b/simd/jcsample-mmx.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jcsample-sse2-64.asm b/simd/jcsample-sse2-64.asm index 7693285c..40ee15fc 100644 --- a/simd/jcsample-sse2-64.asm +++ b/simd/jcsample-sse2-64.asm @@ -2,10 +2,9 @@ ; jcsample.asm - downsampling (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jcsample-sse2.asm b/simd/jcsample-sse2.asm index 11202dbf..83c9d152 100644 --- a/simd/jcsample-sse2.asm +++ b/simd/jcsample-sse2.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdcolext-altivec.c b/simd/jdcolext-altivec.c index 1ae91b9c..fb121ce7 100644 --- a/simd/jdcolext-altivec.c +++ b/simd/jdcolext-altivec.c @@ -1,8 +1,8 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2015, D. R. Commander. - * All rights reserved. + * Copyright (C) 2015, D. R. Commander. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jdcolext-mmx.asm b/simd/jdcolext-mmx.asm index de1f00f1..21e34f67 100644 --- a/simd/jdcolext-mmx.asm +++ b/simd/jdcolext-mmx.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdcolext-sse2-64.asm b/simd/jdcolext-sse2-64.asm index d356e659..4634066c 100644 --- a/simd/jdcolext-sse2-64.asm +++ b/simd/jdcolext-sse2-64.asm @@ -2,10 +2,9 @@ ; jdcolext.asm - colorspace conversion (64-bit SSE2) ; ; Copyright 2009, 2012 Pierre Ossman for Cendio AB -; Copyright 2009, 2012 D. R. Commander +; Copyright (C) 2009, 2012, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdcolext-sse2.asm b/simd/jdcolext-sse2.asm index 54ae4db5..682aef35 100644 --- a/simd/jdcolext-sse2.asm +++ b/simd/jdcolext-sse2.asm @@ -2,10 +2,9 @@ ; jdcolext.asm - colorspace conversion (SSE2) ; ; Copyright 2009, 2012 Pierre Ossman for Cendio AB -; Copyright 2012 D. R. Commander +; Copyright (C) 2012, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdcolor-altivec.c b/simd/jdcolor-altivec.c index e0892d80..0dc4c427 100644 --- a/simd/jdcolor-altivec.c +++ b/simd/jdcolor-altivec.c @@ -1,8 +1,8 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2015, D. R. Commander. - * All rights reserved. + * Copyright (C) 2015, D. R. Commander. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jdcolor-mmx.asm b/simd/jdcolor-mmx.asm index 6730e485..4e58031d 100644 --- a/simd/jdcolor-mmx.asm +++ b/simd/jdcolor-mmx.asm @@ -2,10 +2,9 @@ ; jdcolor.asm - colorspace conversion (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdcolor-sse2-64.asm b/simd/jdcolor-sse2-64.asm index e9277f1d..d2bf2100 100644 --- a/simd/jdcolor-sse2-64.asm +++ b/simd/jdcolor-sse2-64.asm @@ -2,10 +2,9 @@ ; jdcolor.asm - colorspace conversion (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdcolor-sse2.asm b/simd/jdcolor-sse2.asm index c122cc75..7ff5d05d 100644 --- a/simd/jdcolor-sse2.asm +++ b/simd/jdcolor-sse2.asm @@ -2,10 +2,9 @@ ; jdcolor.asm - colorspace conversion (SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdct.inc b/simd/jdct.inc index ad5890c6..b9761071 100644 --- a/simd/jdct.inc +++ b/simd/jdct.inc @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdmerge-altivec.c b/simd/jdmerge-altivec.c index cc8d3d91..6a35f201 100644 --- a/simd/jdmerge-altivec.c +++ b/simd/jdmerge-altivec.c @@ -1,8 +1,8 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2015, D. R. Commander. - * All rights reserved. + * Copyright (C) 2015, D. R. Commander. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jdmerge-mmx.asm b/simd/jdmerge-mmx.asm index 2daa7faf..ee58bff1 100644 --- a/simd/jdmerge-mmx.asm +++ b/simd/jdmerge-mmx.asm @@ -2,10 +2,9 @@ ; jdmerge.asm - merged upsampling/color conversion (MMX) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdmerge-sse2-64.asm b/simd/jdmerge-sse2-64.asm index 8f953c71..244bd402 100644 --- a/simd/jdmerge-sse2-64.asm +++ b/simd/jdmerge-sse2-64.asm @@ -2,10 +2,9 @@ ; jdmerge.asm - merged upsampling/color conversion (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdmerge-sse2.asm b/simd/jdmerge-sse2.asm index d22e8281..236de5a3 100644 --- a/simd/jdmerge-sse2.asm +++ b/simd/jdmerge-sse2.asm @@ -2,10 +2,9 @@ ; jdmerge.asm - merged upsampling/color conversion (SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdmrgext-altivec.c b/simd/jdmrgext-altivec.c index 3b6950d6..55205bb1 100644 --- a/simd/jdmrgext-altivec.c +++ b/simd/jdmrgext-altivec.c @@ -1,8 +1,8 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2015, D. R. Commander. - * All rights reserved. + * Copyright (C) 2015, D. R. Commander. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jdmrgext-mmx.asm b/simd/jdmrgext-mmx.asm index a92e9341..63f45cf3 100644 --- a/simd/jdmrgext-mmx.asm +++ b/simd/jdmrgext-mmx.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdmrgext-sse2-64.asm b/simd/jdmrgext-sse2-64.asm index 989d7f17..ad74c5ff 100644 --- a/simd/jdmrgext-sse2-64.asm +++ b/simd/jdmrgext-sse2-64.asm @@ -2,10 +2,9 @@ ; jdmrgext.asm - merged upsampling/color conversion (64-bit SSE2) ; ; Copyright 2009, 2012 Pierre Ossman for Cendio AB -; Copyright 2009, 2012 D. R. Commander +; Copyright (C) 2009, 2012, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdmrgext-sse2.asm b/simd/jdmrgext-sse2.asm index c47916f6..b50f698b 100644 --- a/simd/jdmrgext-sse2.asm +++ b/simd/jdmrgext-sse2.asm @@ -2,10 +2,9 @@ ; jdmrgext.asm - merged upsampling/color conversion (SSE2) ; ; Copyright 2009, 2012 Pierre Ossman for Cendio AB -; Copyright 2012 D. R. Commander +; Copyright (C) 2012, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdsample-altivec.c b/simd/jdsample-altivec.c index 63d6d8ca..b40ce55c 100644 --- a/simd/jdsample-altivec.c +++ b/simd/jdsample-altivec.c @@ -1,8 +1,8 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2015, D. R. Commander. - * All rights reserved. + * Copyright (C) 2015, D. R. Commander. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jdsample-mmx.asm b/simd/jdsample-mmx.asm index c9e2b8ba..5e4fa7ae 100644 --- a/simd/jdsample-mmx.asm +++ b/simd/jdsample-mmx.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdsample-sse2-64.asm b/simd/jdsample-sse2-64.asm index 3aec69f4..1faaed64 100644 --- a/simd/jdsample-sse2-64.asm +++ b/simd/jdsample-sse2-64.asm @@ -2,10 +2,9 @@ ; jdsample.asm - upsampling (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jdsample-sse2.asm b/simd/jdsample-sse2.asm index f75e5944..1d0059e8 100644 --- a/simd/jdsample-sse2.asm +++ b/simd/jdsample-sse2.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jfdctflt-3dn.asm b/simd/jfdctflt-3dn.asm index 133fe4df..21916181 100644 --- a/simd/jfdctflt-3dn.asm +++ b/simd/jfdctflt-3dn.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jfdctflt-sse-64.asm b/simd/jfdctflt-sse-64.asm index 02d54635..4b64ea4b 100644 --- a/simd/jfdctflt-sse-64.asm +++ b/simd/jfdctflt-sse-64.asm @@ -2,10 +2,9 @@ ; jfdctflt.asm - floating-point FDCT (64-bit SSE) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jfdctflt-sse.asm b/simd/jfdctflt-sse.asm index c2f61c83..e7ede26c 100644 --- a/simd/jfdctflt-sse.asm +++ b/simd/jfdctflt-sse.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jfdctfst-altivec.c b/simd/jfdctfst-altivec.c index c4cc26e7..04157f77 100644 --- a/simd/jfdctfst-altivec.c +++ b/simd/jfdctfst-altivec.c @@ -1,8 +1,8 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2014, D. R. Commander. - * All rights reserved. + * Copyright (C) 2014, D. R. Commander. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jfdctfst-mmx.asm b/simd/jfdctfst-mmx.asm index 41ba00e1..eb2eb9c5 100644 --- a/simd/jfdctfst-mmx.asm +++ b/simd/jfdctfst-mmx.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jfdctfst-sse2-64.asm b/simd/jfdctfst-sse2-64.asm index f9b15512..4c966854 100644 --- a/simd/jfdctfst-sse2-64.asm +++ b/simd/jfdctfst-sse2-64.asm @@ -2,10 +2,9 @@ ; jfdctfst.asm - fast integer FDCT (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jfdctfst-sse2.asm b/simd/jfdctfst-sse2.asm index ebbadadf..54856a23 100644 --- a/simd/jfdctfst-sse2.asm +++ b/simd/jfdctfst-sse2.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jfdctint-altivec.c b/simd/jfdctint-altivec.c index c13850a8..e6e8a568 100644 --- a/simd/jfdctint-altivec.c +++ b/simd/jfdctint-altivec.c @@ -1,8 +1,8 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2014, D. R. Commander. - * All rights reserved. + * Copyright (C) 2014, D. R. Commander. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jfdctint-mmx.asm b/simd/jfdctint-mmx.asm index 47f6041b..9142ad88 100644 --- a/simd/jfdctint-mmx.asm +++ b/simd/jfdctint-mmx.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jfdctint-sse2-64.asm b/simd/jfdctint-sse2-64.asm index c23fcfb9..9a0ca0fd 100644 --- a/simd/jfdctint-sse2-64.asm +++ b/simd/jfdctint-sse2-64.asm @@ -2,10 +2,9 @@ ; jfdctint.asm - accurate integer FDCT (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jfdctint-sse2.asm b/simd/jfdctint-sse2.asm index 6b42ce5c..db9d0bbe 100644 --- a/simd/jfdctint-sse2.asm +++ b/simd/jfdctint-sse2.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jidctflt-3dn.asm b/simd/jidctflt-3dn.asm index 24bd1059..99356f20 100644 --- a/simd/jidctflt-3dn.asm +++ b/simd/jidctflt-3dn.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jidctflt-sse.asm b/simd/jidctflt-sse.asm index 9605b730..4d4af2ff 100644 --- a/simd/jidctflt-sse.asm +++ b/simd/jidctflt-sse.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jidctflt-sse2-64.asm b/simd/jidctflt-sse2-64.asm index 3f535010..bdda05d9 100644 --- a/simd/jidctflt-sse2-64.asm +++ b/simd/jidctflt-sse2-64.asm @@ -2,10 +2,9 @@ ; jidctflt.asm - floating-point IDCT (64-bit SSE & SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jidctflt-sse2.asm b/simd/jidctflt-sse2.asm index be899b3d..a15a9c11 100644 --- a/simd/jidctflt-sse2.asm +++ b/simd/jidctflt-sse2.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jidctfst-altivec.c b/simd/jidctfst-altivec.c index 67cbe842..ec30c399 100644 --- a/simd/jidctfst-altivec.c +++ b/simd/jidctfst-altivec.c @@ -1,8 +1,8 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2014-2015, D. R. Commander. - * All rights reserved. + * Copyright (C) 2014-2015, D. R. Commander. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jidctfst-mmx.asm b/simd/jidctfst-mmx.asm index 0e3963db..6e95bfbc 100644 --- a/simd/jidctfst-mmx.asm +++ b/simd/jidctfst-mmx.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jidctfst-sse2-64.asm b/simd/jidctfst-sse2-64.asm index da4ecf2f..48846426 100644 --- a/simd/jidctfst-sse2-64.asm +++ b/simd/jidctfst-sse2-64.asm @@ -2,10 +2,9 @@ ; jidctfst.asm - fast integer IDCT (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jidctfst-sse2.asm b/simd/jidctfst-sse2.asm index 065842c6..f591e55f 100644 --- a/simd/jidctfst-sse2.asm +++ b/simd/jidctfst-sse2.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jidctint-altivec.c b/simd/jidctint-altivec.c index 5f1a5dfc..935f35d1 100644 --- a/simd/jidctint-altivec.c +++ b/simd/jidctint-altivec.c @@ -1,8 +1,8 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2014-2015, D. R. Commander. - * All rights reserved. + * Copyright (C) 2014-2015, D. R. Commander. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jidctint-mmx.asm b/simd/jidctint-mmx.asm index fda3b63e..5bd19812 100644 --- a/simd/jidctint-mmx.asm +++ b/simd/jidctint-mmx.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jidctint-sse2-64.asm b/simd/jidctint-sse2-64.asm index bfec4994..afe1d6a7 100644 --- a/simd/jidctint-sse2-64.asm +++ b/simd/jidctint-sse2-64.asm @@ -2,10 +2,9 @@ ; jidctint.asm - accurate integer IDCT (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jidctint-sse2.asm b/simd/jidctint-sse2.asm index 1960bcd5..6c7e7d9b 100644 --- a/simd/jidctint-sse2.asm +++ b/simd/jidctint-sse2.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jidctred-mmx.asm b/simd/jidctred-mmx.asm index 21e17fce..ba054e31 100644 --- a/simd/jidctred-mmx.asm +++ b/simd/jidctred-mmx.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jidctred-sse2-64.asm b/simd/jidctred-sse2-64.asm index d1b18742..a54bbe24 100644 --- a/simd/jidctred-sse2-64.asm +++ b/simd/jidctred-sse2-64.asm @@ -2,10 +2,9 @@ ; jidctred.asm - reduced-size IDCT (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jidctred-sse2.asm b/simd/jidctred-sse2.asm index e48c0c5b..232d9838 100644 --- a/simd/jidctred-sse2.asm +++ b/simd/jidctred-sse2.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jquant-3dn.asm b/simd/jquant-3dn.asm index 6b7c11c8..0b4164b2 100644 --- a/simd/jquant-3dn.asm +++ b/simd/jquant-3dn.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jquant-mmx.asm b/simd/jquant-mmx.asm index dbfeceec..aed6071b 100644 --- a/simd/jquant-mmx.asm +++ b/simd/jquant-mmx.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jquant-sse.asm b/simd/jquant-sse.asm index 796723ac..1baf88f2 100644 --- a/simd/jquant-sse.asm +++ b/simd/jquant-sse.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jquantf-sse2-64.asm b/simd/jquantf-sse2-64.asm index 8af256c4..ef5c1f95 100644 --- a/simd/jquantf-sse2-64.asm +++ b/simd/jquantf-sse2-64.asm @@ -2,10 +2,9 @@ ; jquantf.asm - sample data conversion and quantization (64-bit SSE & SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jquantf-sse2.asm b/simd/jquantf-sse2.asm index a8d4cd39..1cbc2674 100644 --- a/simd/jquantf-sse2.asm +++ b/simd/jquantf-sse2.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jquanti-altivec.c b/simd/jquanti-altivec.c index b3adab9a..25cc296f 100644 --- a/simd/jquanti-altivec.c +++ b/simd/jquanti-altivec.c @@ -1,8 +1,8 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2014-2015, D. R. Commander. - * All rights reserved. + * Copyright (C) 2014-2015, D. R. Commander. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jquanti-sse2-64.asm b/simd/jquanti-sse2-64.asm index 9b3f4eee..66c4e519 100644 --- a/simd/jquanti-sse2-64.asm +++ b/simd/jquanti-sse2-64.asm @@ -2,10 +2,9 @@ ; jquanti.asm - sample data conversion and quantization (64-bit SSE2) ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2009 D. R. Commander +; Copyright (C) 2009, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jquanti-sse2.asm b/simd/jquanti-sse2.asm index 4299c333..aea8604e 100644 --- a/simd/jquanti-sse2.asm +++ b/simd/jquanti-sse2.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jsimd.h b/simd/jsimd.h index a39fafa7..dc6ec430 100644 --- a/simd/jsimd.h +++ b/simd/jsimd.h @@ -2,10 +2,10 @@ * simd/jsimd.h * * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright (C) 2011, 2014-2016 D. R. Commander - * Copyright (C) 2013-2014, MIPS Technologies, Inc., California - * Copyright (C) 2014 Linaro Limited - * Copyright (C) 2015-2016 Matthieu Darbois + * Copyright (C) 2011, 2014-2016, D. R. Commander. + * Copyright (C) 2013-2014, MIPS Technologies, Inc., California. + * Copyright (C) 2014, Linaro Limited. + * Copyright (C) 2015-2016, Matthieu Darbois. * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. diff --git a/simd/jsimd_altivec.h b/simd/jsimd_altivec.h index 26602192..62dbc5cd 100644 --- a/simd/jsimd_altivec.h +++ b/simd/jsimd_altivec.h @@ -1,8 +1,8 @@ /* * AltiVec optimizations for libjpeg-turbo * - * Copyright (C) 2014-2015, D. R. Commander. - * All rights reserved. + * Copyright (C) 2014-2015, D. R. Commander. All Rights Reserved. + * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages * arising from the use of this software. diff --git a/simd/jsimd_arm.c b/simd/jsimd_arm.c index ea621da8..754806dc 100644 --- a/simd/jsimd_arm.c +++ b/simd/jsimd_arm.c @@ -2,8 +2,8 @@ * jsimd_arm.c * * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright 2009-2011, 2013-2014, 2016 D. R. Commander - * Copyright 2015-2016 Matthieu Darbois + * Copyright (C) 2009-2011, 2013-2014, 2016, D. R. Commander. + * Copyright (C) 2015-2016, Matthieu Darbois. * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. diff --git a/simd/jsimd_arm64.c b/simd/jsimd_arm64.c index 62dbc450..7def8f92 100644 --- a/simd/jsimd_arm64.c +++ b/simd/jsimd_arm64.c @@ -2,8 +2,8 @@ * jsimd_arm64.c * * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright 2009-2011, 2013-2014, 2016 D. R. Commander - * Copyright 2015-2016 Matthieu Darbois + * Copyright (C) 2009-2011, 2013-2014, 2016, D. R. Commander. + * Copyright (C) 2015-2016, Matthieu Darbois. * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. diff --git a/simd/jsimd_arm64_neon.S b/simd/jsimd_arm64_neon.S index d236314e..74d6c76e 100644 --- a/simd/jsimd_arm64_neon.S +++ b/simd/jsimd_arm64_neon.S @@ -1,10 +1,10 @@ /* * ARMv8 NEON optimizations for libjpeg-turbo * - * Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies). - * All rights reserved. + * Copyright (C) 2009-2011, Nokia Corporation and/or its subsidiary(-ies). + * All Rights Reserved. * Author: Siarhei Siamashka - * Copyright (C) 2013-2014, Linaro Limited + * Copyright (C) 2013-2014, Linaro Limited. All Rights Reserved. * Author: Ragesh Radhakrishnan * Copyright (C) 2014-2016, D. R. Commander. All Rights Reserved. * Copyright (C) 2015-2016, Matthieu Darbois. All Rights Reserved. diff --git a/simd/jsimd_arm_neon.S b/simd/jsimd_arm_neon.S index 568768f7..cd261272 100644 --- a/simd/jsimd_arm_neon.S +++ b/simd/jsimd_arm_neon.S @@ -1,13 +1,13 @@ /* * ARMv7 NEON optimizations for libjpeg-turbo * - * Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies). - * All rights reserved. + * Copyright (C) 2009-2011, Nokia Corporation and/or its subsidiary(-ies). + * All Rights Reserved. * Author: Siarhei Siamashka - * Copyright (C) 2014 Siarhei Siamashka. All Rights Reserved. - * Copyright (C) 2014 Linaro Limited. All Rights Reserved. - * Copyright (C) 2015 D. R. Commander. All Rights Reserved. - * Copyright (C) 2015-2016 Matthieu Darbois. All Rights Reserved. + * Copyright (C) 2014, Siarhei Siamashka. All Rights Reserved. + * Copyright (C) 2014, Linaro Limited. All Rights Reserved. + * Copyright (C) 2015, D. R. Commander. All Rights Reserved. + * Copyright (C) 2015-2016, Matthieu Darbois. All Rights Reserved. * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff --git a/simd/jsimd_i386.c b/simd/jsimd_i386.c index aef1ad4c..6da8bd89 100644 --- a/simd/jsimd_i386.c +++ b/simd/jsimd_i386.c @@ -2,8 +2,8 @@ * jsimd_i386.c * * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright 2009-2011, 2013-2014, 2016 D. R. Commander - * Copyright 2015 Matthieu Darbois + * Copyright (C) 2009-2011, 2013-2014, 2016, D. R. Commander. + * Copyright (C) 2015, Matthieu Darbois. * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. diff --git a/simd/jsimd_mips.c b/simd/jsimd_mips.c index bdd99129..358bbb83 100644 --- a/simd/jsimd_mips.c +++ b/simd/jsimd_mips.c @@ -2,9 +2,9 @@ * jsimd_mips.c * * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright 2009-2011, 2014 D. R. Commander - * Copyright (C) 2013-2014, MIPS Technologies, Inc., California - * Copyright 2015 Matthieu Darbois + * Copyright (C) 2009-2011, 2014, D. R. Commander. + * Copyright (C) 2013-2014, MIPS Technologies, Inc., California. + * Copyright (C) 2015, Matthieu Darbois. * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. diff --git a/simd/jsimd_mips_dspr2.S b/simd/jsimd_mips_dspr2.S index 0eed1ce2..c8c286cb 100644 --- a/simd/jsimd_mips_dspr2.S +++ b/simd/jsimd_mips_dspr2.S @@ -2,7 +2,7 @@ * MIPS DSPr2 optimizations for libjpeg-turbo * * Copyright (C) 2013-2014, MIPS Technologies, Inc., California. - * All rights reserved. + * All Rights Reserved. * Authors: Teodora Novkovic (teodora.novkovic@imgtec.com) * Darko Laus (darko.laus@imgtec.com) * Copyright (C) 2015, D. R. Commander. All Rights Reserved. diff --git a/simd/jsimd_mips_dspr2_asm.h b/simd/jsimd_mips_dspr2_asm.h index 50ec31bf..64f98804 100644 --- a/simd/jsimd_mips_dspr2_asm.h +++ b/simd/jsimd_mips_dspr2_asm.h @@ -2,7 +2,7 @@ * MIPS DSPr2 optimizations for libjpeg-turbo * * Copyright (C) 2013, MIPS Technologies, Inc., California. - * All rights reserved. + * All Rights Reserved. * Authors: Teodora Novkovic (teodora.novkovic@imgtec.com) * Darko Laus (darko.laus@imgtec.com) * This software is provided 'as-is', without any express or implied diff --git a/simd/jsimd_powerpc.c b/simd/jsimd_powerpc.c index afbaa821..9edd50a1 100644 --- a/simd/jsimd_powerpc.c +++ b/simd/jsimd_powerpc.c @@ -2,8 +2,8 @@ * jsimd_powerpc.c * * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright 2009-2011, 2014-2015 D. R. Commander - * Copyright 2015 Matthieu Darbois + * Copyright (C) 2009-2011, 2014-2015, D. R. Commander. + * Copyright (C) 2015, Matthieu Darbois. * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. diff --git a/simd/jsimd_x86_64.c b/simd/jsimd_x86_64.c index fa33bea0..a62bcdb0 100644 --- a/simd/jsimd_x86_64.c +++ b/simd/jsimd_x86_64.c @@ -2,8 +2,8 @@ * jsimd_x86_64.c * * Copyright 2009 Pierre Ossman for Cendio AB - * Copyright 2009-2011, 2014, 2016 D. R. Commander - * Copyright 2015 Matthieu Darbois + * Copyright (C) 2009-2011, 2014, 2016, D. R. Commander. + * Copyright (C) 2015, Matthieu Darbois. * * Based on the x86 SIMD extension for IJG JPEG library, * Copyright (C) 1999-2006, MIYASAKA Masaru. diff --git a/simd/jsimdcpu.asm b/simd/jsimdcpu.asm index c42c4ad6..599083b1 100644 --- a/simd/jsimdcpu.asm +++ b/simd/jsimdcpu.asm @@ -3,8 +3,7 @@ ; ; Copyright 2009 Pierre Ossman for Cendio AB ; -; Based on -; x86 SIMD extension for IJG JPEG library +; Based on the x86 SIMD extension for IJG JPEG library ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; For conditions of distribution and use, see copyright notice in jsimdext.inc ; diff --git a/simd/jsimdext.inc b/simd/jsimdext.inc index e1442de1..f28db60b 100644 --- a/simd/jsimdext.inc +++ b/simd/jsimdext.inc @@ -2,10 +2,9 @@ ; jsimdext.inc - common declarations ; ; Copyright 2009 Pierre Ossman for Cendio AB -; Copyright 2010 D. R. Commander +; Copyright (C) 2010, D. R. Commander. ; -; Based on -; x86 SIMD extension for IJG JPEG library - version 1.02 +; Based on the x86 SIMD extension for IJG JPEG library - version 1.02 ; ; Copyright (C) 1999-2006, MIYASAKA Masaru. ; diff --git a/wrjpgcom.c b/wrjpgcom.c index cd67afd3..c9707575 100644 --- a/wrjpgcom.c +++ b/wrjpgcom.c @@ -4,7 +4,7 @@ * This file was part of the Independent JPEG Group's software: * Copyright (C) 1994-1997, Thomas G. Lane. * libjpeg-turbo Modifications: - * Copyright (C) 2014, D. R. Commander + * Copyright (C) 2014, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * From 1d50a8cd08b65e2b9bfceb877302a59046179863 Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 31 May 2016 22:48:52 -0500 Subject: [PATCH 09/10] BUILDING.md: More NASM/YASM clarifications 28d1a1300c6be7fc8614ed827eb56cd97cf84e76 introduced the line "nasm.exe should be in your PATH". This commit corrects an oversight in 8f1c0a681cd34e8e80ba7b06f356d6080a7172c9 / e5091f2cf3b6ba747907012146df93df0d01ec85 whereby this line should have been extended to include yasm.exe. --- BUILDING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILDING.md b/BUILDING.md index a0af863f..53228737 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -463,7 +463,7 @@ Build Requirements - [NASM](http://www.nasm.us) or [YASM](http://yasm.tortall.net) * If using NASM, 0.98 or later is required for an x86 build. * If using NASM, 2.05 or later is required for an x86-64 build. - * nasm.exe should be in your `PATH`. + * nasm.exe/yasm.exe should be in your `PATH`. - Microsoft Visual C++ 2005 or later From 3ff13e651bbe6de9c6f15d05235d1d4f26f63ffc Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 31 May 2016 22:53:17 -0500 Subject: [PATCH 10/10] 1.5.0 --- CMakeLists.txt | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5924f0cf..1d82d179 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ if(POLICY CMP0022) endif() project(libjpeg-turbo C) -set(VERSION 1.4.90) +set(VERSION 1.5.0) string(REPLACE "." ";" VERSION_TRIPLET ${VERSION}) list(GET VERSION_TRIPLET 0 VERSION_MAJOR) list(GET VERSION_TRIPLET 1 VERSION_MINOR) diff --git a/configure.ac b/configure.ac index c728ee81..173000fa 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.56]) -AC_INIT([libjpeg-turbo], [1.4.90]) +AC_INIT([libjpeg-turbo], [1.5.0]) AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2]) AC_PREFIX_DEFAULT(/opt/libjpeg-turbo)