python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2026-02-04 06:25:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 45cb4e5e25 into 29ff5fcb55

Browse Source
This commit is contained in:
Mark Harfouche 2026-01-28 01:05:02 +01:00 committed by GitHub
commit 7df490691b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 98 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
setup.py
View File

@ -723,7 +723,12 @@ class pil_build_ext(build_ext):
if feature.want("zlib"):
_dbg("Looking for zlib")
if _find_include_file(self, "zlib.h"):
if _find_include_file(self, "zlib-ng.h"):
if _find_library_file(self, "z-ng"):
feature.set("zlib", "z-ng")
elif sys.platform == "win32" and _find_library_file(self, "zlib-ng"):
feature.set("zlib", "zlib-ng")
elif _find_include_file(self, "zlib.h"):
if _find_library_file(self, "z"):
feature.set("zlib", "z")
elif sys.platform == "win32" and _find_library_file(self, "zlib"):
@ -920,9 +925,11 @@ class pil_build_ext(build_ext):
defs.append(("HAVE_OPENJPEG", None))
if sys.platform == "win32" and not PLATFORM_MINGW:
defs.append(("OPJ_STATIC", None))
if feature.get("zlib"):
libs.append(feature.get("zlib"))
if zlib := feature.get("zlib"):
libs.append(zlib)
defs.append(("HAVE_LIBZ", None))
if zlib in ["z-ng", "zlib-ng"]:
defs.append(("HAVE_ZLIBNG", None))
if feature.get("imagequant"):
libs.append(feature.get("imagequant"))
defs.append(("HAVE_LIBIMAGEQUANT", None))

6
src/_imaging.c
View File

@ -85,8 +85,10 @@
#endif
#endif
#ifdef HAVE_LIBZ
#include "zlib.h"
#ifdef HAVE_ZLIBNG
#include <zlib-ng.h>
#else
#include <zlib.h>
#endif
#ifdef HAVE_LIBTIFF

10
src/libImaging/ZipCodecs.h
View File

