Merge pull request #4923 from ax3l/fix-imagingHinclude

setup.py

@@ -355,8 +355,6 @@ class pil_build_ext(build_ext):
         library_dirs = []
         include_dirs = []
 
-        _add_directory(include_dirs, "src/libImaging")
-
         pkg_config = None
         if _cmd_exists(os.environ.get("PKG_CONFIG", "pkg-config")):
             pkg_config = _pkg_config
@@ -765,7 +763,7 @@ class pil_build_ext(build_ext):
             self._remove_extension("PIL._webp")
 
         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)
 

src/Tk/tkImaging.c

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

src/_imaging.c

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

src/_imagingcms.c

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

src/_imagingft.c

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

src/_imagingmath.c

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

src/_imagingmorph.c

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

src/_imagingtk.c

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

src/_webp.c

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

src/decode.c

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

src/display.c

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

src/encode.c

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

src/map.c

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

src/outline.c

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

src/path.c

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