python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-06-05 21:53:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed the rebase

Browse Source
This commit is contained in:
wiredfool 2015-09-10 08:33:14 -07:00
parent c113e8f7cd
commit 0c942911d9
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PIL/TiffImagePlugin.py
View File

@ -474,7 +474,7 @@ class ImageFileDirectory(collections.MutableMapping):
for i in range(self._unpack("H", fp.read(2))[0]): for i in range(self._unpack("H", fp.read(2))[0]):
tag, typ, count, data = self._unpack("HHL4s", fp.read(12)) tag, typ, count, data = self._unpack("HHL4s", fp.read(12))
if Image.DEBUG: if DEBUG:
tagname = TAGS.get(tag, TagInfo()).name tagname = TAGS.get(tag, TagInfo()).name
typname = TYPES.get(typ, "unknown") typname = TYPES.get(typ, "unknown")
print("tag: %s (%d) - type: %s (%d)" % print("tag: %s (%d) - type: %s (%d)" %
@ -490,7 +490,7 @@ class ImageFileDirectory(collections.MutableMapping):
if size > 4: if size > 4:
here = fp.tell() here = fp.tell()
offset, = self._unpack("L", data) offset, = self._unpack("L", data)
if Image.DEBUG: if DEBUG:
print("Tag Location: %s - Data Location: %s" % print("Tag Location: %s - Data Location: %s" %
(here, offset), end=" ") (here, offset), end=" ")
fp.seek(offset) fp.seek(offset)

3
Tests/test_file_libtiff.py
View File

@ -3,11 +3,8 @@ from helper import unittest, PillowTestCase, hopper, py3
from ctypes import c_float from ctypes import c_float
import io import io
<<<<<<< HEAD
import logging import logging
=======
import itertools import itertools
>>>>>>> Restore legacy TIFF API.
import os import os
from PIL import Image, TiffImagePlugin from PIL import Image, TiffImagePlugin