Mercurial > hg > release > icedtea7-forest-2.6 > jdk

changeset 9976:f655f983190e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8230597: Update GIFlib library to the 5.2.1 Reviewed-by: prr, psadhukhan, jdv
author serb
date Tue, 21 Jul 2020 02:16:55 +0100
parents f7a0e14a0461
children d953287f939d
files THIRD_PARTY_README src/share/native/sun/awt/giflib/dgif_lib.c src/share/native/sun/awt/giflib/gif_err.c src/share/native/sun/awt/giflib/gif_hash.h src/share/native/sun/awt/giflib/gif_lib.h src/share/native/sun/awt/giflib/gif_lib_private.h src/share/native/sun/awt/giflib/gifalloc.c src/share/native/sun/awt/giflib/openbsd-reallocarray.c
diffstat 8 files changed, 20 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/THIRD_PARTY_README	Tue Jul 21 02:05:14 2020 +0100
+++ b/THIRD_PARTY_README	Tue Jul 21 02:16:55 2020 +0100
@@ -1121,7 +1121,7 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, which is 
+%% This notice is provided with respect to GIFLIB 5.2.1 & libungif 4.1.3, which is 
 included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
--- a/src/share/native/sun/awt/giflib/dgif_lib.c	Tue Jul 21 02:05:14 2020 +0100
+++ b/src/share/native/sun/awt/giflib/dgif_lib.c	Tue Jul 21 02:16:55 2020 +0100
@@ -30,22 +30,21 @@
 if you only require one of read and write capability, only one of these
 two modules will be linked.  Preserve this property!
 
+SPDX-License-Identifier: MIT
+
 *****************************************************************************/
 
 #include <stdlib.h>
 #include <limits.h>
 #include <stdint.h>
 #include <fcntl.h>
-/** Begin JDK modifications to support building on Windows **/
-#ifndef _WIN32
-#include <unistd.h>
-#endif
-/** End JDK modifications to support building on Windows **/
 #include <stdio.h>
 #include <string.h>
 
 #ifdef _WIN32
 #include <io.h>
+#else
+#include <unistd.h>
 #endif /* _WIN32 */
 
 #include "gif_lib.h"
@@ -55,8 +54,7 @@
 #define UNSIGNED_LITTLE_ENDIAN(lo, hi) ((lo) | ((hi) << 8))
 
 /* avoid extra function call in case we use fread (TVT) */
-/** JDK modification "inline" is dropped to support c89 **/
-static /**inline**/ int InternalRead(GifFileType *gif, GifByteType *buf, int len) {
+static int InternalRead(GifFileType *gif, GifByteType *buf, int len) {
     //fprintf(stderr, "### Read: %d\n", len);
     return
     (((GifFilePrivateType*)gif->Private)->Read ?
@@ -969,7 +967,7 @@
                 while (StackPtr != 0 && i < LineLen)
                     Line[i++] = Stack[--StackPtr];
             }
-            if (LastCode != NO_SUCH_CODE && Private->RunningCode - 2 < LZ_MAX_CODE && Prefix[Private->RunningCode - 2] == NO_SUCH_CODE) {
+            if (LastCode != NO_SUCH_CODE && Private->RunningCode - 2 < (LZ_MAX_CODE+1) && Prefix[Private->RunningCode - 2] == NO_SUCH_CODE) {
                 Prefix[Private->RunningCode - 2] = LastCode;
 
                 if (CrntCode == Private->RunningCode - 2) {
--- a/src/share/native/sun/awt/giflib/gif_err.c	Tue Jul 21 02:05:14 2020 +0100
+++ b/src/share/native/sun/awt/giflib/gif_err.c	Tue Jul 21 02:16:55 2020 +0100
@@ -26,6 +26,8 @@
 
 gif_err.c - handle error reporting for the GIF library.
 
+SPDX-License-Identifier: MIT
+
 ****************************************************************************/
 
 #include <stdio.h>
--- a/src/share/native/sun/awt/giflib/gif_hash.h	Tue Jul 21 02:05:14 2020 +0100
+++ b/src/share/native/sun/awt/giflib/gif_hash.h	Tue Jul 21 02:16:55 2020 +0100
@@ -26,6 +26,8 @@
 
 gif_hash.h - magfic constants and declarations for GIF LZW
 
+SPDX-License-Identifier: MIT
+
 ******************************************************************************/
 
 #ifndef _GIF_HASH_H_
--- a/src/share/native/sun/awt/giflib/gif_lib.h	Tue Jul 21 02:05:14 2020 +0100
+++ b/src/share/native/sun/awt/giflib/gif_lib.h	Tue Jul 21 02:16:55 2020 +0100
@@ -26,6 +26,8 @@
 
 gif_lib.h - service library for decoding and encoding GIF images
 
+SPDX-License-Identifier: MIT
+
 *****************************************************************************/
 
 #ifndef _GIF_LIB_H_
@@ -36,8 +38,8 @@
 #endif /* __cplusplus */
 
 #define GIFLIB_MAJOR 5
-#define GIFLIB_MINOR 1
-#define GIFLIB_RELEASE 8
+#define GIFLIB_MINOR 2
+#define GIFLIB_RELEASE 1
 
 #define GIF_ERROR   0
 #define GIF_OK      1
@@ -247,15 +249,6 @@
 
 
 /******************************************************************************
- Color table quantization (deprecated)
-******************************************************************************/
-int GifQuantizeBuffer(unsigned int Width, unsigned int Height,
-                   int *ColorMapSize, GifByteType * RedInput,
-                   GifByteType * GreenInput, GifByteType * BlueInput,
-                   GifByteType * OutputBuffer,
-                   GifColorType * OutputColorMap);
-
-/******************************************************************************
  Error handling and reporting.
 ******************************************************************************/
 extern const char *GifErrorString(int ErrorCode);     /* new in 2012 - ESR */
--- a/src/share/native/sun/awt/giflib/gif_lib_private.h	Tue Jul 21 02:05:14 2020 +0100
+++ b/src/share/native/sun/awt/giflib/gif_lib_private.h	Tue Jul 21 02:16:55 2020 +0100
@@ -26,6 +26,8 @@
 
 gif_lib_private.h - internal giflib routines and structures
 
+SPDX-License-Identifier: MIT
+
 ****************************************************************************/
 
 #ifndef _GIF_LIB_PRIVATE_H
--- a/src/share/native/sun/awt/giflib/gifalloc.c	Tue Jul 21 02:05:14 2020 +0100
+++ b/src/share/native/sun/awt/giflib/gifalloc.c	Tue Jul 21 02:16:55 2020 +0100
@@ -26,6 +26,8 @@
 
  GIF construction tools
 
+SPDX-License-Identifier: MIT
+
 ****************************************************************************/
 
 #include <stdlib.h>
--- a/src/share/native/sun/awt/giflib/openbsd-reallocarray.c	Tue Jul 21 02:05:14 2020 +0100
+++ b/src/share/native/sun/awt/giflib/openbsd-reallocarray.c	Tue Jul 21 02:16:55 2020 +0100
@@ -25,18 +25,7 @@
 /*    $OpenBSD: reallocarray.c,v 1.1 2014/05/08 21:43:49 deraadt Exp $    */
 /*
  * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * SPDX-License-Identifier: MIT
  */
 
 #include <sys/types.h>