Rename compose.hpp to compose.h

36 files changed, 35 insertions, 35 deletions

diff --git a/src/asset.cc b/src/asset.cc
index 6e200b0d..b338aae7 100644
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -38,7 +38,7 @@
 
 
 #include "asset.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "dcp_assert.h"
 #include "exceptions.h"
 #include "pkl.h"
diff --git a/src/asset_factory.cc b/src/asset_factory.cc
index bab65678..0b6c9ad5 100644
--- a/src/asset_factory.cc
+++ b/src/asset_factory.cc
@@ -43,7 +43,7 @@
 #include "stereo_picture_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "atmos_asset.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "asset_factory.h"
 #include <memory>
 
diff --git a/src/atmos_asset_writer.cc b/src/atmos_asset_writer.cc
index 957bd4cb..1fe4b4e2 100644
--- a/src/atmos_asset_writer.cc
+++ b/src/atmos_asset_writer.cc
@@ -41,7 +41,7 @@
 #include "atmos_asset.h"
 #include "exceptions.h"
 #include "dcp_assert.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "crypto_context.h"
 #include <asdcp/AS_DCP.h>
 
diff --git a/src/certificate.cc b/src/certificate.cc
index 93f271ef..4508729f 100644
--- a/src/certificate.cc
+++ b/src/certificate.cc
@@ -38,7 +38,7 @@
 
 
 #include "certificate.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "exceptions.h"
 #include "util.h"
 #include "dcp_assert.h"
diff --git a/src/certificate_chain.cc b/src/certificate_chain.cc
index 5ff9b294..006d26b2 100644
--- a/src/certificate_chain.cc
+++ b/src/certificate_chain.cc
@@ -38,7 +38,7 @@
 
 
 #include "certificate_chain.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "dcp_assert.h"
 #include "exceptions.h"
 #include "util.h"
diff --git a/src/combine.h b/src/combine.h
index b23b21be..819efc89 100644
--- a/src/combine.h
+++ b/src/combine.h
@@ -37,7 +37,7 @@
  */
 
 
-#include "compose.hpp"
+#include "compose.h"
 #include "version.h"
 #include <boost/filesystem.hpp>
 
diff --git a/src/compose.cc b/src/compose.cc
index 95898b52..6cf06e95 100644
--- a/src/compose.cc
+++ b/src/compose.cc
@@ -32,7 +32,7 @@
 */
 
 
-#include "compose.hpp"
+#include "compose.h"
 
 
 void
diff --git a/src/compose.hpp b/src/compose.h
index a7bc1154..a7bc1154 100644
--- a/src/compose.hpp
+++ b/src/compose.h
diff --git a/src/cpl.cc b/src/cpl.cc
index 20d22b65..a35fcecc 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -38,7 +38,7 @@
 
 
 #include "certificate_chain.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "cpl.h"
 #include "dcp_assert.h"
 #include "local_time.h"
diff --git a/src/dcp.cc b/src/dcp.cc
index 3316b60e..161b5b52 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -40,7 +40,7 @@
 #include "asset_factory.h"
 #include "atmos_asset.h"
 #include "certificate_chain.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "cpl.h"
 #include "dcp.h"
 #include "dcp_assert.h"
diff --git a/src/dcp.h b/src/dcp.h
index 6e50c48e..50a7ea7a 100644
--- a/src/dcp.h
+++ b/src/dcp.h
@@ -41,7 +41,7 @@
 #define LIBDCP_DCP_H
 
 
-#include "compose.hpp"
+#include "compose.h"
 #include "types.h"
 #include "util.h"
 #include "certificate.h"
diff --git a/src/dcp_time.cc b/src/dcp_time.cc
index 0bd0a409..4e67afb7 100644
--- a/src/dcp_time.cc
+++ b/src/dcp_time.cc
@@ -40,7 +40,7 @@
 #include "raw_convert.h"
 #include "dcp_time.h"
 #include "exceptions.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "dcp_assert.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/optional.hpp>
diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc
index b2d8e618..7210a848 100644
--- a/src/decrypted_kdm.cc
+++ b/src/decrypted_kdm.cc
@@ -38,7 +38,7 @@
 
 
 #include "certificate_chain.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "cpl.h"
 #include "dcp_assert.h"
 #include "decrypted_kdm.h"
diff --git a/src/encrypted_kdm.cc b/src/encrypted_kdm.cc
index dec2efcd..5706f953 100644
--- a/src/encrypted_kdm.cc
+++ b/src/encrypted_kdm.cc
@@ -41,7 +41,7 @@
 #include "util.h"
 #include "certificate_chain.h"
 #include "exceptions.h"
-#include "compose.hpp"
+#include "compose.h"
 #include <libcxml/cxml.h>
 #include <libxml++/document.h>
 #include <libxml++/nodes/element.h>
diff --git a/src/exceptions.cc b/src/exceptions.cc
index 3d9b92ca..3cf1a782 100644
--- a/src/exceptions.cc
+++ b/src/exceptions.cc
@@ -38,7 +38,7 @@
 
 
 #include "exceptions.h"
-#include "compose.hpp"
+#include "compose.h"
 
 
 using std::string;
diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc
index a7be5d1a..51c41d18 100644
--- a/src/interop_subtitle_asset.cc
+++ b/src/interop_subtitle_asset.cc
@@ -37,7 +37,7 @@
  */
 
 
-#include "compose.hpp"
+#include "compose.h"
 #include "dcp_assert.h"
 #include "font_asset.h"
 #include "interop_load_font_node.h"
diff --git a/src/j2k_transcode.cc b/src/j2k_transcode.cc
index 9b7210aa..6b0aa58d 100644
--- a/src/j2k_transcode.cc
+++ b/src/j2k_transcode.cc
@@ -42,7 +42,7 @@
 #include "exceptions.h"
 #include "openjpeg_image.h"
 #include "dcp_assert.h"
-#include "compose.hpp"
+#include "compose.h"
 #include <openjpeg.h>
 #include <cmath>
 #include <iostream>
diff --git a/src/language_tag.cc b/src/language_tag.cc
index 8520a571..9ceaba00 100644
--- a/src/language_tag.cc
+++ b/src/language_tag.cc
@@ -37,7 +37,7 @@
  */
 
 
-#include "compose.hpp"
+#include "compose.h"
 #include "dcp_assert.h"
 #include "exceptions.h"
 #include "language_tag.h"
diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index 5aba95d2..ea753d0e 100644
--- a/src/mono_picture_asset.cc
+++ b/src/mono_picture_asset.cc
@@ -43,7 +43,7 @@
 #include "exceptions.h"
 #include "dcp_assert.h"
 #include "mono_picture_frame.h"
-#include "compose.hpp"
+#include "compose.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 
diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index df75126c..c40eb01a 100644
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -38,7 +38,7 @@
 
 
 #include "colour_conversion.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "crypto_context.h"
 #include "exceptions.h"
 #include "j2k_transcode.h"
diff --git a/src/mxf.cc b/src/mxf.cc
index 1154b80d..d4fbb4ef 100644
--- a/src/mxf.cc
+++ b/src/mxf.cc
@@ -43,7 +43,7 @@
 #include "metadata.h"
 #include "exceptions.h"
 #include "dcp_assert.h"
-#include "compose.hpp"
+#include "compose.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_prng.h>
 #include <asdcp/KM_util.h>
diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index f77ce820..e905aeb1 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -43,7 +43,7 @@
 #include "openjpeg_image.h"
 #include "picture_asset_writer.h"
 #include "dcp_assert.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "j2k_transcode.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
diff --git a/src/reel_asset.cc b/src/reel_asset.cc
index d233ee64..1807ae66 100644
--- a/src/reel_asset.cc
+++ b/src/reel_asset.cc
@@ -38,7 +38,7 @@
 
 
 #include "asset.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "dcp_assert.h"
 #include "raw_convert.h"
 #include "reel_asset.h"
diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index 2e51fec5..15ccf013 100644
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -37,7 +37,7 @@
  */
 
 
-#include "compose.hpp"
+#include "compose.h"
 #include "dcp_assert.h"
 #include "picture_asset.h"
 #include "raw_convert.h"
