Merge branch '.0' of git.carlh.net:git/libdcp into 1.0

6 files changed, 20 insertions, 19 deletions

diff --git a/src/rgb_xyz.cc b/src/rgb_xyz.cc
index 293ad5e1..50c3bf7e 100644
--- a/src/rgb_xyz.cc
+++ b/src/rgb_xyz.cc
@@ -280,12 +280,12 @@ dcp::rgb_to_xyz (
 				++clamped;
 			}
 			
-			e.x = max (0.0d, e.x);
-			e.y = max (0.0d, e.y);
-			e.z = max (0.0d, e.z);
-			e.x = min (65535.0d, e.x);
-			e.y = min (65535.0d, e.y);
-			e.z = min (65535.0d, e.z);
+			e.x = max (0.0, e.x);
+			e.y = max (0.0, e.y);
+			e.z = max (0.0, e.z);
+			e.x = min (65535.0, e.x);
+			e.y = min (65535.0, e.y);
+			e.z = min (65535.0, e.z);
 
 			/* Out gamma LUT */
 			xyz->data(0)[jn] = lut_out[int(rint(e.x))] * 4095;
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 7786292d..10ba13a9 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -94,6 +94,7 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 	writer->finalize ();
 
 	shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset (dcp::Fraction (24, 1), 48000, 1));
+	ms->set_metadata (mxf_metadata);
 	ms->set_key (key);
 	shared_ptr<dcp::SoundAssetWriter> sound_writer = ms->start_write ("build/test/DCP/encryption_test/audio.mxf", dcp::SMPTE);
 	
diff --git a/test/ref/DCP/encryption_test/audio.mxf b/test/ref/DCP/encryption_test/audio.mxf
index a6454b01..843d95f4 100644
--- a/test/ref/DCP/encryption_test/audio.mxf
+++ b/test/ref/DCP/encryption_test/audio.mxf
diff --git a/test/ref/DCP/encryption_test/cpl_cdecf5ab-b688-4842-bd60-0c9f5ce56e8c.xml b/test/ref/DCP/encryption_test/cpl_cdecf5ab-b688-4842-bd60-0c9f5ce56e8c.xml
index a5e93c0b..bb25dccb 100644
--- a/test/ref/DCP/encryption_test/cpl_cdecf5ab-b688-4842-bd60-0c9f5ce56e8c.xml
+++ b/test/ref/DCP/encryption_test/cpl_cdecf5ab-b688-4842-bd60-0c9f5ce56e8c.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:6f02ec2d-2a2d-437d-9391-daa7301b6910</Id><AssetList><MainPicture><Id>urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:aa157ca6-e3e3-4b6c-a7b6-50f52fcafb7f</KeyId><Hash>+1yr4l8eQ8KoX76cKFH8/vKNoio=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:f020346e-84f4-4f1e-a3b7-f7aeb57696a4</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:938f5140-bb1c-46ce-9078-e099ebbf04bf</KeyId><Hash>YdH+VRYLBB0bPYA+mYSxKil25vs=</Hash></MainSound></AssetList></Reel></ReelList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>bwk06+3AWf36NvBF1EwcjvNk3SQ=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>zb801GOK7mLWe0z0aA+Mjmreo8leU4EKakFxalmgtbsFKbMx3fzpojB44I/osByK
-I0coAJbUpckTBRaxLYpdOlb0NqMB3tkbsxoUzFYbTrhN1x95lKpRnxOnMv+ykEsV
-R7x7+Sz1UzKaSF3efH7K/eJNuM0+CzU6vtGKPVqYjhVTTFsPYPqNl267x7evdlRj
-baGOnToIDs7wJ81/1KLuotbxHNog2XQtmiAjDFqDA4Ke8oh71GZh/mNCAt0kpxIx
-aHAmgq2xy8lVAOg3vRDchq1npUpznpPGg64otqn65cpQY0VhWp6lWE7w7pOCNsYT
-TH4YcCtk5i7yIb4Dk4X65A==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><ContentTitleText>A Test DCP</ContentTitleText><ContentKind>feature</ContentKind><ContentVersion><Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id><LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText></ContentVersion><RatingList/><ReelList><Reel><Id>urn:uuid:6f02ec2d-2a2d-437d-9391-daa7301b6910</Id><AssetList><MainPicture><Id>urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:aa157ca6-e3e3-4b6c-a7b6-50f52fcafb7f</KeyId><Hash>+1yr4l8eQ8KoX76cKFH8/vKNoio=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:f020346e-84f4-4f1e-a3b7-f7aeb57696a4</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:938f5140-bb1c-46ce-9078-e099ebbf04bf</KeyId><Hash>+Bvro/qWIQ+SjmVwg5/tiSNZ8qM=</Hash></MainSound></AssetList></Reel></ReelList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>AGdonnKZIRs2RqyD2zPKlXJmzOI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>yT2hjEv8frr4JxMKfM/+ZziLyB8H2PZcStrSOiY2qp0nkCo63Mx0AyPpOhBNlbxp
+oY/Dbda3tA0I6fapOEbiFv6zkq2W3Fq0cDqIhcitIKyYmEV6EFnJNf7OPTW2obcA
+Zwbewgc8gmDS3fyJ+LWlwYNwQxRwya5rAVoGRbVRFMxqIzTdL11H14SXl70flSn3
+kJZ0CTiR81AsY5NSlHH1WWgawFf0zrPk1XXlzOAi5dtqhwWyoD2B2HMY0He158un
+zz/gAzOhp7E4XaDTrF+zGt//BNq3zHjiLumFwJnP/I7kM8/My7ey/6GgUuJYZs+W
+IyW59xmldQmjxljL25Nh8w==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
 NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
 NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
