From 2a80f3002d2c72fd69e3acd65562ab8e3cc6deac Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Oct 2014 16:39:01 +0100 Subject: pot merge. --- src/tools/po/de_DE.po | 2 +- src/tools/po/es_ES.po | 2 +- src/tools/po/fr_FR.po | 2 +- src/tools/po/it_IT.po | 2 +- src/tools/po/nl_NL.po | 4 ++-- src/tools/po/sv_SE.po | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/tools') diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po index 24ed468a8..ba09e24da 100644 --- a/src/tools/po/de_DE.po +++ b/src/tools/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-07-13 03:04+0100\n" "Last-Translator: Carsten Kurz\n" "Language-Team: LANGUAGE \n" diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po index f6d2e4439..e37d375e0 100644 --- a/src/tools/po/es_ES.po +++ b/src/tools/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCPOMATIC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-04-20 10:21-0500\n" "Last-Translator: Manuel AC \n" "Language-Team: Manuel AC \n" diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po index 86994dc71..75eed5623 100644 --- a/src/tools/po/fr_FR.po +++ b/src/tools/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-07-14 10:43+0100\n" "Last-Translator: Grégoire AUSINA \n" "Language-Team: \n" diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po index 56b050df0..07b348c13 100644 --- a/src/tools/po/it_IT.po +++ b/src/tools/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-02-03 09:36+0100\n" "Last-Translator: William Fanelli \n" "Language-Team: \n" diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po index f6d076d69..c77c54b95 100644 --- a/src/tools/po/nl_NL.po +++ b/src/tools/po/nl_NL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-09-04 20:29+0100\n" "Last-Translator: Cherif Ben Brahim \n" "Language-Team: UniversalDV \n" @@ -52,7 +52,7 @@ msgstr "&Help" msgid "&Jobs" msgstr "&Projecten" -#: src/tools/dcpomatic.cc: +#: src/tools/dcpomatic.cc:631 msgid "&Make DCP\tCtrl-M" msgstr "&Maak een DCP\tCtrl-M" diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po index 50bf29c9f..fbe64370f 100644 --- a/src/tools/po/sv_SE.po +++ b/src/tools/po/sv_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DCP-o-matic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-03 22:31+0100\n" +"POT-Creation-Date: 2014-10-16 16:38+0100\n" "PO-Revision-Date: 2014-01-19 08:59+0100\n" "Last-Translator: Adam Klotblixt \n" "Language-Team: \n" -- cgit v1.2.3 From 734340b52d30cb2dde9aa9e81c77277b261b128e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 18 Oct 2014 22:18:15 +0100 Subject: Fix build on Debian unstable which now has GraphicsMagick rather than ImageMagick. --- src/lib/image_examiner.cc | 2 ++ src/lib/image_proxy.cc | 4 ++++ src/lib/util.cc | 5 +++++ src/tools/wscript | 2 +- src/wx/wscript | 1 - test/image_test.cc | 14 ++++++++++++++ wscript | 10 +++++++++- 7 files changed, 35 insertions(+), 3 deletions(-) (limited to 'src/tools') diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc index 4ff324f68..7058ea3b2 100644 --- a/src/lib/image_examiner.cc +++ b/src/lib/image_examiner.cc @@ -38,7 +38,9 @@ ImageExaminer::ImageExaminer (shared_ptr film, shared_ptrpath(0).string()); _video_size = libdcp::Size (image->columns(), image->rows()); delete image; diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc index 3aba6cf7c..3851f88e7 100644 --- a/src/lib/image_proxy.cc +++ b/src/lib/image_proxy.cc @@ -156,7 +156,11 @@ MagickImageProxy::image () const /* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */ uint8_t* p = _image->data()[0]; for (int i = 0; i < size.height; ++i) { +#ifdef DCPOMATIC_IMAGE_MAGICK using namespace MagickCore; +#else + using namespace MagickLib; +#endif magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p); p += _image->stride()[0]; } diff --git a/src/lib/util.cc b/src/lib/util.cc index 290dd20ef..2e9ca66b2 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -43,7 +43,12 @@ #endif #include #include +#ifdef DCPOMATIC_IMAGE_MAGICK #include +#else +#include +#include +#endif #include #include #include diff --git a/src/tools/wscript b/src/tools/wscript index c4ea1530f..ac270af70 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -11,7 +11,7 @@ def configure(conf): def build(bld): for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm', 'dcpomatic_create']: obj = bld(features = 'cxx cxxprogram') - obj.uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS QUICKMAIL' + obj.uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC QUICKMAIL' obj.includes = ['..'] obj.use = ['libdcpomatic'] obj.source = '%s.cc' % t diff --git a/src/wx/wscript b/src/wx/wscript index 8bf2451c2..071050069 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -64,7 +64,6 @@ def configure(conf): 'wx_gtk2u_adv-3.0', 'wx_gtk2u_core-3.0', 'wx_baseu_xml-3.0', 'wx_baseu-3.0'] conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat'] if conf.env.TARGET_DEBIAN and conf.env.DEBIAN_UNSTABLE: - conf.env.LIB_WXWIDGETS.append('Xxf86vm') conf.env.LIB_WXWIDGETS.append('Xext') conf.env.LIB_WXWIDGETS.append('X11') diff --git a/test/image_test.cc b/test/image_test.cc index 51ad49ebf..5662c729b 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -174,16 +174,24 @@ read_file (string file) boost::shared_ptr image (new Image (PIX_FMT_RGB24, size, true)); +#ifdef DCPOMATIC_IMAGE_MAGICK using namespace MagickCore; +#endif uint8_t* p = image->data()[0]; for (int y = 0; y < size.height; ++y) { uint8_t* q = p; for (int x = 0; x < size.width; ++x) { Magick::Color c = magick_image.pixelColor (x, y); +#ifdef DCPOMATIC_IMAGE_MAGICK *q++ = c.redQuantum() * 255 / QuantumRange; *q++ = c.greenQuantum() * 255 / QuantumRange; *q++ = c.blueQuantum() * 255 / QuantumRange; +#else + *q++ = c.redQuantum() * 255 / MaxRGB; + *q++ = c.greenQuantum() * 255 / MaxRGB; + *q++ = c.blueQuantum() * 255 / MaxRGB; +#endif } p += image->stride()[0]; } @@ -195,14 +203,20 @@ static void write_file (shared_ptr image, string file) { +#ifdef DCPOMATIC_IMAGE_MAGICK using namespace MagickCore; +#endif Magick::Image magick_image (Magick::Geometry (image->size().width, image->size().height), Magick::Color (0, 0, 0)); uint8_t*p = image->data()[0]; for (int y = 0; y < image->size().height; ++y) { uint8_t* q = p; for (int x = 0; x < image->size().width; ++x) { +#ifdef DCPOMATIC_IMAGE_MAGICK Magick::Color c (q[0] * QuantumRange / 256, q[1] * QuantumRange / 256, q[2] * QuantumRange / 256); +#else + Magick::Color c (q[0] * MaxRGB / 256, q[1] * MaxRGB / 256, q[2] * MaxRGB / 256); +#endif magick_image.pixelColor (x, y, c); q += 3; } diff --git a/wscript b/wscript index eb80b9efc..f5d1a1c34 100644 --- a/wscript +++ b/wscript @@ -1,6 +1,8 @@ import subprocess import os import sys +import distutils +import distutils.spawn APPNAME = 'dcpomatic' VERSION = '1.75.1devel' @@ -322,7 +324,13 @@ def configure(conf): # Dependencies which are always dynamically linked conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True) conf.check_cfg(package='glib-2.0', args='--cflags --libs', uselib_store='GLIB', mandatory=True) - conf.check_cfg(package= '', path=conf.options.magickpp_config, args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True) + if distutils.spawn.find_executable(conf.options.magickpp_config): + conf.check_cfg(package='', path=conf.options.magickpp_config, args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True) + conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_IMAGE_MAGICK') + else: + conf.check_cfg(package='GraphicsMagick++', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True) + conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GRAPHICS_MAGICK') + conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) conf.check_cc(fragment=""" -- cgit v1.2.3 From 06bc61102add8d307cb53cc7798044d8477f010d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 Oct 2014 22:02:11 +0100 Subject: Give an error in dcpomatic_cli if a content file is not found. --- src/tools/dcpomatic_cli.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/tools') diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 5cb05e11d..23ca938d4 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -139,6 +139,17 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } + ContentList content = film->content (); + for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) { + vector paths = (*i)->paths (); + for (vector::const_iterator j = paths.begin(); j != paths.end(); ++j) { + if (!boost::filesystem::exists (*j)) { + cerr << argv[0] << ": content file " << *j << " not found.\n"; + exit (EXIT_FAILURE); + } + } + } + cout << "\nMaking DCP for " << film->name() << "\n"; film->make_dcp (); -- cgit v1.2.3