summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-27 01:06:05 +0100
committerCarl Hetherington <cth@carlh.net>2021-02-06 22:48:30 +0100
commit0892ee346ee0caf60d532bab40ebf1716e3b1cb8 (patch)
tree19f5ca33b9091f77ee2ce6c0b40649d69cce0c4c /src
parent377c88a90db7fa8b48f5f593a120f8908722d399 (diff)
Rename j2k.{cc,h} => j2k_transcode.{cc,h}
Diffstat (limited to 'src')
-rw-r--r--src/j2k_transcode.cc (renamed from src/j2k.cc)4
-rw-r--r--src/j2k_transcode.h (renamed from src/j2k.h)2
-rw-r--r--src/mono_picture_frame.cc10
-rw-r--r--src/picture_asset.cc2
-rw-r--r--src/stereo_picture_frame.cc10
-rw-r--r--src/wscript4
6 files changed, 16 insertions, 16 deletions
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