python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-04-28 13:03:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:python-imaging/Pillow

Browse Source
This commit is contained in:
Alex Clark 2013-09-30 05:36:52 -04:00
commit c6b41f27a1
3 changed files with 59 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PIL/Image.py
View File

@ -224,6 +224,18 @@ _MODE_CONV = {
"RGBA": ('|u1', 4), "RGBA": ('|u1', 4),
"CMYK": ('|u1', 4), "CMYK": ('|u1', 4),
"YCbCr": ('|u1', 3), "YCbCr": ('|u1', 3),
"I;16": ('=u2', None),
"I;16B": ('>u2', None),
"I;16L": ('<u2', None),
"I;16S": ('=i2', None),
"I;16BS": ('>i2', None),
"I;16LS": ('<i2', None),
"I;32": ('=u4', None),
"I;32B": ('>u4', None),
"I;32L": ('<u4', None),
"I;32S": ('=i4', None),
"I;32BS": ('>i4', None),
"I;32LS": ('<i4', None),
} }
def _conv_type_shape(im): def _conv_type_shape(im):

4
PIL/JpegImagePlugin.py
View File

@ -359,6 +359,10 @@ class JpegImageFile(ImageFile.ImageFile):
self.tile = [] self.tile = []
def _getexif(self): def _getexif(self):
return _getexif(self)
def _getexif(self):
# Extract EXIF information. This method is highly experimental, # Extract EXIF information. This method is highly experimental,
# and is likely to be replaced with something better in a future # and is likely to be replaced with something better in a future
# version. # version.

4
PIL/WebPImagePlugin.py
View File

@ -39,8 +39,8 @@ class WebPImageFile(ImageFile.ImageFile):
self.tile = [("raw", (0, 0) + self.size, 0, self.mode)] self.tile = [("raw", (0, 0) + self.size, 0, self.mode)]
def _getexif(self): def _getexif(self):
from PIL.JpegImagePlugin import JpegImageFile from PIL.JpegImagePlugin import _getexif
return JpegImageFile._getexif.im_func(self) return _getexif(self)
def _save(im, fp, filename): def _save(im, fp, filename):