Merge pull request #2500 from radarhere/4.1.1

Cherry-pick changes from 4.1.1

CHANGES.rst

@@ -4,24 +4,27 @@ Changelog (Pillow)
 4.2.0 (unreleased)
 ------------------
 
+- Return copy on Image crop if crop dimensions match the image #2471
+  [radarhere]
+
+- Test: Optimize CI speed #2464, #2466
+  [hugovk]
+
+4.1.1 (2017-04-28)
+------------------
+
 - Undef PySlice_GetIndicesEx, see https://bugs.python.org/issue29943 #2493
   [cgohlke]
 
 - Fix for file with DPI in EXIF but not metadata, and XResolution is an int rather than tuple #2484
   [hugovk]
 
-- Return copy on Image crop if crop dimensions match the image #2471
-  [radarhere]
-
-- Test: Optimize CI speed #2464, #2466
-  [hugovk]
-
 - Docs: Removed broken download counter badge #2487
   [hugovk]
 
 - Docs: Fixed rst syntax error #2477
   [thebjorn]
-  
+
 4.1.0 (2017-04-03)
 ------------------
 
@@ -39,7 +42,7 @@ Changelog (Pillow)
 
 - Git: Set ContainerIO test file as binary #2469
   [cgohlke]
-  
+
 - Remove superfluous import of FixTk #2455
   [cgohlke)
 
@@ -48,7 +51,7 @@ Changelog (Pillow)
 
 - Pure Python Decoders, including Python decoder to fix for MSP images #1938
   [wiredfool, hugovk]
-  
+
 - Reorganized GifImagePlugin, fixes #2314.  #2374
   [radarhere, wiredfool]
 
@@ -57,10 +60,10 @@ Changelog (Pillow)
 
 - Test: Additional tests for BurfStub, Eps, Container, GribStub, IPTC, Wmf, XVThumb, ImageDraw, ImageMorph ImageShow #2425
   [radarhere]
- 
+
 - Health fixes #2437
   [radarhere]
-  
+
 - Test: Correctness tests ContainerIO, XVThumbImagePlugin, BufrStubImagePlugin, GribStubImagePlugin, FitsStubImagePlugin, Hdf5StubImagePlugin, PixarImageFile, PsdImageFile #2443, #2442, #2441, #2440, #2431, #2430, #2428, #2427
   [hugovk]
 

docs/releasenotes/4.1.1.rst

@@ -0,0 +1,24 @@
+4.1.1
+-----
+
+Fix Regression with reading DPI from EXIF data
+==============================================
+
+Some JPEG images don't contain DPI information in the image metadata,
+but do contain it in the EXIF data. A patch was added in 4.1.0 to read
+from the EXIF data, but it did not accept all possible types that
+could be included there.  This fix adds the ability to read ints as
+well as rational values.
+
+
+Incompatibility between 3.6.0 and 3.6.1
+=======================================
+
+CPython 3.6.1 added a new symbol, PySlice_GetIndicesEx, which was not
+present in 3.6.0. This had the effect of causing binaries compiled on
+CPython 3.6.1 to not work on installations of C-Python 3.6.0. This fix
+undefines PySlice_GetIndicesEx if it exists to restore compatibility
+with both 3.6.0 and 3.6.1. See https://bugs.python.org/issue29943 for
+more details.
+
+

docs/releasenotes/index.rst

@@ -6,6 +6,7 @@ Release Notes
 .. toctree::
   :maxdepth: 2
 
+  4.1.1
   4.1.0
   4.0.0
   3.4.0