diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dcpverify.cc | 24 | ||||
| -rw-r--r-- | tools/wscript | 2 |
2 files changed, 23 insertions, 3 deletions
diff --git a/tools/dcpverify.cc b/tools/dcpverify.cc index bff3fde3..8966c3ca 100644 --- a/tools/dcpverify.cc +++ b/tools/dcpverify.cc @@ -36,6 +36,9 @@ #include "compose.hpp" #include "filesystem.h" #include "html_formatter.h" +#ifdef LIBDCP_HAVE_HARU +#include "pdf_formatter.h" +#endif #include "raw_convert.h" #include "text_formatter.h" #include "verify.h" @@ -72,7 +75,12 @@ help (string n) << " --no-asset-hash-check don't check asset hashes\n" << " --asset-hash-check-maximum-size <size-in-MB> only check hashes for assets smaller than this size (in MB)\n" << " --no-picture-details-check don't check details of picture assets (J2K bitstream etc.)\n" - << " -o <filename> write HTML report to filename\n" + << " -o <filename> write report to filename " +#ifdef LIBDCP_HAVE_HARU + " (.txt, .htm, .html or .pdf)\n" +#else + " (.txt, .htm or .html)\n" +#endif << " -q, --quiet don't report progress\n"; } @@ -228,8 +236,18 @@ main (int argc, char* argv[]) } if (report_filename) { - dcp::HTMLFormatter formatter(*report_filename); - dcp::verify_report({ result }, formatter); + if (report_filename->extension() == ".htm" || report_filename->extension() == ".html") { + dcp::HTMLFormatter formatter(*report_filename); + dcp::verify_report({ result }, formatter); +#ifdef LIBDCP_HAVE_HARU + } else if (report_filename->extension() == ".pdf") { + dcp::PDFFormatter formatter(*report_filename); + dcp::verify_report({ result }, formatter); +#endif + } else { + dcp::TextFormatter formatter(*report_filename); + dcp::verify_report({ result }, formatter); + } } exit (failed ? EXIT_FAILURE : EXIT_SUCCESS); diff --git a/tools/wscript b/tools/wscript index a5fcf545..10192f50 100644 --- a/tools/wscript +++ b/tools/wscript @@ -33,6 +33,8 @@ def build(bld): uselib = 'OPENJPEG CXML OPENMP ASDCPLIB_DCPOMATIC BOOST_FILESYSTEM LIBXML++ XMLSEC1 OPENSSL XERCES DL MAGICK AVCODEC AVUTIL FMT FAST_FLOAT' + if bld.env.LIBDCP_HAVE_HARU: + uselib += ' HARU' for f in ['diff', 'info', 'verify']: obj = bld(features='cxx cxxprogram') |