Updated to OpenJPH v0.26.3

Fixed typos

Author: PantelisGeorgiadis

CMakeLists.txt

@@ -8,7 +8,7 @@ project(
 
 set(DCMTKHTJ2K_VERSION_MAJOR 1)
 set(DCMTKHTJ2K_VERSION_MINOR 0)
-set(DCMTKHTJ2K_VERSION_BUILD 2)
+set(DCMTKHTJ2K_VERSION_BUILD 3)
 set(DCMTKHTJ2K_VERSION
     "${DCMTKHTJ2K_VERSION_MAJOR}.${DCMTKHTJ2K_VERSION_MINOR}.${DCMTKHTJ2K_VERSION_BUILD}"
 )

build.sh

@@ -44,7 +44,7 @@ cd $OTS_DEV_SPACE
 [[ -d openjph ]] || git clone https://github.com/aous72/openjph.git
 cd openjph
 git fetch
-git checkout -f 0.26.0
+git checkout -f 0.26.3
 mkdir -p $BUILD_TYPE
 cd $BUILD_TYPE
 cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE \

include/dcmtkhtj2k/djcodece.h

@@ -353,7 +353,7 @@ class DCMTKHTJ2K_EXPORT HtJ2kEncoderBase : public DcmCodec {
 
 /** codec class for HT-J2K lossless only TS encoding
  */
-class DCMTKHTJ2K_EXPORT Ht2kLosslessEncoder : public HtJ2kEncoderBase {
+class DCMTKHTJ2K_EXPORT HtJ2kLosslessEncoder : public HtJ2kEncoderBase {
  public:
   /** returns the transfer syntax that this particular codec
    *  is able to encode

include/dcmtkhtj2k/djdecode.h

@@ -35,9 +35,9 @@ class DCMTKHTJ2K_EXPORT HtJ2kDecoderRegistration {
    */
   static void cleanup();
 
-  /** get version information of the CharLS library.
-   *  Typical output format: "CharLS, Revision 55020 (modified)"
-   *  @return name and version number of the CharLS library
+  /** get version information of the OpenJPH library.
+   *  Typical output format: "OpenJPH, Revision 55020 (modified)"
+   *  @return name and version number of the OpenJPH library
    */
   static OFString getLibraryVersionString();
 

include/dcmtkhtj2k/djencode.h

@@ -8,7 +8,7 @@
 #include "djutils.h"
 
 class HtJ2kCodecParameter;
-class Ht2kLosslessEncoder;
+class HtJ2kLosslessEncoder;
 class HtJ2kRPCLLosslessEncoder;
 class HtJ2kLossyEncoder;
 
@@ -56,9 +56,9 @@ class DCMTKHTJ2K_EXPORT HtJ2kEncoderRegistration {
    */
   static void cleanup();
 
-  /** get version information of the CharLS library.
-   *  Typical output format: "CharLS, Revision 55020 (modified)"
-   *  @return name and version number of the CharLS library
+  /** get version information of the OpenJPH library.
+   *  Typical output format: "OpenJPH, Revision 55020 (modified)"
+   *  @return name and version number of the OpenJPH library
    */
   static OFString getLibraryVersionString();
 
@@ -70,7 +70,7 @@ class DCMTKHTJ2K_EXPORT HtJ2kEncoderRegistration {
   static HtJ2kCodecParameter *cp_;
 
   /// pointer to encoder for lossless HT-J2K
-  static Ht2kLosslessEncoder *losslessencoder_;
+  static HtJ2kLosslessEncoder *losslessencoder_;
 
   /// pointer to encoder for RPCL lossless HT-J2K
   static HtJ2kRPCLLosslessEncoder *rpcllosslessencoder_;

include/dcmtkhtj2k/djutils.h

@@ -6,18 +6,18 @@
 #include "dcmtk/ofstd/ofcond.h" /* for class OFCondition */
 #include "dldefine.h"
 
-#define DCMTKHTJ2K_VERSION_STRING "DCMTK-HTJ2K 1.0.2"
+#define DCMTKHTJ2K_VERSION_STRING "OpenJPH, Version 0.26.3 (unmodified)"
 
 // global definitions for logging mechanism provided by the oflog module
 
-extern DCMTKHTJ2K_EXPORT OFLogger DCM_ht2kLogger;
+extern DCMTKHTJ2K_EXPORT OFLogger DCM_htJ2kLogger;
 
-#define DCMTKHTJ2K_TRACE(msg) OFLOG_TRACE(DCM_ht2kLogger, msg)
-#define DCMTKHTJ2K_DEBUG(msg) OFLOG_DEBUG(DCM_ht2kLogger, msg)
-#define DCMTKHTJ2K_INFO(msg) OFLOG_INFO(DCM_ht2kLogger, msg)
-#define DCMTKHTJ2K_WARN(msg) OFLOG_WARN(DCM_ht2kLogger, msg)
-#define DCMTKHTJ2K_ERROR(msg) OFLOG_ERROR(DCM_ht2kLogger, msg)
-#define DCMTKHTJ2K_FATAL(msg) OFLOG_FATAL(DCM_ht2kLogger, msg)
+#define DCMTKHTJ2K_TRACE(msg) OFLOG_TRACE(DCM_htJ2kLogger, msg)
+#define DCMTKHTJ2K_DEBUG(msg) OFLOG_DEBUG(DCM_htJ2kLogger, msg)
+#define DCMTKHTJ2K_INFO(msg) OFLOG_INFO(DCM_htJ2kLogger, msg)
+#define DCMTKHTJ2K_WARN(msg) OFLOG_WARN(DCM_htJ2kLogger, msg)
+#define DCMTKHTJ2K_ERROR(msg) OFLOG_ERROR(DCM_htJ2kLogger, msg)
+#define DCMTKHTJ2K_FATAL(msg) OFLOG_FATAL(DCM_htJ2kLogger, msg)
 
 // include this file in doxygen documentation
 

libsrc/djcodece.cc

@@ -51,7 +51,7 @@ BEGIN_EXTERN_C
 #endif
 END_EXTERN_C
 
-E_TransferSyntax Ht2kLosslessEncoder::supportedTransferSyntax() const {
+E_TransferSyntax HtJ2kLosslessEncoder::supportedTransferSyntax() const {
   return EXS_HighThroughputJPEG2000LosslessOnly;
 }
 

libsrc/djencode.cc

@@ -8,7 +8,7 @@
 // initialization of static members
 OFBool HtJ2kEncoderRegistration::registered_ = OFFalse;
 HtJ2kCodecParameter *HtJ2kEncoderRegistration::cp_ = NULL;
-Ht2kLosslessEncoder *HtJ2kEncoderRegistration::losslessencoder_ = NULL;
+HtJ2kLosslessEncoder *HtJ2kEncoderRegistration::losslessencoder_ = NULL;
 HtJ2kRPCLLosslessEncoder *HtJ2kEncoderRegistration::rpcllosslessencoder_ = NULL;
 HtJ2kLossyEncoder *HtJ2kEncoderRegistration::lossyencoder_ = NULL;
 
@@ -26,7 +26,7 @@ void HtJ2kEncoderRegistration::registerCodecs(
                                   convertToSC, EHTJ2KPC_restore, OFFalse);
 
     if (cp_) {
-      losslessencoder_ = new Ht2kLosslessEncoder();
+      losslessencoder_ = new HtJ2kLosslessEncoder();
       if (losslessencoder_)
         DcmCodecList::registerCodec(losslessencoder_, NULL, cp_);
       rpcllosslessencoder_ = new HtJ2kRPCLLosslessEncoder();

libsrc/djutils.cc

@@ -4,7 +4,7 @@
 #include "dcmtk/config/osconfig.h"
 #include "dcmtk/dcmdata/dcerror.h"
 
-OFLogger DCM_ht2kLogger = OFLog::getLogger("DCMTKHTJ2K");
+OFLogger DCM_htJ2kLogger = OFLog::getLogger("DCMTKHTJ2K");
 
 #define MAKE_DCMTKHTJ2K_ERROR(number, name, description) \
   makeOFConditionConst(EC_##name, OFM_dcmjp2k, number, OF_error, description)