Merge branch 'master' of https://github.com/rk700/PyMuPDF

Author: JorjMcKie

README.md

@@ -1,4 +1,4 @@
-# PyMuPDF 1.14.1
+# PyMuPDF 1.14.2
 
 ![logo](https://github.com/rk700/PyMuPDF/blob/master/demo/pymupdf.jpg)
 
@@ -14,7 +14,7 @@ On **[PyPI](https://pypi.org/project/PyMuPDF)** since August 2016: [![](https://
 
 # Introduction
 
-This is **version 1.14.1 of PyMuPDF (formerly python-fitz)**, a Python binding with support for [MuPDF 1.14.x](http://mupdf.com/) - "a lightweight PDF, XPS, and E-book viewer".
+This is **version 1.14.2 of PyMuPDF (formerly python-fitz)**, a Python binding with support for [MuPDF 1.14.x](http://mupdf.com/) - "a lightweight PDF, XPS, and E-book viewer".
 
 MuPDF can access files in PDF, XPS, OpenXPS, CBZ, EPUB and FB2 (e-books) formats, and it is known for its top performance and high rendering quality.
 

fitz/fitz.py

@@ -106,9 +106,9 @@ class _object:
 
 
 VersionFitz = "1.14.0"
-VersionBind = "1.14.1"
-VersionDate = "2018-11-18 17:07:00"
-version = (VersionBind, VersionFitz, "20181118170700")
+VersionBind = "1.14.2"
+VersionDate = "2018-11-20 06:27:22"
+version = (VersionBind, VersionFitz, "20181120062722")
 
 
 class Matrix():
@@ -246,7 +246,12 @@ def concat(self, one, two):
         dst.d = one[2] * two[1] + one[3] * two[3]
         dst.e = one[4] * two[0] + one[5] * two[2] + two[4]
         dst.f = one[4] * two[1] + one[5] * two[3] + two[5]
-        self = dst
+        self.a = dst.a
+        self.b = dst.b
+        self.c = dst.c
+        self.d = dst.d
+        self.e = dst.e
+        self.f = dst.f
         return self
 
     def __getitem__(self, i):

fitz/helper-geo-py.i

@@ -134,7 +134,12 @@ class Matrix():
         dst.d = one[2] * two[1] + one[3] * two[3]
         dst.e = one[4] * two[0] + one[5] * two[2] + two[4]
         dst.f = one[4] * two[1] + one[5] * two[3] + two[5]
-        self = dst
+        self.a = dst.a
+        self.b = dst.b
+        self.c = dst.c
+        self.d = dst.d
+        self.e = dst.e
+        self.f = dst.f
         return self
 
     def __getitem__(self, i):

fitz/version.i

@@ -1,6 +1,6 @@
 %pythoncode %{
 VersionFitz = "1.14.0"
-VersionBind = "1.14.1"
-VersionDate = "2018-11-18 17:07:00"
-version = (VersionBind, VersionFitz, "20181118170700")
+VersionBind = "1.14.2"
+VersionDate = "2018-11-20 06:27:22"
+version = (VersionBind, VersionFitz, "20181120062722")
 %}

setup.py

@@ -52,7 +52,7 @@
                        sources=['./fitz/fitz_wrap.c',])
 
 setup(name = 'PyMuPDF',
-      version = "1.14.1",
+      version = "1.14.2",
       description = 'Python bindings for the PDF rendering library MuPDF',
       classifiers = ['Development Status :: 5 - Production/Stable',
                      'Environment :: Console',