C++11 and whitespace cleanups.

[dcpomatic.git] / src / lib / j2k_image_proxy.cc

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 00d3cf2ef20b4edfb473dbcaa442e73bdff9a9b5..67083e6550cb314b7e9a13f166ea1486ffb26bec 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -19,18 +19,18 @@
 */
 
 
-#include "j2k_image_proxy.h"
+#include "dcpomatic_assert.h"
 #include "dcpomatic_socket.h"
 #include "image.h"
-#include "dcpomatic_assert.h"
+#include "j2k_image_proxy.h"
 #include "warnings.h"
-#include <dcp/raw_convert.h>
-#include <dcp/openjpeg_image.h>
-#include <dcp/mono_picture_frame.h>
-#include <dcp/stereo_picture_frame.h>
 #include <dcp/colour_conversion.h>
-#include <dcp/rgb_xyz.h>
 #include <dcp/j2k_transcode.h>
+#include <dcp/mono_picture_frame.h>
+#include <dcp/openjpeg_image.h>
+#include <dcp/raw_convert.h>
+#include <dcp/rgb_xyz.h>
+#include <dcp/stereo_picture_frame.h>
 #include <libcxml/cxml.h>
 DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>