jyapayne/glymur
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Passing on Anaconda platform with python-xmp-toolkit 2.0. #104

Browse source
This commit is contained in:
John Evans 2014-01-24 11:08:23 -05:00
commit 553b36d40e
5 changed files with 138 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

32
glymur/_uuid_io/Exif.py
View file

@ -3,6 +3,7 @@
Handlers for Exif UUIDs. Be nice if we would find a standard for this. Handlers for Exif UUIDs. Be nice if we would find a standard for this.
""" """
import pprint import pprint
import re
import struct import struct
import sys import sys
import warnings import warnings
@ -13,8 +14,39 @@ if sys.hexversion < 0x02070000:
else: else:
from collections import OrderedDict from collections import OrderedDict
# The Python XMP Toolkit may be used for XMP UUIDs, but only if available and
# if the version is at least 2.0.0.
try:
import libxmp
if hasattr(libxmp, 'version') and re.match('[2-9].\d*.\d*', libxmp.version.VERSION):
from libxmp import XMPMeta
_HAS_PYTHON_XMP_TOOLKIT = True
else:
_HAS_PYTHON_XMP_TOOLKIT = False
except ImportError:
_HAS_PYTHON_XMP_TOOLKIT = False
def xmp(read_buffer):
"""
If libxmp 2.0+ is installed, use it to describe the XMP data.
"""
if not _HAS_PYTHON_XMP_TOOLKIT:
# If the python xmp toolkit is not available or is not advanced enough,
# then issue a warning and just make available the raw data.
msg = "An XMP UUID was detected, but the Python XMP Toolkit package "
msg += "is either not available or is too old (must be at least 2.0). "
msg += "The UUID data field will consist only of the raw uninterpreted "
msg += "bytes."
warnings.warn(msg, UserWarning)
return read_buffer
xmp = XMPMeta()
xmp.parse_from_str(read_buffer.decode('utf-8'), xmpmeta_wrap=False)
return xmp
def tiff_header(read_buffer): def tiff_header(read_buffer):
""" """
Interpret the UUID data as a TIFF header.
""" """
# Ignore the first six bytes. # Ignore the first six bytes.
# Next 8 should be (73, 73, 42, 8) or (77, 77, 42, 8) # Next 8 should be (73, 73, 42, 8) or (77, 77, 42, 8)

2
glymur/_uuid_io/__init__.py
View file

@ -1,4 +1,4 @@
""" """
Sub package for handling various types of UUIDs. Sub package for handling various types of UUIDs.
""" """
from .Exif import tiff_header from .Exif import tiff_header, xmp

29
glymur/jp2box.py
View file

@ -33,12 +33,6 @@ else:
import numpy as np import numpy as np
try:
from libxmp import XMPMeta
_HAS_PYTHON_XMP_TOOLKIT = True
except ImportError:
_HAS_PYTHON_XMP_TOOLKIT = False
from .codestream import Codestream from .codestream import Codestream
from .core import _COLORSPACE_MAP_DISPLAY from .core import _COLORSPACE_MAP_DISPLAY
from .core import _COLOR_TYPE_MAP_DISPLAY from .core import _COLOR_TYPE_MAP_DISPLAY
@ -2228,10 +2222,7 @@ class UUIDBox(Jp2kBox):
Private function for parsing UUID payloads if possible. Private function for parsing UUID payloads if possible.
""" """
if self.uuid == uuid.UUID('be7acfcb-97a9-42e8-9c71-999491e3afac'): if self.uuid == uuid.UUID('be7acfcb-97a9-42e8-9c71-999491e3afac'):
xmp = XMPMeta() self.data = _uuid_io.xmp(self.raw_data)
xmp.parse_from_str(self.raw_data.decode('utf-8'),
xmpmeta_wrap=False)
self.data = xmp
elif self.uuid.bytes == b'JpgTiffExif->JP2': elif self.uuid.bytes == b'JpgTiffExif->JP2':
self.data = _uuid_io.tiff_header(self.raw_data) self.data = _uuid_io.tiff_header(self.raw_data)
else: else:
@ -2243,11 +2234,19 @@ class UUIDBox(Jp2kBox):
return msg.format(repr(self.uuid), len(self.data)) return msg.format(repr(self.uuid), len(self.data))
def __str__(self): def __str__(self):
msg = '{0}\n' if self.uuid == uuid.UUID('be7acfcb-97a9-42e8-9c71-999491e3afac'):
msg += ' UUID: {1}\n' utype = "XMP"
msg += ' UUID Data: {2}' elif self.uuid.bytes == b'JpgTiffExif->JP2':
utype = "EXIF"
msg = msg.format(Jp2kBox.__str__(self), self.uuid, str(self.data)) else:
utype = "unknown"
msg = '{0}\n UUID: {1} ({2})\n'.format(Jp2kBox.__str__(self),
self.uuid,
utype)
if utype == 'unknown':
msg += ' UUID Data: {0} bytes'.format(len(self.raw_data))
else:
msg += ' UUID Data: {0}'.format(str(self.data))
return msg return msg

