From: Carl Hetherington <cth@carlh.net>
Date: Wed, 16 Jul 2014 16:10:47 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~715
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=40b654453c2ce0b266f43c36f1b9a5d1705f983c

Merge master.
---

40b654453c2ce0b266f43c36f1b9a5d1705f983c
diff --cc src/wx/kdm_dialog.cc
index 4975146ec,ebecd234c..4334fd446
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@@ -490,10 -490,10 +490,10 @@@ KDMDialog::write_to () cons
  	return _write_to->GetValue ();
  }
  
 -libdcp::KDM::Formulation
 +dcp::Formulation
  KDMDialog::formulation () const
  {
- 	return (dcp::Formulation) reinterpret_cast<long int> (_type->GetClientData (_type->GetSelection()));
 -	return (libdcp::KDM::Formulation) reinterpret_cast<intptr_t> (_type->GetClientData (_type->GetSelection()));
++	return (dcp::Formulation) reinterpret_cast<intptr_t> (_type->GetClientData (_type->GetSelection()));
  }
  
  void