Jasper

config/Makefile.def.in

@@ -73,6 +73,7 @@ OPENSSLLIBS = @OPENSSLLIBS@
 TIFFLIBS = @TIFFLIBS@
 PNGLIBS = @PNGLIBS@
 ZLIBLIBS = @ZLIBLIBS@
+JASPERLIBS = -ljasper
 CLUCENELIBS = -lclucene-core
 BOOSTLIBS = -lboost_system-mt -lboost_filesystem-mt
 XMLLIBS = @XMLLIBS@

dcmjpeg/apps/Makefile.in

@@ -43,7 +43,7 @@ LOCALINCLUDES = $(dcmjpeginc) $(ofstdinc) $(dcmdatainc) $(dcmimageinc) $(dcmimgl
 LIBDIRS = -L$(top_srcdir)/libsrc $(dcmjpeglibdir) $(dcmimagelibdir) $(dcmimglelibdir) \
 	$(dcmdatalibdir) $(ofstdlibdir)
 LOCALLIBS = $(dcmjpeglib) $(dcmimagelib) $(dcmimglelib) $(dcmdatalib) $(ofstdlib) \
-	$(TIFFLIBS) $(PNGLIBS) $(ZLIBLIBS)
+	$(TIFFLIBS) $(PNGLIBS) $(ZLIBLIBS) $(JASPERLIBS)
 
 objs = dcmdjpeg.o dcmcjpeg.o dcmj2pnm.o dcmmkdir.o
 progs = dcmdjpeg dcmcjpeg dcmj2pnm dcmmkdir

dcmjpeg/include/dcmtk/dcmjpeg/djdecjp2lol.h

@@ -0,0 +1,53 @@
+/*
+ *
+ *  Module:  dcmjpeg
+ *
+ *  Author:  Henning Meyer
+ *
+ *  Purpose: Codec class for decoding JPEG2000 Lossless
+ *
+ */
+
+#ifndef DJDECJP2LOL_H
+#define DJDECJP2LOL_H
+
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/dcmjpeg/djcodecd.h" /* for class DJCodecDecoder */
+
+
+/** Decoder class for JPEG2000 Lossless
+ */
+class DJDecoderJPEG2000Lossless : public DJCodecDecoder
+{
+public: 
+
+  /// default constructor
+  DJDecoderJPEG2000Lossless();
+
+  /// destructor
+  virtual ~DJDecoderJPEG2000Lossless();
+
+  /** returns the transfer syntax that this particular codec
+   *  is able to encode and decode.
+   *  @return supported transfer syntax
+   */
+  virtual E_TransferSyntax supportedTransferSyntax() const;
+
+private:
+
+  /** creates an instance of the compression library to be used for decoding.
+   *  @param toRepParam representation parameter passed to decode()
+   *  @param cp codec parameter passed to decode()
+   *  @param bitsPerSample bits per sample for the image data
+   *  @param isYBR flag indicating whether DICOM photometric interpretation is YCbCr
+   *  @return pointer to newly allocated decoder object
+   */
+  virtual DJDecoder *createDecoderInstance(
+    const DcmRepresentationParameter * toRepParam,
+    const DJCodecParameter *cp,
+    Uint8 bitsPerSample,
+    OFBool isYBR) const;
+
+};
+
+#endif

dcmjpeg/include/dcmtk/dcmjpeg/djdecode.h

@@ -45,6 +45,7 @@ class DJDecoderLossless;
 class DJDecoderP14SV1;
 class DJDecoderProgressive;
 class DJDecoderSpectralSelection;
+class DJDecoderJPEG2000Lossless;
 
 /** singleton class that registers decoders for all supported JPEG processes.
  */
@@ -98,6 +99,9 @@ class DJDecoderRegistration
 
   /// pointer to decoder for lossless JPEG
   static DJDecoderLossless *declol;
+
+  /// pointer to decoder for lossless JPEG2000
+  static DJDecoderJPEG2000Lossless *decjp2lol;
 
 };
 

dcmjpeg/include/dcmtk/dcmjpeg/djdjp2.h

