Cleanup: sorting.

diff --git a/src/atmos_asset_writer.cc b/src/atmos_asset_writer.cc
index 957bd4cb57b96daae2b2c6e87141370388e9a21b..9d7363d04eaaafafd2534e060e7de22730b391aa 100644 (file)
--- a/src/atmos_asset_writer.cc
+++ b/src/atmos_asset_writer.cc
@@ -37,12 +37,12 @@
  */
 
 
-#include "atmos_asset_writer.h"
 #include "atmos_asset.h"
-#include "exceptions.h"
-#include "dcp_assert.h"
+#include "atmos_asset_writer.h"
 #include "compose.hpp"
 #include "crypto_context.h"
+#include "dcp_assert.h"
+#include "exceptions.h"
 #include <asdcp/AS_DCP.h>
 
 

diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index 2a8d5c5d4f5e556ca56ac0bf29a0f3f393b5cd5b..4deb366aa4921cf2bbfdb8c9b2a6f5d8e2287b0d 100644 (file)
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -37,17 +37,17 @@
  */
 
 
-#include "raw_convert.h"
 #include "compose.hpp"
+#include "dcp_assert.h"
+#include "load_font_node.h"
+#include "raw_convert.h"
+#include "reel_asset.h"
 #include "subtitle_asset.h"
 #include "subtitle_asset_internal.h"
+#include "subtitle_image.h"
+#include "subtitle_string.h"
 #include "util.h"
 #include "xml.h"
-#include "subtitle_string.h"
-#include "subtitle_image.h"
-#include "dcp_assert.h"
-#include "load_font_node.h"
-#include "reel_asset.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_util.h>
 #include <libxml++/nodes/element.h>

diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index 03a755180ec173493eac6357d2a68f7e35570bcf..6a37be1c1f4941347e1d218a22f9774658e55007 100644 (file)
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -31,25 +31,26 @@
     files in the program, then also delete it here.
 */
 
+
+#include "common.h"
+#include "compose.hpp"
+#include "cpl.h"
 #include "dcp.h"
+#include "decrypted_kdm.h"
+#include "encrypted_kdm.h"
 #include "exceptions.h"
-#include "reel.h"
-#include "sound_asset.h"
+#include "interop_subtitle_asset.h"
+#include "mono_picture_asset.h"
 #include "picture_asset.h"
-#include "subtitle_asset.h"
+#include "reel.h"
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_subtitle_asset.h"
-#include "subtitle_string.h"
-#include "subtitle_image.h"
-#include "interop_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
-#include "mono_picture_asset.h"
-#include "encrypted_kdm.h"
-#include "decrypted_kdm.h"
-#include "cpl.h"
-#include "common.h"
-#include "compose.hpp"
+#include "sound_asset.h"
+#include "subtitle_asset.h"
+#include "subtitle_image.h"
+#include "subtitle_string.h"
 #include <getopt.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
@@ -58,21 +59,23 @@
 #include <sstream>
 #include <inttypes.h>
 
-using std::string;
+
 using std::cerr;
 using std::cout;
+using std::dynamic_pointer_cast;
+using std::exception;
 using std::list;
-using std::pair;
-using std::min;
 using std::max;
-using std::exception;
-using std::vector;
-using std::stringstream;
+using std::min;
+using std::pair;
 using std::shared_ptr;
-using std::dynamic_pointer_cast;
+using std::string;
+using std::stringstream;
+using std::vector;
 using boost::optional;
 using namespace dcp;
 
+
 static void
 help (string n)
 {