diff --git a/src/rgb_xyz.cc b/src/rgb_xyz.cc
index a8766b8e..734d5a95 100644
--- a/src/rgb_xyz.cc
+++ b/src/rgb_xyz.cc
@@ -38,7 +38,7 @@
 
 
 #include "colour_conversion.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "dcp_assert.h"
 #include "openjpeg_image.h"
 #include "rgb_xyz.h"
diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index 11450ef3..19ef8b5b 100644
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -37,7 +37,7 @@
  */
 
 
-#include "compose.hpp"
+#include "compose.h"
 #include "crypto_context.h"
 #include "dcp_assert.h"
 #include "exceptions.h"
diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 0eaa8fb5..bbb21913 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -37,7 +37,7 @@
  */
 
 
-#include "compose.hpp"
+#include "compose.h"
 #include "dcp_assert.h"
 #include "exceptions.h"
 #include "sound_asset.h"
diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc
index 5157bc9f..346dcc12 100644
--- a/src/sound_asset_writer.cc
+++ b/src/sound_asset_writer.cc
@@ -38,7 +38,7 @@
 
 
 #include "bitstream.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "crypto_context.h"
 #include "dcp_assert.h"
 #include "exceptions.h"
diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc
index 8d3a2757..46a0ef80 100644
--- a/src/stereo_picture_frame.cc
+++ b/src/stereo_picture_frame.cc
@@ -38,7 +38,7 @@
 
 
 #include "colour_conversion.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "crypto_context.h"
 #include "exceptions.h"
 #include "j2k_transcode.h"
diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index bf4b1c63..e236b77a 100644
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -38,7 +38,7 @@
 
 
 #include "raw_convert.h"
-#include "compose.hpp"
+#include "compose.h"
 #include "subtitle_asset.h"
 #include "subtitle_asset_internal.h"
 #include "util.h"
diff --git a/src/subtitle_asset_internal.cc b/src/subtitle_asset_internal.cc
index a9200618..34e6d94d 100644
--- a/src/subtitle_asset_internal.cc
+++ b/src/subtitle_asset_internal.cc
@@ -39,7 +39,7 @@
 
 #include "subtitle_asset_internal.h"
 #include "subtitle_string.h"
-#include "compose.hpp"
+#include "compose.h"
 #include <cmath>
 
 
diff --git a/src/types.cc b/src/types.cc
index 12be1b8a..40ceb18c 100644
--- a/src/types.cc
+++ b/src/types.cc
@@ -37,7 +37,7 @@
  */
 
 
-#include "compose.hpp"
+#include "compose.h"
 #include "dcp_assert.h"
 #include "exceptions.h"
 #include "raw_convert.h"
diff --git a/src/util.cc b/src/util.cc
index 5133a43b..a36e2429 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -44,7 +44,7 @@
 #include "certificate.h"
 #include "openjpeg_image.h"
 #include "dcp_assert.h"
-#include "compose.hpp"
+#include "compose.h"
 #include <openjpeg.h>
 #include <asdcp/KM_util.h>
 #include <asdcp/KM_fileio.h>
diff --git a/src/verify.cc b/src/verify.cc
index 5550a67f..6e335c6f 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -37,7 +37,7 @@
  */
 
 
-#include "compose.hpp"
+#include "compose.h"
 #include "cpl.h"
 #include "dcp.h"
 #include "exceptions.h"
diff --git a/src/verify_j2k.cc b/src/verify_j2k.cc
index 2e1255ea..5317b2f7 100644
--- a/src/verify_j2k.cc
+++ b/src/verify_j2k.cc
@@ -37,7 +37,7 @@
  */
 
 
-#include "compose.hpp"
+#include "compose.h"
 #include "data.h"
 #include "raw_convert.h"
 #include "verify.h"
diff --git a/src/wscript b/src/wscript
index 9f102a97..24768577 100644
--- a/src/wscript
+++ b/src/wscript
@@ -132,7 +132,7 @@ def build(bld):
               chromaticity.h
               colour_conversion.h
               combine.h
-              compose.hpp
+              compose.h
               cpl.h
               crypto_context.h
               data.h