projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7ba51b7
)
Try to fix build on OS X.
author
Carl Hetherington
<cth@carlh.net>
Sun, 31 Dec 2017 18:59:23 +0000
(18:59 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 31 Dec 2017 18:59:23 +0000
(18:59 +0000)
test/test.cc
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/test/test.cc
b/test/test.cc
index dff7800ce8c0ee2f470ae2c906d88fbb5c86870d..edeb89925dd7d2bbe599b26d4c34873dfa9d92d3 100644
(file)
--- a/
test/test.cc
+++ b/
test/test.cc
@@
-239,7
+239,7
@@
check_image (boost::filesystem::path ref, boost::filesystem::path check)
/* XXX: this is a hack; we really want the ImageMagick call but GraphicsMagick doesn't have it;
this may cause random test failures on platforms that use GraphicsMagick.
*/
/* XXX: this is a hack; we really want the ImageMagick call but GraphicsMagick doesn't have it;
this may cause random test failures on platforms that use GraphicsMagick.
*/
-#ifdef DCPOMATIC_
IMAGE_MAGICK
+#ifdef DCPOMATIC_
ADVANCED_MAGICK_COMPARE
double const dist = ref_image.compare(check_image, Magick::RootMeanSquaredErrorMetric);
BOOST_CHECK_MESSAGE (dist < 0.001, ref << " differs from " << check << " " << dist);
#else
double const dist = ref_image.compare(check_image, Magick::RootMeanSquaredErrorMetric);
BOOST_CHECK_MESSAGE (dist < 0.001, ref << " differs from " << check << " " << dist);
#else
diff --git
a/wscript
b/wscript
index 173eae2d2aadc1f7ffc6a917fd388202d226bb5e..6527673017e05ca55e77bdd5b1284961cdbf6e87 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2012-201
6
Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-201
7
Carl Hetherington <cth@carlh.net>
#
# This file is part of DCP-o-matic.
#
#
# This file is part of DCP-o-matic.
#
@@
-256,6
+256,17
@@
def configure(conf):
includes=conf.env['INCLUDES_MAGICK'],
define_name='DCPOMATIC_MAGICKCORE_MAGICKCORE')
includes=conf.env['INCLUDES_MAGICK'],
define_name='DCPOMATIC_MAGICKCORE_MAGICKCORE')
+ # See if we have advanced compare() methods in Magick
+ conf.check_cxx(fragment="""
+ #include <Magick++.h>\n
+ int main() { Magick::Image a; Magick::Image b; a.compare(b, Magick::RootMeanSquaredErrorMetric); }
+ """,
+ mandatory=False,
+ msg='Checking for advanced compare() method in {Image/Graphics}Magick',
+ uselib='MAGICK',
+ define_name='DCPOMATIC_ADVANCED_MAGICK_COMPARE'
+ )
+
# libzip
conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)
# libzip
conf.check_cfg(package='libzip', args='--cflags --libs', uselib_store='ZIP', mandatory=True)