Add FrameInfo::write for FILE *; test it.

5 files changed, 23 insertions, 13 deletions

diff --git a/run-tests.sh b/run-tests.sh
index 9456273a..fc56b247 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -20,7 +20,7 @@ elif [ "$1" == "--valgrind" ]; then
   shift
   LD_LIBRARY_PATH=build/src:build/asdcplib/src valgrind --tool="memcheck" build/test/tests
 else
-  LD_LIBRARY_PATH=build/src:build/asdcplib/src build/test/tests
+  LD_LIBRARY_PATH=build/src:build/asdcplib/src build/test/tests $*
 fi
 
 diff -ur test/ref/DCP/foo build/test/foo
diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc
index 67883e31..3ce721fd 100644
--- a/src/picture_asset_writer.cc
+++ b/src/picture_asset_writer.cc
@@ -17,6 +17,8 @@
 
 */
 
+#include <inttypes.h>
+#include <stdint.h>
 #include "AS_DCP.h"
 #include "KM_fileio.h"
 #include "picture_asset_writer.h"
@@ -46,11 +48,17 @@ FrameInfo::FrameInfo (istream& s)
 }
 
 void
-FrameInfo::write (ostream& s)
+FrameInfo::write (ostream& s) const
 {
 	s << offset << " " << size << " " << hash;
 }
 
+void
+FrameInfo::write (FILE* f) const
+{
+	fprintf (f, "%" PRId64 " %" PRId64 " %s", offset, size, hash.c_str ());
+}
+
 
 PictureAssetWriter::PictureAssetWriter (PictureAsset* asset, bool overwrite)
 	: _asset (asset)
diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h
index bc2f65e5..35ba4d8c 100644
--- a/src/picture_asset_writer.h
+++ b/src/picture_asset_writer.h
@@ -39,7 +39,8 @@ struct FrameInfo
 
 	FrameInfo (std::istream& s);
 
-	void write (std::ostream& s);
+	void write (std::ostream& s) const;
+	void write (FILE *) const;
 	
 	uint64_t offset;
 	uint64_t size;
diff --git a/test/wscript b/test/wscript
index 6b8b78d0..23469203 100644
--- a/test/wscript
+++ b/test/wscript
@@ -21,23 +21,24 @@ def build(bld):
     obj.uselib = 'BOOST_TEST OPENJPEG CXML XMLSEC1'
     obj.use    = 'libdcp'
     obj.source = """
-                 test.cc 
-                 kdm_key_test.cc
                  certificates_test.cc
+                 color_test.cc
                  dcp_test.cc
+                 dcp_time_test.cc
+                 decryption_test.cc
                  encryption_test.cc
+                 error_test.cc
+                 frame_info_test.cc
+                 kdm_key_test.cc
+                 kdm_test.cc
                  lut_test.cc
                  read_dcp_test.cc
-                 color_test.cc
-                 dcp_time_test.cc
-                 error_test.cc
                  recovery_test.cc
-                 utc_offset_to_string_test.cc
-                 decryption_test.cc
-                 kdm_test.cc
+                 round_trip_test.cc
                  subtitle_tests.cc
+                 test.cc 
+                 utc_offset_to_string_test.cc
                  util_test.cc
-                 round_trip_test.cc
                  """
     obj.target = 'tests'
     obj.install_path = ''
diff --git a/wscript b/wscript
index 74839324..e27e0ab0 100644
--- a/wscript
+++ b/wscript
@@ -13,7 +13,7 @@ def options(opt):
 
 def configure(conf):
     conf.load('compiler_cxx')
-    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64'])
+    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS'])
     conf.env.append_value('CXXFLAGS', ['-DLIBDCP_VERSION="%s"' % VERSION])
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows