Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

3 files changed, 4 insertions, 5 deletions

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 76bfba5a2..3a4a793a8 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -56,8 +56,6 @@ using boost::dynamic_pointer_cast;
  */
 DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
 	: Encoder (film, job)
-	, _film (film)
-	, _job (job)
 	, _finishing (false)
 	, _non_burnt_subtitles (false)
 {
diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index 0fa20c2c9..15f3dbc64 100644
--- a/src/lib/dcp_encoder.h
+++ b/src/lib/dcp_encoder.h
@@ -54,8 +54,6 @@ private:
 	void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
 	void subtitle (PlayerSubtitles, DCPTimePeriod);
 
-	boost::shared_ptr<const Film> _film;
-	boost::weak_ptr<Job> _job;
 	boost::shared_ptr<Writer> _writer;
 	boost::shared_ptr<J2KEncoder> _j2k_encoder;
 	bool _finishing;
diff --git a/wscript b/wscript
index 19ee66ee5..ab86865b2 100644
--- a/wscript
+++ b/wscript
@@ -78,8 +78,11 @@ def configure(conf):
                                        '-msse',
                                        '-fno-strict-aliasing',
                                        '-Wall',
-                                       '-Wno-attributes',
+                                       '-Wcast-align',
                                        '-Wextra',
+                                       '-Wwrite-strings',
+                                       '-Wunsafe-loop-optimizations',
+                                       '-Wlogical-op',
                                        # Remove auto_ptr warnings from libxml++-2.6
                                        '-Wno-deprecated-declarations',
                                        '-D_FILE_OFFSET_BITS=64'])