174
glymur/test/fixtures.py
View file

@ -170,90 +170,96 @@ def read_pgx_header(pgx_file):
nemo_xmp_box = """UUID Box (uuid) @ (77, 3146) nemo_xmp_box = """UUID Box (uuid) @ (77, 3146)
UUID: be7acfcb-97a9-42e8-9c71-999491e3afac (XMP) UUID: be7acfcb-97a9-42e8-9c71-999491e3afac (XMP)
UUID Data: UUID Data: <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
<ns0:xmpmeta xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ns0="adobe:ns:meta/" xmlns:ns2="http://ns.adobe.com/xap/1.0/" xmlns:ns3="http://ns.adobe.com/tiff/1.0/" xmlns:ns4="http://ns.adobe.com/exif/1.0/" xmlns:ns5="http://ns.adobe.com/photoshop/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ns0:xmptk="Exempi + XMP Core 5.1.2"> <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Exempi + XMP Core 4.4.0">
<rdf:RDF> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""> <rdf:Description rdf:about=""
<ns2:CreatorTool>Google</ns2:CreatorTool> xmlns:xmp="http://ns.adobe.com/xap/1.0/">
<ns2:CreateDate>2013-02-09T14:47:53</ns2:CreateDate> <xmp:CreatorTool>Google</xmp:CreatorTool>
</rdf:Description> <xmp:CreateDate>2013-02-09T14:47:53</xmp:CreateDate>
<rdf:Description rdf:about=""> </rdf:Description>
<ns3:YCbCrPositioning>1</ns3:YCbCrPositioning> <rdf:Description rdf:about=""
<ns3:XResolution>72/1</ns3:XResolution> xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
<ns3:YResolution>72/1</ns3:YResolution> <tiff:YCbCrPositioning>1</tiff:YCbCrPositioning>
<ns3:ResolutionUnit>2</ns3:ResolutionUnit> <tiff:XResolution>72/1</tiff:XResolution>
<ns3:Make>HTC</ns3:Make> <tiff:YResolution>72/1</tiff:YResolution>
<ns3:Model>HTC Glacier</ns3:Model> <tiff:ResolutionUnit>2</tiff:ResolutionUnit>
<ns3:ImageWidth>2592</ns3:ImageWidth> <tiff:Make>HTC</tiff:Make>
<ns3:ImageLength>1456</ns3:ImageLength> <tiff:Model>HTC Glacier</tiff:Model>
<ns3:BitsPerSample> <tiff:ImageWidth>2592</tiff:ImageWidth>
<rdf:Seq> <tiff:ImageLength>1456</tiff:ImageLength>
<rdf:li>8</rdf:li> <tiff:BitsPerSample>
<rdf:li>8</rdf:li> <rdf:Seq>
<rdf:li>8</rdf:li> <rdf:li>8</rdf:li>
</rdf:Seq> <rdf:li>8</rdf:li>
</ns3:BitsPerSample> <rdf:li>8</rdf:li>
<ns3:PhotometricInterpretation>2</ns3:PhotometricInterpretation> </rdf:Seq>
<ns3:SamplesPerPixel>3</ns3:SamplesPerPixel> </tiff:BitsPerSample>
<ns3:WhitePoint> <tiff:PhotometricInterpretation>2</tiff:PhotometricInterpretation>
<rdf:Seq> <tiff:SamplesPerPixel>3</tiff:SamplesPerPixel>
<rdf:li>1343036288/4294967295</rdf:li> <tiff:WhitePoint>
<rdf:li>1413044224/4294967295</rdf:li> <rdf:Seq>
</rdf:Seq> <rdf:li>1343036288/4294967295</rdf:li>
</ns3:WhitePoint> <rdf:li>1413044224/4294967295</rdf:li>
<ns3:PrimaryChromaticities> </rdf:Seq>
<rdf:Seq> </tiff:WhitePoint>
<rdf:li>2748779008/4294967295</rdf:li> <tiff:PrimaryChromaticities>
<rdf:li>1417339264/4294967295</rdf:li> <rdf:Seq>
<rdf:li>1288490240/4294967295</rdf:li> <rdf:li>2748779008/4294967295</rdf:li>
<rdf:li>2576980480/4294967295</rdf:li> <rdf:li>1417339264/4294967295</rdf:li>
<rdf:li>644245120/4294967295</rdf:li> <rdf:li>1288490240/4294967295</rdf:li>
<rdf:li>257698032/4294967295</rdf:li> <rdf:li>2576980480/4294967295</rdf:li>
</rdf:Seq> <rdf:li>644245120/4294967295</rdf:li>
</ns3:PrimaryChromaticities> <rdf:li>257698032/4294967295</rdf:li>
</rdf:Description> </rdf:Seq>
<rdf:Description rdf:about=""> </tiff:PrimaryChromaticities>
<ns4:ColorSpace>1</ns4:ColorSpace> </rdf:Description>
<ns4:PixelXDimension>2528</ns4:PixelXDimension> <rdf:Description rdf:about=""
<ns4:PixelYDimension>1424</ns4:PixelYDimension> xmlns:exif="http://ns.adobe.com/exif/1.0/">
<ns4:FocalLength>353/100</ns4:FocalLength> <exif:ColorSpace>1</exif:ColorSpace>
<ns4:GPSAltitudeRef>0</ns4:GPSAltitudeRef> <exif:PixelXDimension>2528</exif:PixelXDimension>
<ns4:GPSAltitude>0/1</ns4:GPSAltitude> <exif:PixelYDimension>1424</exif:PixelYDimension>
<ns4:GPSMapDatum>WGS-84</ns4:GPSMapDatum> <exif:FocalLength>353/100</exif:FocalLength>
<ns4:DateTimeOriginal>2013-02-09T14:47:53</ns4:DateTimeOriginal> <exif:GPSAltitudeRef>0</exif:GPSAltitudeRef>
<ns4:ISOSpeedRatings> <exif:GPSAltitude>0/1</exif:GPSAltitude>
<rdf:Seq> <exif:GPSMapDatum>WGS-84</exif:GPSMapDatum>
<rdf:li>76</rdf:li> <exif:DateTimeOriginal>2013-02-09T14:47:53</exif:DateTimeOriginal>
</rdf:Seq> <exif:ISOSpeedRatings>
</ns4:ISOSpeedRatings> <rdf:Seq>
<ns4:ExifVersion>0220</ns4:ExifVersion> <rdf:li>76</rdf:li>
<ns4:FlashpixVersion>0100</ns4:FlashpixVersion> </rdf:Seq>
<ns4:ComponentsConfiguration> </exif:ISOSpeedRatings>
<rdf:Seq> <exif:ExifVersion>0220</exif:ExifVersion>
<rdf:li>1</rdf:li> <exif:FlashpixVersion>0100</exif:FlashpixVersion>
<rdf:li>2</rdf:li> <exif:ComponentsConfiguration>
<rdf:li>3</rdf:li> <rdf:Seq>
<rdf:li>0</rdf:li> <rdf:li>1</rdf:li>
</rdf:Seq> <rdf:li>2</rdf:li>
</ns4:ComponentsConfiguration> <rdf:li>3</rdf:li>
<ns4:GPSLatitude>42,20.56N</ns4:GPSLatitude> <rdf:li>0</rdf:li>
<ns4:GPSLongitude>71,5.29W</ns4:GPSLongitude> </rdf:Seq>
<ns4:GPSTimeStamp>2013-02-09T19:47:53Z</ns4:GPSTimeStamp> </exif:ComponentsConfiguration>
<ns4:GPSProcessingMethod>NETWORK</ns4:GPSProcessingMethod> <exif:GPSLatitude>42,20.56N</exif:GPSLatitude>
</rdf:Description> <exif:GPSLongitude>71,5.29W</exif:GPSLongitude>
<rdf:Description rdf:about=""> <exif:GPSTimeStamp>2013-02-09T19:47:53Z</exif:GPSTimeStamp>
<ns5:DateCreated>2013-02-09T14:47:53</ns5:DateCreated> <exif:GPSProcessingMethod>NETWORK</exif:GPSProcessingMethod>
</rdf:Description> </rdf:Description>
<rdf:Description rdf:about=""> <rdf:Description rdf:about=""
<dc:Creator> xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/">
<rdf:Seq> <photoshop:DateCreated>2013-02-09T14:47:53</photoshop:DateCreated>
<rdf:li>Glymur</rdf:li> </rdf:Description>
<rdf:li>Python XMP Toolkit</rdf:li> <rdf:Description rdf:about=""
</rdf:Seq> xmlns:dc="http://purl.org/dc/elements/1.1/">
</dc:Creator> <dc:Creator>
</rdf:Description> <rdf:Seq>
</rdf:RDF> <rdf:li>Glymur</rdf:li>
</ns0:xmpmeta>""" <rdf:li>Python XMP Toolkit</rdf:li>
</rdf:Seq>
</dc:Creator>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
<?xpacket end="w"?>"""
SimpleRDF = """<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'> SimpleRDF = """<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
<rdf:Description rdf:about='Test:XMPCoreCoverage/kSimpleRDF' <rdf:Description rdf:about='Test:XMPCoreCoverage/kSimpleRDF'

2
glymur/test/test_jp2box_uuid.py
View file

@ -184,7 +184,7 @@ class TestUUIDExif(unittest.TestCase):
tfile.flush() tfile.flush()
jp2 = glymur.Jp2k(tfile.name) jp2 = glymur.Jp2k(tfile.name)
self.assertEqual(jp2.box[-1].data.ifds['Image']['Make'], "HTC") self.assertEqual(jp2.box[-1].data['Make'], "HTC")
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()