Skip to content
Permalink
Browse files

8230597: Update GIFlib library to the 5.2.1

Reviewed-by: prr, psadhukhan, jdv
  • Loading branch information
mrserb committed Dec 3, 2019
1 parent cb13ea5 commit 37c069446a2ea415c8f6740ca4e7032c33e7d31e
@@ -1,9 +1,9 @@
## GIFLIB v5.1.8
## GIFLIB v5.2.1

### GIFLIB License
```
The GIFLIB distribution is Copyright (c) 1997 Eric S. Raymond
The GIFLIB distribution is Copyright (c) 1997 Eric S. Raymond
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -27,17 +27,4 @@ THE SOFTWARE.
https://sourceforge.net/p/giflib/code/ci/master/tree/openbsd-reallocarray.c
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
@@ -30,22 +30,21 @@ The functions here and in egif_lib.c are partitioned carefully so that
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 @@ two modules will be linked. Preserve this property!
#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 @@ DGifDecompressLine(GifFileType *GifFile, GifPixelType *Line, int LineLen)
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) {
@@ -26,6 +26,8 @@
gif_err.c - handle error reporting for the GIF library.
SPDX-License-Identifier: MIT
****************************************************************************/

#include <stdio.h>
@@ -26,6 +26,8 @@
gif_hash.h - magfic constants and declarations for GIF LZW
SPDX-License-Identifier: MIT
******************************************************************************/

#ifndef _GIF_HASH_H_
@@ -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 @@ extern "C" {
#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
@@ -246,15 +248,6 @@ int DGifGetLZCodes(GifFileType *GifFile, int *GifCode);
const char *DGifGetGifVersion(GifFileType *GifFile);


/******************************************************************************
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.
******************************************************************************/
@@ -26,6 +26,8 @@
gif_lib_private.h - internal giflib routines and structures
SPDX-License-Identifier: MIT
****************************************************************************/

#ifndef _GIF_LIB_PRIVATE_H
@@ -26,6 +26,8 @@
GIF construction tools
SPDX-License-Identifier: MIT
****************************************************************************/

#include <stdlib.h>
@@ -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>

0 comments on commit 37c0694

Please sign in to comment.
You can’t perform that action at this time.