Use openjpeg v2.5.2.v1.9.0

12 files changed, 20 insertions, 20 deletions

diff --git a/cscript b/cscript
index 52d7e914..5cfa5834 100644
--- a/cscript
+++ b/cscript
@@ -35,7 +35,7 @@ import os
 import shutil
 
 def dependencies(target, options):
-    return (('libcxml', 'v0.17.6'), ('openjpeg', '925ca5192bb16d4f58a6fddc8b1623eced7f0203'), ('asdcplib', '8a4a2f25cac0c58aac1d4267facab20e5ec3b57f'))
+    return (('libcxml', 'v0.17.6'), ('openjpeg', 'ad8edaacd54a862940d0a77c41ecda5858b54d6e'), ('asdcplib', '8a4a2f25cac0c58aac1d4267facab20e5ec3b57f'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --disable-dumpimage --disable-benchmarks --prefix=%s' % target.directory
diff --git a/run/test/subs_in_out b/run/test/subs_in_out
index 513294d1..2bf4fea4 100755
--- a/run/test/subs_in_out
+++ b/run/test/subs_in_out
@@ -2,7 +2,7 @@
 
 export LD_LIBRARY_PATH=build/src:build/asdcplib/src:$LD_LIBRARY_PATH
 # SIP stops this being passed in from the caller's environment
-export DYLD_LIBRARY_PATH=/Users/ci/osx-environment/x86_64/10.10/lib
+export DYLD_LIBRARY_PATH=/Users/ci/osx-environment/x86_64/10.10/lib:/Users/ci/workspace/lib
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/test/subs_in_out "$@"
diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc
index c19172c6..c8bdb3e8 100644
--- a/test/frame_info_hash_test.cc
+++ b/test/frame_info_hash_test.cc
@@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE (frame_info_hash_test)
 	boost::random::uniform_int_distribution<> dist(0, 4095);
 
 	/* Check a few random frames */
-	check(writer, dist, rng, "a9e772602a2fd3135d940cfd727ab8ff");
-	check(writer, dist, rng, "b075369922e42b23e1852a586ec43224");
-	check(writer, dist, rng, "402395e76152db05b03c8f24ddfd7732");
+	check(writer, dist, rng, "8f3dc7321d6dff3d5691011de31fc713");
+	check(writer, dist, rng, "a305b83a40367fda1b5cf0efa096fd18");
+	check(writer, dist, rng, "1abc71e011ced46d9928a4b2d22e20f6");
 }
diff --git a/test/ref/DCP/dcp_test1/ASSETMAP.xml b/test/ref/DCP/dcp_test1/ASSETMAP.xml
index 4e0d1e5a..dc811f79 100644
--- a/test/ref/DCP/dcp_test1/ASSETMAP.xml
+++ b/test/ref/DCP/dcp_test1/ASSETMAP.xml
@@ -37,7 +37,7 @@
           <Path>video.mxf</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
-          <Length>49240</Length>
+          <Length>31648</Length>
         </Chunk>
       </ChunkList>
     </Asset>
diff --git a/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
index 15cda9a1..b239661b 100644
--- a/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
+++ b/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
@@ -37,7 +37,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>wUmt8G+cFFKMGt0ueS9+F1S4uhc=</Hash>
+          <Hash>7a4KZ9j2kpSuBz+iBQD4f03ctm8=</Hash>
           <FrameRate>24 1</FrameRate>
           <ScreenAspectRatio>1998 1080</ScreenAspectRatio>
         </MainPicture>
diff --git a/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml b/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
index cedbb15b..71cae6ff 100644
--- a/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
+++ b/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
@@ -9,7 +9,7 @@
     <Asset>
       <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
       <AnnotationText>6affb8ee-0020-4dff-a53c-17652f6358ab</AnnotationText>
-      <Hash>tfX1mVIKJCVr1m7Y32Nzxf0+Rpw=</Hash>
+      <Hash>2DSYFM8X5sGdsYgzhs3mBbTNNmw=</Hash>
       <Size>8559</Size>
       <Type>text/xml</Type>
       <OriginalFileName>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</OriginalFileName>
@@ -17,8 +17,8 @@
     <Asset>
       <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
       <AnnotationText>5407b210-4441-4e97-8b16-8bdc7c12da54</AnnotationText>
-      <Hash>wUmt8G+cFFKMGt0ueS9+F1S4uhc=</Hash>
-      <Size>49240</Size>
+      <Hash>7a4KZ9j2kpSuBz+iBQD4f03ctm8=</Hash>
+      <Size>31648</Size>
       <Type>application/mxf</Type>
       <OriginalFileName>video.mxf</OriginalFileName>
     </Asset>
diff --git a/test/ref/DCP/dcp_test1/video.mxf b/test/ref/DCP/dcp_test1/video.mxf
index 27ba41cf..eac7acea 100644
--- a/test/ref/DCP/dcp_test1/video.mxf
+++ b/test/ref/DCP/dcp_test1/video.mxf
diff --git a/test/ref/DCP/dcp_test7/ASSETMAP b/test/ref/DCP/dcp_test7/ASSETMAP
index 86a6ff6a..e52b4b11 100644
--- a/test/ref/DCP/dcp_test7/ASSETMAP
+++ b/test/ref/DCP/dcp_test7/ASSETMAP
@@ -37,7 +37,7 @@
           <Path>video.mxf</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
-          <Length>49240</Length>
+          <Length>31648</Length>
         </Chunk>
       </ChunkList>
     </Asset>
diff --git a/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
index b73ef84c..42f09109 100644
--- a/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
+++ b/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
@@ -37,7 +37,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>wUmt8G+cFFKMGt0ueS9+F1S4uhc=</Hash>
+          <Hash>7a4KZ9j2kpSuBz+iBQD4f03ctm8=</Hash>
           <FrameRate>24 1</FrameRate>
           <ScreenAspectRatio>1.85</ScreenAspectRatio>
         </MainPicture>
diff --git a/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml b/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
index 4180eb8d..f4eea4ee 100644
--- a/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
+++ b/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
@@ -9,7 +9,7 @@
     <Asset>
       <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
       <AnnotationText>6affb8ee-0020-4dff-a53c-17652f6358ab</AnnotationText>
-      <Hash>Vsre14v3AhK6X2gUzeYF9G8GKo0=</Hash>
+      <Hash>z9r7fpZ4wf0GbiliDzpfKQvFkmo=</Hash>
       <Size>1965</Size>
       <Type>text/xml;asdcpKind=CPL</Type>
       <OriginalFileName>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</OriginalFileName>
@@ -17,8 +17,8 @@
     <Asset>
       <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
       <AnnotationText>5407b210-4441-4e97-8b16-8bdc7c12da54</AnnotationText>
-      <Hash>wUmt8G+cFFKMGt0ueS9+F1S4uhc=</Hash>
-      <Size>49240</Size>
+      <Hash>7a4KZ9j2kpSuBz+iBQD4f03ctm8=</Hash>
+      <Size>31648</Size>
       <Type>application/x-smpte-mxf;asdcpKind=Picture</Type>
       <OriginalFileName>video.mxf</OriginalFileName>
     </Asset>
diff --git a/test/ref/DCP/dcp_test7/video.mxf b/test/ref/DCP/dcp_test7/video.mxf
index 27ba41cf..eac7acea 100644
--- a/test/ref/DCP/dcp_test7/video.mxf
+++ b/test/ref/DCP/dcp_test7/video.mxf
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 5a9489fe..b6d0ac1e 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -407,8 +407,8 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_picture_sound_hashes)
 			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_PICTURE_HASHES, canonical(dir / "video.mxf") },
 			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_HASHES, canonical(dir / "audio.mxf") },
 			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xKcJb7S2K5cNm8RG4kfQD5FTeS0A=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 28 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xtfX1mVIKJCVr1m7Y32Nzxf0+Rpw=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 12 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xwUmt8G+cFFKMGt0ueS9+F1S4uhc=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 20 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'x2DSYFM8X5sGdsYgzhs3mBbTNNmw=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 12 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'x7a4KZ9j2kpSuBz+iBQD4f03ctm8=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 20 },
 		});
 }
 
@@ -3800,9 +3800,9 @@ BOOST_AUTO_TEST_CASE(verify_invalid_tile_part_size)
 	}
 
 	int component_sizes[] = {
-		1321721,
-		1294364,
-		1289952,
+		1321816,
+		1294414,
+		1289881,
 	};
 
 	for (auto frame = 0; frame < 24; frame++) {