@ -7,7 +7,11 @@
* Copyright (c) Fredrik Lundh 1996.
*/
#include "zlib.h"
#ifdef HAVE_ZLIBNG
#include <zlib-ng.h>
#else
#include <zlib.h>
#endif
/* modes */
#define ZIP_PNG 0 /* continuous, filtered image data */
@ -35,7 +39,11 @@ typedef struct {
/* PRIVATE CONTEXT (set by decoder/encoder) */
#ifdef HAVE_ZLIBNG
zng_stream z_stream; /* (de)compression stream */
#else
z_stream z_stream; /* (de)compression stream */
#endif
UINT8 *previous; /* previous line (allocated) */

24
src/libImaging/ZipDecode.c
View File

@ -80,7 +80,11 @@ ImagingZipDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
context->z_stream.zfree = (free_func)NULL;
context->z_stream.opaque = (voidpf)NULL;
#ifdef HAVE_ZLIBNG
err = zng_inflateInit(&context->z_stream);
#else
err = inflateInit(&context->z_stream);
#endif
if (err < 0) {
state->errcode = IMAGING_CODEC_CONFIG;
free(context->previous);
@ -112,7 +116,11 @@ ImagingZipDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
context->z_stream.next_out = state->buffer + context->last_output;
context->z_stream.avail_out = row_len + context->prefix - context->last_output;
#ifdef HAVE_ZLIBNG
err = zng_inflate(&context->z_stream, Z_NO_FLUSH);
#else
err = inflate(&context->z_stream, Z_NO_FLUSH);
#endif
if (err < 0) {
/* Something went wrong inside the compression library */
@ -125,7 +133,11 @@ ImagingZipDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
}
free(context->previous);
context->previous = NULL;
#ifdef HAVE_ZLIBNG
zng_inflateEnd(&context->z_stream);
#else
inflateEnd(&context->z_stream);
#endif
return -1;
}
@ -196,7 +208,11 @@ ImagingZipDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
state->errcode = IMAGING_CODEC_UNKNOWN;
free(context->previous);
context->previous = NULL;
#ifdef HAVE_ZLIBNG
zng_inflateEnd(&context->z_stream);
#else
inflateEnd(&context->z_stream);
#endif
return -1;
}
break;
@ -270,7 +286,11 @@ ImagingZipDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
free(context->previous);
context->previous = NULL;
#ifdef HAVE_ZLIBNG
zng_inflateEnd(&context->z_stream);
#else
inflateEnd(&context->z_stream);
#endif
return -1; /* end of file (errcode=0) */
}
@ -292,7 +312,11 @@ ImagingZipDecodeCleanup(ImagingCodecState state) {
/* Clean up */
if (context->previous) {
#ifdef HAVE_ZLIBNG
zng_inflateEnd(&context->z_stream);
#else
inflateEnd(&context->z_stream);
#endif
free(context->previous);
context->previous = NULL;
}

51
src/libImaging/ZipEncode.c
View File

@ -88,6 +88,20 @@ ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
compress_type = context->compress_type;
}
#ifdef HAVE_ZLIBNG
err = zng_deflateInit2(
&context->z_stream,
/* compression level */
compress_level,
/* compression method */
Z_DEFLATED,
/* compression memory resources */
15,
9,
/* compression strategy (image data are filtered)*/
compress_type
);
#else
err = deflateInit2(
&context->z_stream,
/* compression level */
@ -100,17 +114,26 @@ ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
/* compression strategy (image data are filtered)*/
compress_type
);
#endif
if (err < 0) {
state->errcode = IMAGING_CODEC_CONFIG;
return -1;
}
if (context->dictionary && context->dictionary_size > 0) {
#ifdef HAVE_ZLIBNG
err = zng_deflateSetDictionary(
&context->z_stream,
(unsigned char *)context->dictionary,
context->dictionary_size
);
#else
err = deflateSetDictionary(
&context->z_stream,
(unsigned char *)context->dictionary,
context->dictionary_size
);
#endif
if (err < 0) {
state->errcode = IMAGING_CODEC_CONFIG;
return -1;
@ -126,7 +149,11 @@ ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
context->z_stream.avail_out = bytes;
if (context->z_stream.next_in && context->z_stream.avail_in > 0) {
/* We have some data from previous round, deflate it first */
#ifdef HAVE_ZLIBNG
err = zng_deflate(&context->z_stream, Z_NO_FLUSH);
#else
err = deflate(&context->z_stream, Z_NO_FLUSH);
#endif
if (err < 0) {
/* Something went wrong inside the compression library */
@ -142,7 +169,11 @@ ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
free(context->up);
free(context->prior);
free(context->previous);
#ifdef HAVE_ZLIBNG
zng_deflateEnd(&context->z_stream);
#else
deflateEnd(&context->z_stream);
#endif
return -1;
}
}
@ -279,7 +310,11 @@ ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
context->z_stream.next_in = context->output;
context->z_stream.avail_in = state->bytes + 1;
#ifdef HAVE_ZLIBNG
err = zng_deflate(&context->z_stream, Z_NO_FLUSH);
#else
err = deflate(&context->z_stream, Z_NO_FLUSH);
#endif
if (err < 0) {
/* Something went wrong inside the compression library */
@ -295,7 +330,11 @@ ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
free(context->up);
free(context->prior);
free(context->previous);
#ifdef HAVE_ZLIBNG
zng_deflateEnd(&context->z_stream);
#else
deflateEnd(&context->z_stream);
#endif
ImagingSectionLeave(&cookie);
return -1;
}
@ -315,7 +354,11 @@ ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
/* End of image data; flush compressor buffers */
while (context->z_stream.avail_out > 0) {
#ifdef HAVE_ZLIBNG
err = zng_deflate(&context->z_stream, Z_FINISH);
#else
err = deflate(&context->z_stream, Z_FINISH);
#endif
if (err == Z_STREAM_END) {
free(context->paeth);
@ -324,7 +367,11 @@ ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
free(context->prior);
free(context->previous);
#ifdef HAVE_ZLIBNG
zng_deflateEnd(&context->z_stream);
#else
deflateEnd(&context->z_stream);
#endif
state->errcode = IMAGING_CODEC_END;
@ -364,7 +411,11 @@ ImagingZipEncodeCleanup(ImagingCodecState state) {
const char *
ImagingZipVersion(void) {
#ifdef HAVE_ZLIBNG
return zlibng_version();
#else
return zlibVersion();
#endif
}
#endif