Merge.

2 files changed, 4 insertions, 4 deletions

diff --git a/src/j2k.cc b/src/j2k.cc
index 5fd787f6..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.0, reduce));
-	image->y1 = rint (float(image->y1) / pow (2.0, reduce));
+	image->x1 = rint (float(image->x1) / pow (2.0f, reduce));
+	image->y1 = rint (float(image->y1) / pow (2.0f, reduce));
 	return shared_ptr<OpenJPEGImage> (new OpenJPEGImage (image));
 }
 
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')