Bug 1278648 - Update libjpeg-turbo to version 1.5.0. r=jrmuizel

diff --git jdhuff.c jdhuff.c

--- jdhuff.c

+++ jdhuff.c

@@ -661,34 +661,34 @@ decode_mcu_fast (j_decompress_ptr cinfo,

@@ -664,17 +664,17 @@ decode_mcu_fast (j_decompress_ptr cinfo,

   ASSIGN_STATE(state, entropy->saved);

   for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {

     JBLOCKROW block = MCU_data[blkn];

     JBLOCKROW block = MCU_data ? MCU_data[blkn] : NULL;

     d_derived_tbl *dctbl = entropy->dc_cur_tbls[blkn];

     d_derived_tbl *actbl = entropy->ac_cur_tbls[blkn];

     register int s, k, r, l;

     if (entropy->dc_needed[blkn]) {

       int ci = cinfo->MCU_membership[blkn];

       s += state.last_dc_val[ci];

@@ -682,17 +682,17 @@ decode_mcu_fast (j_decompress_ptr cinfo,

       state.last_dc_val[ci] = s;

       if (block)

         (*block)[0] = (JCOEF) s;

     }

     if (entropy->ac_needed[blkn]) {

     if (entropy->ac_needed[blkn] && block) {

       for (k = 1; k < DCTSIZE2; k++) {

-        HUFF_DECODE_FAST(s, l, actbl);

           FILL_BIT_BUFFER_FAST

           r = GET_BITS(s);

           s = HUFF_EXTEND(r, s);

@@ -697,33 +697,34 @@ decode_mcu_fast (j_decompress_ptr cinfo,

@@ -701,33 +701,34 @@ decode_mcu_fast (j_decompress_ptr cinfo,

           if (r != 15) break;

           k += 15;

         }

diff --git jdhuff.h jdhuff.h

--- jdhuff.h

+++ jdhuff.h

@@ -200,32 +200,34 @@ EXTERN(boolean) jpeg_fill_bit_buffer

@@ -203,32 +203,34 @@ EXTERN(boolean) jpeg_fill_bit_buffer

   } else { \

 slowlabel: \

     if ((result=jpeg_huff_decode(&state,get_buffer,bits_left,htbl,nb)) < 0) \

libjpeg-turbo Licenses

======================

libjpeg-turbo is covered by three compatible BSD-style open source licenses:

- The IJG (Independent JPEG Group) License, which is listed in

  [README.ijg](README.ijg)

  This license applies to the libjpeg API library and associated programs

  (any code inherited from libjpeg, and any modifications to that code.)

- The Modified (3-clause) BSD License, which is listed in

  [turbojpeg.c](turbojpeg.c)

  This license covers the TurboJPEG API library and associated programs.

- The zlib License, which is listed in [simd/jsimdext.inc](simd/jsimdext.inc)

  This license is a subset of the other two, and it covers the libjpeg-turbo

  SIMD extensions.

Complying with the libjpeg-turbo Licenses

=========================================

This section provides a roll-up of the libjpeg-turbo licensing terms, to the

best of our understanding.

1.  If you are distributing a modified version of the libjpeg-turbo source,

    then:

    1.  You cannot alter or remove any existing copyright or license notices

        from the source.

        **Origin**

        - Clause 1 of the IJG License

        - Clause 1 of the Modified BSD License

        - Clauses 1 and 3 of the zlib License

    2.  You must add your own copyright notice to the header of each source

        file you modified, so others can tell that you modified that file (if

        there is not an existing copyright header in that file, then you can

        simply add a notice stating that you modified the file.)

        **Origin**

        - Clause 1 of the IJG License

        - Clause 2 of the zlib License

    3.  You must include the IJG README file, and you must not alter any of the

        copyright or license text in that file.

        **Origin**

        - Clause 1 of the IJG License

2.  If you are distributing only libjpeg-turbo binaries without the source, or

    if you are distributing an application that statically links with

    libjpeg-turbo, then:

    1.  Your product documentation must include a message stating:

        This software is based in part on the work of the Independent JPEG

        Group.

        **Origin**

        - Clause 2 of the IJG license

    2.  If your binary distribution includes or uses the TurboJPEG API, then

        your product documentation must include the text of the Modified BSD

        License.

        **Origin**

        - Clause 2 of the Modified BSD License

3.  You cannot use the name of the IJG or The libjpeg-turbo Project or the

    contributors thereof in advertising, publicity, etc.

    **Origin**

    - IJG License

    - Clause 3 of the Modified BSD License

4.  The IJG and The libjpeg-turbo Project do not warrant libjpeg-turbo to be

    free of defects, nor do we accept any liability for undesirable

    consequences resulting from your use of the software.

    **Origin**

    - IJG License

    - Modified BSD License

    - zlib License

  You can easily look for all non *.c, *.h, *.asm, and *.inc files by running

    $ hg status -nu | grep -v '\(c\|h\|asm\|inc\)$'

    $ hg status -nu | grep -v '\(c\|h\|asm\|inc\|md\|ijg\)$'

  Once you're comfortable that you're only deleting files you want to delete

  (and you've hg add'ed the files you want to keep), you can nuke the remaining

  files with

    $ hg status -nu | grep -v '\(c\|h\|asm\|inc\)$' | xargs rm

    $ hg status -nu | grep -v '\(c\|h\|asm\|inc\|md\|ijg\)$' | xargs rm

  A helpful command for finding the *.c files which aren't *currently* part of

  the build is

    $ hg addremove

== June 23, 2016 (libjpeg-turbo v1.5.0 3ff13e651bbe6de9c6f15d05235d1d4f26f63ffc 2016-05-31) ==

* Updated to v1.5.0 release.

== October 5, 2015 (libjpeg-turbo v1.4.2 d8da49effe6460d55239c4c009c57f42d8e4a494 2015-09-21) ==

* Updated to v1.4.2 release.

libjpeg-turbo note:  This file has been modified by The libjpeg-turbo Project

to include only information relevant to libjpeg-turbo, to wordsmith certain

sections, and to remove impolitic language that existed in the libjpeg v8

README.  It is included only for reference.  Please see README-turbo.txt for

README.  It is included only for reference.  Please see README.md for

information specific to libjpeg-turbo.

fitness for a particular purpose.  This software is provided "AS IS", and you,

its user, assume the entire risk as to its quality and accuracy.

This software is copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.

This software is copyright (C) 1991-2016, Thomas G. Lane, Guido Vollbeding.

All Rights Reserved except as specified below.

Permission is hereby granted to use, copy, modify, and distribute this

but is also freely distributable.

The IJG distribution formerly included code to read and write GIF files.

To avoid entanglement with the Unisys LZW patent, GIF reading support has

been removed altogether, and the GIF writer has been simplified to produce

"uncompressed GIFs".  This technique does not use the LZW algorithm; the

resulting GIF files are larger than usual, but are readable by all standard

GIF decoders.

To avoid entanglement with the Unisys LZW patent (now expired), GIF reading

support has been removed altogether, and the GIF writer has been simplified

to produce "uncompressed GIFs".  This technique does not use the LZW

algorithm; the resulting GIF files are larger than usual, but are readable

by all standard GIF decoders.

We are required to state that

    "The Graphics Interchange Format(c) is the Copyright property of

	Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.

(Adjacent articles in that issue discuss MPEG motion picture compression,

applications of JPEG, and related topics.)  If you don't have the CACM issue

handy, a PostScript file containing a revised version of Wallace's article is

available at http://www.ijg.org/files/wallace.ps.gz.  The file (actually

handy, a PDF file containing a revised version of Wallace's article is

available at http://www.ijg.org/files/Wallace.JPEG.pdf.  The file (actually

a preprint for an article that appeared in IEEE Trans. Consumer Electronics)

omits the sample images that appeared in CACM, but it includes corrections

and some added material.  Note: the Wallace article is copyright ACM and IEEE,

The "official" archive site for this software is www.ijg.org.

The most recent released version can always be found there in

directory "files".  This particular version will be archived as

http://www.ijg.org/files/jpegsrc.v8d.tar.gz, and in Windows-compatible

"zip" archive format as http://www.ijg.org/files/jpegsr8d.zip.

directory "files".

The JPEG FAQ (Frequently Asked Questions) article is a source of some

general information about JPEG.