Merge branch 'master' into master

Author: JorjMcKie

.travis.yml

@@ -40,8 +40,6 @@ install:
 - "$PIP install cibuildwheel==0.10.0"
 - mkdir mupdf && wget -q $MUPDF -O - | tar zx -C mupdf --strip-components=1
 - cp fitz/_mupdf_config.h mupdf/include/mupdf/fitz/config.h
-- cp fitz/_pdf-device.c mupdf/source/pdf/pdf-device.c
-- cp fitz/_error.c mupdf/source/fitz/error.c
 script:
 - export CIBW_SKIP="cp33-* *i686"
 - export CIBW_TEST_COMMAND="python -c 'import fitz'"

setup.py

@@ -22,7 +22,9 @@
     module = Extension('fitz._fitz', # name of the module
                        ['fitz/fitz_wrap.c'], # C source file
                        # this are directories containing mupdf's and zlib's header files
-                       include_dirs=['/usr/local/include/mupdf', '/usr/local/include'],
+                       include_dirs=['/usr/local/include/mupdf',
+                                     '/usr/local/include',
+                                     '/usr/local/thirdparty/zlib'],
                        library_dirs=['/usr/local/lib'],
                        libraries=['mupdf', 'mupdf-third']
                       )