From 9e11d439b326b05a42706d94111ff75e7538acaf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 8 Dec 2015 09:59:03 +0000 Subject: Try to fix build on OS X. --- src/j2k.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/j2k.cc b/src/j2k.cc index 635d5024..f19b5632 100644 --- a/src/j2k.cc +++ b/src/j2k.cc @@ -136,8 +136,8 @@ dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce) opj_destroy_codec (decoder); opj_stream_destroy (stream); - image->x1 = rint (float(image->x1) / pow (2, reduce)); - image->y1 = rint (float(image->y1) / pow (2, reduce)); + image->x1 = rint (float(image->x1) / pow (2.0f, reduce)); + image->y1 = rint (float(image->y1) / pow (2.0f, reduce)); return shared_ptr (new OpenJPEGImage (image)); } -- cgit v1.2.3 From e0ce01d697dc48e3441716b99290b1017822aa2c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 8 Dec 2015 10:02:53 +0000 Subject: Hide some warnings on OS X. --- wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index 807b20e0..2cf0fb69 100644 --- a/wscript +++ b/wscript @@ -36,8 +36,8 @@ def configure(conf): else: conf.env.append_value('CXXFLAGS', '-DLIBDCP_POSIX') - if not conf.env.TARGET_OSX: - conf.env.append_value('CXXFLAGS', ['-Wno-unused-result', '-Wno-unused-parameter']) + if conf.env.TARGET_OSX: + conf.env.append_value('CXXFLAGS', ['-Wno-unused-result', '-Wno-unused-parameter', '-Wno-unused-local-typedef']) if conf.options.enable_openmp: conf.env.append_value('CXXFLAGS', '-fopenmp') -- cgit v1.2.3