diff --git a/test/ref/DCP/encryption_test/pkl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml b/test/ref/DCP/encryption_test/pkl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml
index c1ea8b34..43665904 100644
--- a/test/ref/DCP/encryption_test/pkl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml
+++ b/test/ref/DCP/encryption_test/pkl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:abf9d74a-c344-40a0-a929-21add8a3bd6e</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</Id><AnnotationText>cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</AnnotationText><Hash>ukLEImkI87SJSnyH1PifOAhmBws=</Hash><Size>8618</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</Id><AnnotationText>a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</AnnotationText><Hash>+1yr4l8eQ8KoX76cKFH8/vKNoio=</Hash><Size>28840</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:f020346e-84f4-4f1e-a3b7-f7aeb57696a4</Id><AnnotationText>f020346e-84f4-4f1e-a3b7-f7aeb57696a4</AnnotationText><Hash>YdH+VRYLBB0bPYA+mYSxKil25vs=</Hash><Size>164398</Size><Type>application/mxf</Type></Asset></AssetList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>buMBtXSusYUrzsVtCdAwhip/Au0=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>UKfRxs4LoosuuiidXBcRlOl5aqdjtiIl+M62YMkZNb4BdSY6f/HtcvRrXRtZkPXi
-gWV1FkbSu9p6i4NqhJ8m1smzpjDKtwqJcEwIGjRTW/xPe7Pd4jXSOmHlNTkQAJXg
-/SXucoSjyVcQbTD+UFwYq7ib2ovMb/kehSHv++BUOzlI4nQYt7xQn+HwAvdedHbW
-Tbs60sVLer2MiI6fqgif0noLyBuqoR53/A2n2pIIc9YajZ14k+U6UauVWlvO7kNi
-W8yLdMz25Rv2TJgb1xPq2NfbvYQM/xoEYlDWfWcv2rlj4B009VFQp02x5Nv2Xmc7
-MdaZXeOvmNaoqqgsvmn3LA==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:abf9d74a-c344-40a0-a929-21add8a3bd6e</Id><AnnotationText>A Test DCP</AnnotationText><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><Creator>OpenDCP 0.0.25</Creator><AssetList><Asset><Id>urn:uuid:cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</Id><AnnotationText>cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</AnnotationText><Hash>iDCfDZKLWn8nGuzLoKFIa+yOMKw=</Hash><Size>8618</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</Id><AnnotationText>a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</AnnotationText><Hash>+1yr4l8eQ8KoX76cKFH8/vKNoio=</Hash><Size>28840</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:f020346e-84f4-4f1e-a3b7-f7aeb57696a4</Id><AnnotationText>f020346e-84f4-4f1e-a3b7-f7aeb57696a4</AnnotationText><Hash>+Bvro/qWIQ+SjmVwg5/tiSNZ8qM=</Hash><Size>164398</Size><Type>application/mxf</Type></Asset></AssetList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName></dsig:X509Data></Signer><dsig:Signature><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><dsig:Reference URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>kuvKvrDyJn/GoN59j4jnFYrCXBI=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>uSVdlWoP4urgUpuZQs8opGS24L3pancS8Avr0j0P4WVaD9cY2fz9mTaXwWRffKZA
+/Vkz0aMBdseLV3frMN2RXk6urlvW1dW1RoAGLbil5Uyn0jDvpg9WO5ozG9z/ulhx
+UPm7nGV9ZCNEUAwUJQxJePkbyfrX6uTimBJuqA7q3gXDFUvhdwnYR5+30OO0KBcl
+8TBD8EXYqCOBgnYOJje7krfhr0Ki7kTr5TofWYWe5RKg08cNz8mpBk51xbjDDkpm
+8CHeW1pbnh3NkiPyetT2TehUlf6mgjr4p/f0VRw7V7kYEdBWE9fxP754zmA0Nd/y
+vm9C69VBnnPNh9m6vIlO0w==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName><dsig:X509SerialNumber>7</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
 NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
 NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
diff --git a/wscript b/wscript
index 8bedae22..13f2cb6a 100644
--- a/wscript
+++ b/wscript
@@ -4,7 +4,7 @@ import sys
 import distutils.spawn
 
 APPNAME = 'libdcp'
-VERSION = '1.00.0devel'
+VERSION = '1.1.0devel'
 API_VERSION = '-1.0'
 
 def options(opt):