From 0c3f91403eee01d4a1b2d2c520893de3a884a72d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 23 May 2016 10:20:56 +0100 Subject: Fix missing words in properties windows (#874). --- src/lib/raw_convert.cc | 36 ++++++++++++++++++++++++++++++++++++ src/lib/raw_convert.h | 8 ++++++++ src/lib/wscript | 5 +++-- 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 src/lib/raw_convert.cc (limited to 'src') diff --git a/src/lib/raw_convert.cc b/src/lib/raw_convert.cc new file mode 100644 index 000000000..4325f526f --- /dev/null +++ b/src/lib/raw_convert.cc @@ -0,0 +1,36 @@ +/* + Copyright (C) 2014-2016 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "raw_convert.h" + +using std::string; + +template <> +string +raw_convert (string v, int) +{ + return v; +} + +template <> +string +raw_convert (char const * v, int) +{ + return v; +} diff --git a/src/lib/raw_convert.h b/src/lib/raw_convert.h index 6e55d49cf..985c4e643 100644 --- a/src/lib/raw_convert.h +++ b/src/lib/raw_convert.h @@ -44,4 +44,12 @@ raw_convert (Q v, int precision = 16) return r; } +template <> +std::string +raw_convert (char const * v, int); + +template <> +std::string +raw_convert (std::string v, int); + #endif diff --git a/src/lib/wscript b/src/lib/wscript index fe4eac114..6a9f5106c 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -115,11 +115,12 @@ sources = """ send_problem_report_job.cc server.cc string_log_entry.cc + raw_convert.cc + subtitle_content.cc + subtitle_decoder.cc text_subtitle.cc text_subtitle_content.cc text_subtitle_decoder.cc - subtitle_content.cc - subtitle_decoder.cc timer.cc transcode_job.cc transcoder.cc -- cgit v1.2.3 From d4440e0112f3cc4500208da4734f3c3ba9cba03a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 23 May 2016 17:18:52 +0100 Subject: Missing virtual destructor. --- src/lib/signal_manager.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/lib/signal_manager.h b/src/lib/signal_manager.h index 62afacade..8bee68c3c 100644 --- a/src/lib/signal_manager.h +++ b/src/lib/signal_manager.h @@ -38,6 +38,8 @@ public: _ui_thread = boost::this_thread::get_id (); } + virtual ~SignalManager () {} + /* Do something next time the UI is idle */ template void when_idle (T f) { -- cgit v1.2.3 From 3739c62f626b65da929d37fb7efc44a8e349e6f1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 23 May 2016 21:17:23 +0100 Subject: Attempt to make more concessions for Centos 5. --- src/lib/image_examiner.cc | 2 +- src/lib/magick_image_proxy.cc | 5 +++-- wscript | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc index e0be15794..b9cd1caf5 100644 --- a/src/lib/image_examiner.cc +++ b/src/lib/image_examiner.cc @@ -43,7 +43,7 @@ ImageExaminer::ImageExaminer (shared_ptr film, shared_ptrpath(0).string (); diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc index cb168ce63..98054b8df 100644 --- a/src/lib/magick_image_proxy.cc +++ b/src/lib/magick_image_proxy.cc @@ -108,9 +108,10 @@ MagickImageProxy::image (optional) 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 +#ifdef DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE using namespace MagickCore; -#else +#endif +#ifdef DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE using namespace MagickLib; #endif magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p); diff --git a/wscript b/wscript index e31299883..dd2e18e0e 100644 --- a/wscript +++ b/wscript @@ -199,6 +199,25 @@ def configure(conf): if graphics is not None: conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_GRAPHICS_MAGICK') + # See if we are using the MagickCore or MagickLib namespaces + conf.check_cxx(fragment=""" + #include + using namespace MagickCore; + """, + mandatory=False, + msg='Checking for MagickCore namespace', + okmsg='yes', + define_name='DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE') + + conf.check_cxx(fragment=""" + #include + using namespace MagickLib + """, + mandatory=False, + msg='Checking for MagickLib namespace', + okmsg='yes', + define_name='DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE') + # libzip conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True) -- cgit v1.2.3