Rename j2k.{cc,h} => j2k_transcode.{cc,h}

10 files changed, 33 insertions, 33 deletions

diff --git a/benchmark/j2k_transcode.cc b/benchmark/j2k_transcode.cc
index a5984a0d..c984dc5b 100644
--- a/benchmark/j2k_transcode.cc
+++ b/benchmark/j2k_transcode.cc
@@ -35,7 +35,7 @@
 #include "array_data.h"
 #include "util.h"
 #include "version.h"
-#include "j2k.h"
+#include "j2k_transcode.h"
 #include "openjpeg_image.h"
 #include <sys/time.h>
 #include <iostream>
diff --git a/src/j2k.cc b/src/j2k_transcode.cc
index c07bdccd..b9ebe6c3 100644
--- a/src/j2k.cc
+++ b/src/j2k_transcode.cc
@@ -32,13 +32,13 @@
 */
 
 
-/** @file  src/j2k.cc
+/** @file  src/j2k_transcode.cc
  *  @brief Methods to encode and decode JPEG2000
  */
 
 
 #include "array_data.h"
-#include "j2k.h"
+#include "j2k_transcode.h"
 #include "exceptions.h"
 #include "openjpeg_image.h"
 #include "dcp_assert.h"
diff --git a/src/j2k.h b/src/j2k_transcode.h
index a4c4f0bd..0687706d 100644
--- a/src/j2k.h
+++ b/src/j2k_transcode.h
@@ -32,7 +32,7 @@
 */
 
 
-/** @file  src/j2k.h
+/** @file  src/j2k_transcode.h
  *  @brief Methods to encode and decode JPEG2000
  */
 
diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index 3e27bed7..fb451e08 100644
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -37,14 +37,14 @@
  */
 
 
-#include "mono_picture_frame.h"
-#include "exceptions.h"
-#include "util.h"
-#include "rgb_xyz.h"
 #include "colour_conversion.h"
 #include "compose.hpp"
-#include "j2k.h"
 #include "crypto_context.h"
+#include "exceptions.h"
+#include "j2k_transcode.h"
+#include "mono_picture_frame.h"
+#include "rgb_xyz.h"
+#include "util.h"
 #include <asdcp/KM_fileio.h>
 #include <asdcp/AS_DCP.h>
 
diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 86d85d46..f77ce820 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -44,7 +44,7 @@
 #include "picture_asset_writer.h"
 #include "dcp_assert.h"
 #include "compose.hpp"
-#include "j2k.h"
+#include "j2k_transcode.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 #include <libxml++/nodes/element.h>
diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc
index ac9cb6d9..4cb9f2a1 100644
--- a/src/stereo_picture_frame.cc
+++ b/src/stereo_picture_frame.cc
@@ -37,14 +37,14 @@
  */
 
 
-#include "stereo_picture_frame.h"
-#include "exceptions.h"
-#include "util.h"
-#include "rgb_xyz.h"
 #include "colour_conversion.h"
 #include "compose.hpp"
-#include "j2k.h"
 #include "crypto_context.h"
+#include "exceptions.h"
+#include "j2k_transcode.h"
+#include "rgb_xyz.h"
+#include "stereo_picture_frame.h"
+#include "util.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 
diff --git a/src/wscript b/src/wscript
index 76fd7be7..10bb90c7 100644
--- a/src/wscript
+++ b/src/wscript
@@ -60,7 +60,7 @@ def build(bld):
              identity_transfer_function.cc
              interop_load_font_node.cc
              interop_subtitle_asset.cc
-             j2k.cc
+             j2k_transcode.cc
              key.cc
              language_tag.cc
              local_time.cc
@@ -144,7 +144,7 @@ def build(bld):
               identity_transfer_function.h
               interop_load_font_node.h
               interop_subtitle_asset.h
-              j2k.h
+              j2k_transcode.h
               key.h
               language_tag.h
               load_font_node.h
diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc
index 4388cbc0..e24ab5aa 100644
--- a/test/frame_info_hash_test.cc
+++ b/test/frame_info_hash_test.cc
@@ -33,7 +33,7 @@
 
 #include "mono_picture_asset.h"
 #include "mono_picture_asset_writer.h"
-#include "j2k.h"
+#include "j2k_transcode.h"
 #include "openjpeg_image.h"
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/test.cc b/test/test.cc
index 196827fc..dc18f190 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -49,7 +49,7 @@
 #include "smpte_subtitle_asset.h"
 #include "mono_picture_asset.h"
 #include "openjpeg_image.h"
-#include "j2k.h"
+#include "j2k_transcode.h"
 #include "picture_asset_writer.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_asset.h"
diff --git a/test/verify_test.cc b/test/verify_test.cc
index a6f71b49..fc2ed203 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -31,28 +31,28 @@
     files in the program, then also delete it here.
 */
 
-#include "verify.h"
-#include "util.h"
-#include "j2k.h"
-#include "reel.h"
-#include "reel_mono_picture_asset.h"
-#include "reel_sound_asset.h"
+#include "compose.hpp"
 #include "cpl.h"
 #include "dcp.h"
-#include "openjpeg_image.h"
+#include "interop_subtitle_asset.h"
+#include "j2k_transcode.h"
 #include "mono_picture_asset.h"
-#include "stereo_picture_asset.h"
 #include "mono_picture_asset_writer.h"
-#include "interop_subtitle_asset.h"
-#include "smpte_subtitle_asset.h"
+#include "openjpeg_image.h"
+#include "raw_convert.h"
+#include "reel.h"
 #include "reel_closed_caption_asset.h"
+#include "reel_markers_asset.h"
+#include "reel_mono_picture_asset.h"
+#include "reel_sound_asset.h"
 #include "reel_stereo_picture_asset.h"
 #include "reel_subtitle_asset.h"
-#include "reel_markers_asset.h"
-#include "compose.hpp"
-#include "test.h"
-#include "raw_convert.h"
+#include "smpte_subtitle_asset.h"
+#include "stereo_picture_asset.h"
 #include "stream_operators.h"
+#include "test.h"
+#include "util.h"
+#include "verify.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
 #include <cstdio>