From 958ee9d66fc24c20f4600859b372c9a017af1730 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 18 Dec 2013 19:16:19 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index b4fc37c4..305817d0 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.88pre' +VERSION = '0.88' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From befa32df1466724479095f35faf48e657e319ad1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 18 Dec 2013 19:16:19 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 305817d0..ae689f96 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.88' +VERSION = '0.89pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 9d855ad06b98d8cfc286e517d1ca722607252069 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Dec 2013 13:05:01 +0000 Subject: Try to fix problems with printf on 32-bit Windows XP. --- src/picture_asset_writer.cc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc index 51d77019..92b384db 100644 --- a/src/picture_asset_writer.cc +++ b/src/picture_asset_writer.cc @@ -49,8 +49,13 @@ FrameInfo::FrameInfo (istream& s) FrameInfo::FrameInfo (FILE* f) { - fscanf (f, "%" PRId64, &offset); - fscanf (f, "%" PRId64, &size); +#ifdef LIBDCP_WINDOWS + fscanf (f, "%I64u", &offset); + fscanf (f, "%I64u", &size); +#else + fscanf (f, "%" SCNu64, &offset); + fscanf (f, "%" SCNu64, &size); +#endif if (ferror (f)) { offset = size = 0; @@ -70,7 +75,11 @@ FrameInfo::write (ostream& s) const void FrameInfo::write (FILE* f) const { - fprintf (f, "%" PRId64 " %" PRId64 " %s", offset, size, hash.c_str ()); +#ifdef LIBDCP_WINDOWS + fprintf (f, "%I64u %I64u %s", offset, size, hash.c_str ()); +#else + fprintf (f, "%" PRIu64 " %" PRIu64 " %s", offset, size, hash.c_str ()); +#endif } -- cgit v1.2.3 From 55d580dfa222f9be7dd80dfea6b62ffd535d68ce Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Dec 2013 13:07:22 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index ae689f96..80108412 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.89pre' +VERSION = '0.89' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From a4e6ac6c6a6fd1d57b70bffa28ace4343e8a09d6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Dec 2013 13:07:22 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 80108412..9a6d574d 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.89' +VERSION = '0.90pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 999a6a861d9d3b97c2176a5fad353a9ea842d994 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Dec 2013 15:20:58 +0000 Subject: A few fixes to signer chain generation on Windows. --- src/signer_chain.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/signer_chain.cc b/src/signer_chain.cc index 61b0271a..d407286e 100644 --- a/src/signer_chain.cc +++ b/src/signer_chain.cc @@ -54,13 +54,18 @@ static void command (string cmd) memset (&startup_info, 0, sizeof (startup_info)); startup_info.cb = sizeof (startup_info); PROCESS_INFORMATION process_info; + + /* XXX: this doesn't actually seem to work; failing commands end up with + a return code of 0 + */ if (CreateProcessW (0, buffer, 0, 0, FALSE, CREATE_NO_WINDOW, 0, 0, &startup_info, &process_info)) { WaitForSingleObject (process_info.hProcess, INFINITE); + DWORD c; + if (GetExitCodeProcess (process_info.hProcess, &c)) { + code = c; + } CloseHandle (process_info.hProcess); CloseHandle (process_info.hThread); - DWORD c; - GetExitCodeProcess (process_info.hProcess, &c); - code = c; } delete[] buffer; @@ -85,7 +90,7 @@ static string public_key_digest (boost::filesystem::path private_key, boost::filesystem::path openssl) { boost::filesystem::path public_name = private_key.string() + ".public"; - + /* Create the public key from the private key */ stringstream s; s << "\"" << openssl.string() << "\" rsa -outform PEM -pubout -in " << private_key.string() << " -out " << public_name.string (); @@ -95,6 +100,9 @@ public_key_digest (boost::filesystem::path private_key, boost::filesystem::path string pub; ifstream f (public_name.string().c_str ()); + if (!f.good ()) { + throw libdcp::MiscError ("public key not found"); + } bool read = false; while (f.good ()) { -- cgit v1.2.3 From 754ce78107b136e94fb0f96666c00acb32278c31 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Dec 2013 15:21:06 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 9a6d574d..84b3b9c4 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.90pre' +VERSION = '0.90' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From d341ea74fc29e7522db74db00951423751acaf81 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Dec 2013 15:21:06 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 84b3b9c4..9c227132 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ import subprocess import os APPNAME = 'libdcp' -VERSION = '0.90' +VERSION = '0.91pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3