python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-09-21 11:28:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4923 from ax3l/fix-imagingHinclude

Browse Source
This commit is contained in:
Hugo van Kemenade 2020-10-14 16:33:42 +03:00 committed by GitHub
commit 2c0aa5d0b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup.py
View File

@ -355,8 +355,6 @@ class pil_build_ext(build_ext):
library_dirs = [] library_dirs = []
include_dirs = [] include_dirs = []
_add_directory(include_dirs, "src/libImaging")
pkg_config = None pkg_config = None
if _cmd_exists(os.environ.get("PKG_CONFIG", "pkg-config")): if _cmd_exists(os.environ.get("PKG_CONFIG", "pkg-config")):
pkg_config = _pkg_config pkg_config = _pkg_config
@ -765,7 +763,7 @@ class pil_build_ext(build_ext):
self._remove_extension("PIL._webp") self._remove_extension("PIL._webp")
tk_libs = ["psapi"] if sys.platform == "win32" else [] tk_libs = ["psapi"] if sys.platform == "win32" else []
self._update_extension("PIL._imagingtk", tk_libs, include_dirs=["src/Tk"]) self._update_extension("PIL._imagingtk", tk_libs)
build_ext.build_extensions(self) build_ext.build_extensions(self)

2
src/Tk/tkImaging.c
View File

@ -39,7 +39,7 @@
* See the README file for information on usage and redistribution. * See the README file for information on usage and redistribution.
*/ */
#include "Imaging.h" #include "../libImaging/Imaging.h"
#include "_tkmini.h" #include "_tkmini.h"
#include <stdlib.h> #include <stdlib.h>

2
src/_imaging.c
View File

@ -88,7 +88,7 @@
#endif #endif
#endif #endif
#include "Imaging.h" #include "libImaging/Imaging.h"
#define _USE_MATH_DEFINES #define _USE_MATH_DEFINES
#include <math.h> #include <math.h>

2
src/_imagingcms.c
View File

@ -31,7 +31,7 @@ http://www.cazabon.com\n\
#include "datetime.h" #include "datetime.h"
#include "lcms2.h" #include "lcms2.h"
#include "Imaging.h" #include "libImaging/Imaging.h"
#define PYCMSVERSION "1.0.0 pil" #define PYCMSVERSION "1.0.0 pil"

4
src/_imagingft.c
View File

@ -20,7 +20,7 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "Imaging.h" #include "libImaging/Imaging.h"
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
@ -53,7 +53,7 @@
#define FT_ERROR_START_LIST { #define FT_ERROR_START_LIST {
#define FT_ERROR_END_LIST { 0, 0 } }; #define FT_ERROR_END_LIST { 0, 0 } };
#include <raqm.h> #include "libImaging/raqm.h"
#define LAYOUT_FALLBACK 0 #define LAYOUT_FALLBACK 0
#define LAYOUT_RAQM 1 #define LAYOUT_RAQM 1

2
src/_imagingmath.c
View File

@ -15,7 +15,7 @@
#include "Python.h" #include "Python.h"
#include "Imaging.h" #include "libImaging/Imaging.h"
#include "math.h" #include "math.h"
#include "float.h" #include "float.h"

2
src/_imagingmorph.c
View File

@ -12,7 +12,7 @@
*/ */
#include "Python.h" #include "Python.h"
#include "Imaging.h" #include "libImaging/Imaging.h"
#define LUT_SIZE (1<<9) #define LUT_SIZE (1<<9)

4
src/_imagingtk.c
View File

@ -14,9 +14,9 @@
#include "Python.h" #include "Python.h"
#include "Imaging.h" #include "libImaging/Imaging.h"
#include "_tkmini.h" #include "Tk/_tkmini.h"
/* must link with Tk/tkImaging.c */ /* must link with Tk/tkImaging.c */
extern void TkImaging_Init(Tcl_Interp* interp); extern void TkImaging_Init(Tcl_Interp* interp);

2
src/_webp.c
View File

@ -1,6 +1,6 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include <Python.h> #include <Python.h>
#include "Imaging.h" #include "libImaging/Imaging.h"
#include <webp/encode.h> #include <webp/encode.h>
#include <webp/decode.h> #include <webp/decode.h>
#include <webp/types.h> #include <webp/types.h>

18
src/decode.c
View File

@ -32,12 +32,12 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "Imaging.h" #include "libImaging/Imaging.h"
#include "Gif.h" #include "libImaging/Gif.h"
#include "Raw.h" #include "libImaging/Raw.h"
#include "Bit.h" #include "libImaging/Bit.h"
#include "Sgi.h" #include "libImaging/Sgi.h"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
@ -509,7 +509,7 @@ PyImaging_HexDecoderNew(PyObject* self, PyObject* args)
#ifdef HAVE_LIBTIFF #ifdef HAVE_LIBTIFF
#include "TiffDecode.h" #include "libImaging/TiffDecode.h"
#include <string.h> #include <string.h>
@ -807,7 +807,7 @@ PyImaging_XbmDecoderNew(PyObject* self, PyObject* args)
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
#include "ZipCodecs.h" #include "libImaging/ZipCodecs.h"
PyObject* PyObject*
PyImaging_ZipDecoderNew(PyObject* self, PyObject* args) PyImaging_ZipDecoderNew(PyObject* self, PyObject* args)
@ -859,7 +859,7 @@ PyImaging_ZipDecoderNew(PyObject* self, PyObject* args)
#undef INT16 #undef INT16
#undef INT32 #undef INT32
#include "Jpeg.h" #include "libImaging/Jpeg.h"
PyObject* PyObject*
PyImaging_JpegDecoderNew(PyObject* self, PyObject* args) PyImaging_JpegDecoderNew(PyObject* self, PyObject* args)
@ -916,7 +916,7 @@ PyImaging_JpegDecoderNew(PyObject* self, PyObject* args)
#ifdef HAVE_OPENJPEG #ifdef HAVE_OPENJPEG
#include "Jpeg2K.h" #include "libImaging/Jpeg2K.h"
PyObject* PyObject*
PyImaging_Jpeg2KDecoderNew(PyObject* self, PyObject* args) PyImaging_Jpeg2KDecoderNew(PyObject* self, PyObject* args)

4
src/display.c
View File

@ -25,14 +25,14 @@
#include "Python.h" #include "Python.h"
#include "Imaging.h" #include "libImaging/Imaging.h"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* Windows DIB support */ /* Windows DIB support */
#ifdef _WIN32 #ifdef _WIN32
#include "ImDib.h" #include "libImaging/ImDib.h"
#if SIZEOF_VOID_P == 8 #if SIZEOF_VOID_P == 8
#define F_HANDLE "K" #define F_HANDLE "K"

12
src/encode.c
View File

@ -25,8 +25,8 @@
#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "Imaging.h" #include "libImaging/Imaging.h"
#include "Gif.h" #include "libImaging/Gif.h"
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> /* write */ #include <unistd.h> /* write */
@ -578,7 +578,7 @@ PyImaging_XbmEncoderNew(PyObject* self, PyObject* args)
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
#include "ZipCodecs.h" #include "libImaging/ZipCodecs.h"
PyObject* PyObject*
PyImaging_ZipEncoderNew(PyObject* self, PyObject* args) PyImaging_ZipEncoderNew(PyObject* self, PyObject* args)
@ -648,7 +648,7 @@ PyImaging_ZipEncoderNew(PyObject* self, PyObject* args)
#ifdef HAVE_LIBTIFF #ifdef HAVE_LIBTIFF
#include "TiffDecode.h" #include "libImaging/TiffDecode.h"
#include <string.h> #include <string.h>
@ -975,7 +975,7 @@ PyImaging_LibTiffEncoderNew(PyObject* self, PyObject* args)
#undef INT16 #undef INT16
#undef INT32 #undef INT32
#include "Jpeg.h" #include "libImaging/Jpeg.h"
static unsigned int* get_qtables_arrays(PyObject* qtables, int* qtablesLen) { static unsigned int* get_qtables_arrays(PyObject* qtables, int* qtablesLen) {
PyObject* tables; PyObject* tables;
@ -1145,7 +1145,7 @@ PyImaging_JpegEncoderNew(PyObject* self, PyObject* args)
#ifdef HAVE_OPENJPEG #ifdef HAVE_OPENJPEG
#include "Jpeg2K.h" #include "libImaging/Jpeg2K.h"
static void static void
j2k_decode_coord_tuple(PyObject *tuple, int *x, int *y) j2k_decode_coord_tuple(PyObject *tuple, int *x, int *y)

2
src/map.c
View File

@ -20,7 +20,7 @@
#include "Python.h" #include "Python.h"
#include "Imaging.h" #include "libImaging/Imaging.h"
/* compatibility wrappers (defined in _imaging.c) */ /* compatibility wrappers (defined in _imaging.c) */
extern int PyImaging_CheckBuffer(PyObject* buffer); extern int PyImaging_CheckBuffer(PyObject* buffer);

2
src/outline.c
View File

@ -19,7 +19,7 @@
#include "Python.h" #include "Python.h"
#include "Imaging.h" #include "libImaging/Imaging.h"
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */

2
src/path.c
View File

@ -27,7 +27,7 @@
#include "Python.h" #include "Python.h"
#include "Imaging.h" #include "libImaging/Imaging.h"
#include <math.h> #include <math.h>