@@ -0,0 +1,114 @@
+/*
+ *
+ *  Module:  dcmjpeg
+ *
+ *  Author:  Henning Meyer
+ *
+ *  Purpose: decompression routines of the Jasper JPEG2000 library
+ *
+ */
+
+#ifndef DJDJP2_H
+#define DJDJP2_H
+
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/dcmjpeg/djdecabs.h" /* for class DJDecoder */
+
+#include <boost/scoped_ptr.hpp>
+using namespace boost;
+
+class DJCodecParameter;
+
+/** this class encapsulates the decompression routines of the
+ *  JasPer JPEG library
+ */
+class DJDecompressJPEG2000 : public DJDecoder
+{
+public:
+
+  /** constructor
+   *  @param cp codec parameters
+   *  @param isYBR flag indicating if DICOM photometric interpretation is YCbCr
+   */
+  DJDecompressJPEG2000(const DJCodecParameter& cp, OFBool isYBR, Uint8 bitsPerSample);
+
+  /// destructor
+  virtual ~DJDecompressJPEG2000();
+
+  /** initializes internal object structures.
+   *  Must be called before a new frame is decompressed.
+   *  @return EC_Normal if successful, an error code otherwise
+   */
+  virtual OFCondition init();
+
+  /** suspended decompression routine. Decompresses a JPEG frame
+   *  until finished or out of data. Can be called with new data
+   *  until a frame is complete.
+   *  @param compressedFrameBuffer pointer to compressed input data, must not be NULL
+   *  @param compressedFrameBufferSize size of buffer, in bytes
+   *  @param uncompressedFrameBuffer pointer to uncompressed output data, must not be NULL.
+   *     This buffer must not change between multiple decode() calls for a single frame.
+   *  @param uncompressedFrameBufferSize size of buffer, in bytes (!)
+   *     Buffer must be large enough to contain a complete frame.
+   *  @param isSigned OFTrue, if uncompressed pixel data is signed, OFFalse otherwise
+   *  @return EC_Normal if successful, EC_Suspend if more data is needed, an error code otherwise.
+   */
+  virtual OFCondition decode(
+    Uint8 *compressedFrameBuffer,
+    Uint32 compressedFrameBufferSize,
+    Uint8 *uncompressedFrameBuffer,
+    Uint32 uncompressedFrameBufferSize,
+    OFBool isSigned);
+
+  /** returns the number of bytes per sample that will be written when decoding.
+   */
+  virtual Uint16 bytesPerSample() const
+  {
+    return sizeof(Uint16);
+  }
+
+  /** after successful compression,
+   *  returns the color model of the decompressed image
+   */
+  virtual EP_Interpretation getDecompressedColorModel() const
+  {
+    return decompressedColorModel;
+  }
+
+  /** callback function used to report warning messages and the like.
+   *  Should not be called by user code directly.
+   */
+  virtual void outputMessage() const;
+
+private:
+
+  /// private undefined copy constructor
+  DJDecompressJPEG2000(const DJDecompressJPEG2000&);
+
+  /// private undefined copy assignment operator
+  DJDecompressJPEG2000& operator=(const DJDecompressJPEG2000&);
+
+  /// cleans up cinfo structure, called from destructor and error handlers
+  void cleanup();
+/*
+  /// codec parameters
+  const DJCodecParameter *cparam;
+
+  /// decompression structure
+  jpeg_decompress_struct *cinfo;
+
+  /// position of last suspend
+  int suspension;
+
+  /// temporary storage for row buffer during suspension
+  void *jsampBuffer;
+
+  /// Flag indicating if DICOM photometric interpretation is YCbCr
+  OFBool dicomPhotometricInterpretationIsYCbCr;
+*/
+
+  /// color model after decompression
+  EP_Interpretation decompressedColorModel;
+};
+
+#endif

dcmjpeg/include/dcmtk/dcmjpeg/djutils.h

@@ -170,6 +170,13 @@ extern const OFCondition EJ_IJG16_FrameBufferTooSmall;
 extern const OFCondition EJ_UnsupportedPhotometricInterpretation;
 /// Codec does not support this kind of color conversion
 extern const OFCondition EJ_UnsupportedColorConversion;
+/// Codec implementation does not support multiple Components
+extern const OFCondition EJ_UnsupportedNumberOfComponents;
+/// Coded and expected Signedness do not match
+extern const OFCondition EJ_ConflictingSignedness;
+/// Error in JPEG2000 decoder
+extern const OFCondition EJ_JPEG2000DecoderError;
+
 
 // reserved condition codes for IJG error messages
 const unsigned short EJCode_IJG8_Compression    = 0x0100;
@@ -178,6 +185,7 @@ const unsigned short EJCode_IJG12_Compression   = 0x0102;
 const unsigned short EJCode_IJG12_Decompression = 0x0103;
 const unsigned short EJCode_IJG16_Compression   = 0x0104;
 const unsigned short EJCode_IJG16_Decompression = 0x0105;
