Commit 6fd81c84 authored by Tyler Wilson's avatar Tyler Wilson
Browse files

PROG: Added support for new kakadu libraries. References #4809. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/Fedora25@8005 41f8697f-d340-4b68-9986-7bafba869bb8
parent cee9e3c0

isis/src/base/objs/JP2Decoder/JP2Decoder.cpp

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#include "JP2Error.h"



using namespace std;

using namespace kdu_core;

using namespace kdu_supp;

namespace Isis {



  /**

isis/src/base/objs/JP2Decoder/JP2Decoder.h

+7 −5
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ namespace Isis { 
   *  @history 2016-08-28 Kelvin Rodriguez - Moved member variables to be placed properly

   *                        within the if ENABLEJP2K preprocessor block in order to stop

   *                        unused member variable warnings in clang. Part of porting to OS X 10.11.

   *  @history 2017-08-21 Tyler Wilson, Ian Humphrey, Summer Stapleton - Added

   *                       support for new kakadu libraries.  References #4809.

   */

  class JP2Decoder {

    public:
@@ -161,11 +163,11 @@ namespace Isis { 
      bool p_readStripes;             //!<Number of lines read per call to Read methods





      kdu_dims p_imageDims;           //!<Image dimensions of JP2 file

      jp2_family_src *JP2_Stream;     //!<JP2 file input stream

      jp2_source *JP2_Source;         //!<JP2 content source

      kdu_codestream *JPEG2000_Codestream;    //!<Allow access to JP2 file codestream.

      kdu_stripe_decompressor p_decompressor; //!<High level interface to decompression of

      kdu_core::kdu_dims p_imageDims;           //!<Image dimensions of JP2 file

      kdu_supp::jp2_family_src *JP2_Stream;     //!<JP2 file input stream

      kdu_supp::jp2_source *JP2_Source;         //!<JP2 content source

      kdu_core::kdu_codestream *JPEG2000_Codestream;    //!<Allow access to JP2 file codestream.

      kdu_supp::kdu_stripe_decompressor p_decompressor; //!<High level interface to decompression of

      //!<JP2 file.

#endif

      JP2Error *Kakadu_Error;         //!<JP2 Error handling facility

isis/src/base/objs/JP2Encoder/JP2Encoder.cpp

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ 
#include "JP2Error.h"



using namespace std;

using namespace kdu_core;

using namespace kdu_supp;



namespace Isis {



  /**

isis/src/base/objs/JP2Encoder/JP2Encoder.h

+6 −4
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ namespace Isis { 
   *  @history 2009-01-11 Janet Barrett - Original version.

   *  @history 2012-04-06 Kris Becker - Fixed condition compilation where

   *                        support for JP2K is disabled

   *  @history 2017-08-21 Tyler Wilson, Ian Humphrey, Summer Stapleton - Added

   *                        support for new kakadu libraries.  References #4809.

   *

   */

  class JP2Encoder {
@@ -128,10 +130,10 @@ namespace Isis { 
      bool *p_isSigned;                //!<Determines if the data is signed/unsigned for each

      //!<band in the JP2 file



      jp2_family_tgt *JP2_Stream;      //!<JP2 file output stream

      jp2_target *JP2_Boxes;           //!<JP2 boxes for the JP2 file output stream

      kdu_codestream *JPEG2000_Codestream; //!<Allow access to JP2 file codestream

      kdu_stripe_compressor p_compressor;  //!<High level interface to compression of JP2

      kdu_supp::jp2_family_tgt *JP2_Stream;      //!<JP2 file output stream

      kdu_supp::jp2_target *JP2_Boxes;           //!<JP2 boxes for the JP2 file output stream

      kdu_core::kdu_codestream *JPEG2000_Codestream; //!<Allow access to JP2 file codestream

      kdu_supp::kdu_stripe_compressor p_compressor;  //!<High level interface to compression of JP2

      //!<file

#endif

  };

isis/src/base/objs/JP2Error/JP2Error.h

+4 −2
Original line number Diff line number Diff line
@@ -43,11 +43,13 @@ namespace Isis { 
   *

   * @internal

   *  @history 2009-12-18 Janet Barrett - Original version.

   *  @history 2017-08-21 Tyler Wilson, Ian Humphrey, Summer Stapleton - Added

   *                        support for new kakadu libraries.  References #4809.

   *  

   */



#if ENABLEJP2K

  class JP2Error : public kdu_thread_safe_message {

  class JP2Error : public kdu_core::kdu_thread_safe_message {

#else

  class JP2Error {

#endif