+const unsigned short EJCode_JP2_Decompression = 0x0106;
 
 /** helper class with static methods used from different dcmjpeg classes
  *  (in particular from the encoder and the decoder part).

dcmjpeg/libsrc/Makefile.in

@@ -25,7 +25,8 @@ LOCALDEFS =
 objs = djutils.o  djencode.o djrplol.o  djrploss.o djcparam.o djeijg8.o djdijg8.o  \
        djcodecd.o djdecbas.o djdecext.o djdecpro.o djdecsps.o djdeclol.o djdecsv1.o \
        djcodece.o djencbas.o djencext.o djencpro.o djencsps.o djenclol.o djencsv1.o \
-       djeijg12.o djdijg12.o djeijg16.o djdijg16.o djdecode.o dipijpeg.o ddpiimpl.o
+       djeijg12.o djdijg12.o djeijg16.o djdijg16.o djdecode.o dipijpeg.o ddpiimpl.o \
+       djdecjp2lol.o djdjp2.o
 library = libdcmjpeg.$(LIBEXT)
 
 

dcmjpeg/libsrc/djcodecd.cc

@@ -131,7 +131,13 @@ OFCondition DJCodecDecoder::decode(
         result = pixItem->getUint8Array(jpegData);
         if (result.good())
         {
-          Uint8 precision = scanJpegDataForBitDepth(jpegData, fragmentLength);
+          Uint8 precision = 0;
+
+	  if (supportedTransferSyntax() == EXS_JPEG2000LosslessOnly) {
+	    precision = imageBitsStored;
+	  } else {
+	    precision = scanJpegDataForBitDepth(jpegData, fragmentLength);
+	  }
           if (precision == 0) result = EC_CannotChangeRepresentation; // something has gone wrong, bail out
           else
           {

dcmjpeg/libsrc/djdecjp2lol.cc

@@ -0,0 +1,43 @@
+/*
+ *
+ *  Module:  dcmjpeg
+ *
+ *  Author:  Henning Meyer
+ *
+ *  Purpose: Codec class for decoding JPEG2000 Lossless
+ *
+ */
+
+#include "dcmtk/config/osconfig.h"
+#include "dcmtk/dcmjpeg/djdecjp2lol.h"
+#include "dcmtk/dcmjpeg/djcparam.h"
+#include "dcmtk/dcmjpeg/djdjp2.h"
+
+#include <iostream>
+using namespace std;
+
+DJDecoderJPEG2000Lossless::DJDecoderJPEG2000Lossless()
+: DJCodecDecoder()
+{
+}
+
+
+DJDecoderJPEG2000Lossless::~DJDecoderJPEG2000Lossless()
+{
+}
+
+
+E_TransferSyntax DJDecoderJPEG2000Lossless::supportedTransferSyntax() const
+{
+  return EXS_JPEG2000LosslessOnly;
+}
+
+
+DJDecoder *DJDecoderJPEG2000Lossless::createDecoderInstance(
+    const DcmRepresentationParameter * /* toRepParam */,
+    const DJCodecParameter *cp,
+    Uint8 bitsPerSample,
+    OFBool isYBR) const
+{
+  return new DJDecompressJPEG2000( *cp, isYBR, bitsPerSample );
+}

dcmjpeg/libsrc/djdecode.cc

@@ -41,6 +41,7 @@
 #include "dcmtk/dcmjpeg/djdecpro.h"
 #include "dcmtk/dcmjpeg/djdecsv1.h"
 #include "dcmtk/dcmjpeg/djdeclol.h"
+#include "dcmtk/dcmjpeg/djdecjp2lol.h"
 #include "dcmtk/dcmjpeg/djcparam.h"
 
 // initialization of static members
@@ -52,6 +53,7 @@ DJDecoderSpectralSelection *DJDecoderRegistration::decsps = NULL;
 DJDecoderProgressive *DJDecoderRegistration::decpro       = NULL;
 DJDecoderP14SV1 *DJDecoderRegistration::decsv1            = NULL;
 DJDecoderLossless *DJDecoderRegistration::declol          = NULL;
+DJDecoderJPEG2000Lossless *DJDecoderRegistration::decjp2lol = NULL;
 
 void DJDecoderRegistration::registerCodecs(
     E_DecompressionColorSpaceConversion pDecompressionCSConversion,
@@ -93,6 +95,10 @@ void DJDecoderRegistration::registerCodecs(
       declol = new DJDecoderLossless();
       if (declol) DcmCodecList::registerCodec(declol, NULL, cp);
 
+      // lossless JPEG2000
+      decjp2lol = new DJDecoderJPEG2000Lossless();
+      if (decjp2lol) DcmCodecList::registerCodec(decjp2lol, NULL, cp);
+
       registered = OFTrue;
     }
   }
@@ -114,6 +120,8 @@ void DJDecoderRegistration::cleanup()
     delete decsv1;
     DcmCodecList::deregisterCodec(declol);
     delete declol;
+    DcmCodecList::deregisterCodec(decjp2lol);
+    delete decjp2lol;
     delete cp;
     registered = OFFalse;
 #ifdef DEBUG