Merge branch 'master' into development

src/apps/ojph_compress/ojph_compress.cpp

@@ -560,7 +560,7 @@ int main(int argc, char * argv[]) {
     "               a codeblock. In unix-like environment, { and } must be\n"
     "               proceeded by a ""\\""\n"
     " -precincts    {x,y},{x,y},...,{x,y} where {x,y} is the precinct size\n"
-    "               starting from the coarest resolution; the last precinct\n"
+    "               starting from the coarsest resolution; the last precinct\n"
     "               is repeated for all finer resolutions\n"
     " -tile_offset  {x,y} tile offset. \n"
     " -tile_size    {x,y} tile width and height. \n"
@@ -900,7 +900,7 @@ int main(int argc, char * argv[]) {
         cod.set_progression_order(prog_order);
         if (employ_color_transform != -1)
           OJPH_ERROR(0x01000086,
-            "color transform is not meaningless since .raw files are single "
+            "color transform is meaningless since .raw files are single "
             "component files");
         cod.set_reversible(reversible);
         if (!reversible && quantization_step != -1.0f)

src/apps/ojph_expand/ojph_expand.cpp

@@ -63,14 +63,14 @@ struct ui32_list_interpreter : public ojph::cli_interpreter::arg_inter_base
     {
       if (num_eles)
       {
-        if (*next_char != ',') //separate sizes by a comma
-          throw "sizes in a sizes list must be separated by a comma";
+        if (*next_char != ',') //separate res by a comma
+          throw "resolutions in a list must be separated by a comma";
         next_char++;
       }
       char *endptr;
       si32list[num_eles] = (ojph::ui32)strtoul(next_char, &endptr, 10);
       if (endptr == next_char)
-        throw "size number is improperly formatted";
+        throw "resolution number is improperly formatted";
       next_char = endptr;
       ++num_eles;
     }
@@ -81,7 +81,7 @@ struct ui32_list_interpreter : public ojph::cli_interpreter::arg_inter_base
         throw "list elements must separated by a "",""";
     }
     else if (*next_char)
-        throw "there are too many elements in the size list";
+        throw "there are too many elements in the resolution list";
   }
 
   const int max_num_eles;
@@ -360,7 +360,7 @@ int main(int argc, char *argv[]) {
   try {
     if (output_filename == NULL)
       OJPH_ERROR(0x020000008,
-                 "Please provide and output file using the -o option\n");
+                 "Please provide an output file using the -o option\n");
 
     ojph::j2c_infile j2c_file;
     j2c_file.open(input_filename);
@@ -406,7 +406,7 @@ int main(int argc, char *argv[]) {
         if (siz.get_num_components() != 1)
           OJPH_ERROR(0x020000001,
             "The file has more than one color component, but .pgm can "
-            "contain only on color component\n");
+            "contain only one color component\n");
         ppm.configure(siz.get_recon_width(0), siz.get_recon_height(0),
                       siz.get_num_components(), siz.get_bit_depth(0));
         ppm.open(output_filename);
@@ -431,7 +431,7 @@ int main(int argc, char *argv[]) {
         if (!all_same)
           OJPH_ERROR(0x020000003,
             "To save an image to ppm, all the components must have the "
-            "downsampling ratio\n");
+            "same downsampling ratio\n");
         ppm.configure(siz.get_recon_width(0), siz.get_recon_height(0),
                       siz.get_num_components(), siz.get_bit_depth(0));
         ppm.open(output_filename);
@@ -453,7 +453,7 @@ int main(int argc, char *argv[]) {
         if (!all_same)
           OJPH_ERROR(0x020000008,
             "To save an image to tif(f), all the components must have the "
-            "downsampling ratio\n");
+            "same downsampling ratio\n");
         ojph::ui32 bit_depths[4] = { 0, 0, 0, 0 };
         for (ojph::ui32 c = 0; c < siz.get_num_components(); c++)
         {

src/apps/others/ojph_img_io.cpp

@@ -276,7 +276,7 @@ namespace ojph {
     {
       close();
       OJPH_ERROR(0x030000005, "wrong file extension, a file with keyword P6 "
-        "must have a .ppm extension fir file %s", filename);
+        "must have a .ppm extension for file %s", filename);
     }
 
     // set number of components based on file-type
@@ -309,7 +309,7 @@ namespace ojph {
           temp_buf = malloc(temp_buf_byte_size);
         if (temp_buf == NULL) { // failed to allocate memory
           if (t) free(t); // the original buffer is still valid
-          OJPH_ERROR(0x030000007, "error allocating mmeory");
+          OJPH_ERROR(0x030000007, "error allocating memory");
         }
       }
       else
@@ -586,7 +586,7 @@ namespace ojph {
     // Error on known incompatilbe input formats
     if( tiff_bits_per_sample != 8 && tiff_bits_per_sample != 16 )
     {
-      OJPH_ERROR(0x0300000B3, "\nTIFF IO is currently limited to file limited"
+      OJPH_ERROR(0x0300000B3, "\nTIFF IO is currently limited"
         " to files with TIFFTAG_BITSPERSAMPLE=8 and TIFFTAG_BITSPERSAMPLE=16 \n"
         "input file = %s has TIFFTAG_BITSPERSAMPLE=%d", 
         filename, tiff_bits_per_sample);

src/core/codestream/ojph_codestream.cpp

@@ -114,6 +114,12 @@ namespace ojph {
     state->request_tlm_marker(needed);
   }
 
+  ////////////////////////////////////////////////////////////////////////////
+  bool codestream::is_tlm_requested()
+  {
+    return state->is_tlm_needed();
+  }
+
   ////////////////////////////////////////////////////////////////////////////
   bool codestream::is_planar() const
   {

src/core/codestream/ojph_params.cpp

@@ -368,7 +368,7 @@ namespace ojph {
   ////////////////////////////////////////////////////////////////////////////
 
   //////////////////////////////////////////////////////////////////////////
-  void comment_exchange::set_string(char* str)
+  void comment_exchange::set_string(const char* str)
   { 
     size_t t = strlen(str);
     if (len > 65531)
@@ -380,7 +380,7 @@ namespace ojph {
   }
 
   //////////////////////////////////////////////////////////////////////////
-  void comment_exchange::set_data(char* data, ui16 len)
+  void comment_exchange::set_data(const char* data, ui16 len)
   { 
     if (len > 65531)
       OJPH_ERROR(0x000500C2, 

src/core/coding/ojph_block_common.cpp

@@ -55,13 +55,13 @@ namespace ojph {
      *  \li \c cwd_len : 3bits -> the codeword length of the VLC codeword;    
      *                   the VLC cwd is in the LSB of bitstream              \n
      *  \li \c u_off   : 1bit  -> u_offset, which is 1 if u value is not 0   \n
-     *  \li \c rho     : 4bits -> signficant samples within a quad           \n
+     *  \li \c rho     : 4bits -> significant samples within a quad          \n
      *  \li \c e_1     : 4bits -> EMB e_1                                    \n
      *  \li \c e_k     : 4bits -> EMB e_k                                    \n
      *                                                                       \n
      *  The table index is 10 bits and composed of two parts:                \n
      *  The 7 LSBs contain a codeword which might be shorter than 7 bits;    
-     *  this word is the next decoable bits in the bitstream.                \n
+     *  this word is the next decodable bits in the bitstream.               \n
      *  The 3 MSB is the context of for the codeword.                        \n
      */
 
@@ -75,7 +75,7 @@ namespace ojph {
     //************************************************************************/
     /** @defgroup uvlc_decoding_tables_grp VLC decoding tables
      *  @{
-     *  UVLC decoding tables used to partiallu decode u values from UVLC     
+     *  UVLC decoding tables used to partially decode u values from UVLC     
      *  codewords.                                                           \n
      *  The table index is 8 (or 9)  bits and composed of two parts:         \n
      *  The 6 LSBs carries the head of the VLC to be decoded. Up to 6 bits to 
@@ -109,7 +109,7 @@ namespace ojph {
 
       //Data in the table is arranged in this format (taken from the standard)
       // c_q is the context for a quad
-      // rho is the signficance pattern for a quad
+      // rho is the significance pattern for a quad
       // u_off indicate if u value is 0 (u_off is 0), or communicated
       // e_k, e_1 EMB patterns
       // cwd VLC codeword
@@ -132,7 +132,7 @@ namespace ojph {
       if (debug) memset(vlc_tbl0, 0, sizeof(vlc_tbl0)); //unnecessary
 
       // this is to convert table entries into values for decoder look up
-      // There can be at most 1024 possibilites, not all of them are valid.
+      // There can be at most 1024 possibilities, not all of them are valid.
       // 
       for (int i = 0; i < 1024; ++i)
       {

src/core/coding/ojph_block_decoder.cpp

@@ -64,7 +64,7 @@ namespace ojph {
       dec_mel_st() : data(NULL), tmp(0), bits(0), size(0), unstuff(false),
         k(0), num_runs(0), runs(0)
       {}
-      // data decoding machinary
+      // data decoding machinery
       ui8* data;    //!<the address of data (or bitstream)
       ui64 tmp;     //!<temporary buffer for read data
       int bits;     //!<number of bits stored in tmp
@@ -505,7 +505,7 @@ namespace ojph {
      *         an architecture that read size must be compatible with the
      *         alignment of the read address
      *
-     *  There is another simiar subroutine rev_init.  This subroutine does 
+     *  There is another similar subroutine rev_init.  This subroutine does 
      *  NOT skip the first 12 bits, and starts with unstuff set to true.
      *
      *  @param [in]  mrp is a pointer to rev_struct structure

src/core/coding/ojph_block_decoder_ssse3.cpp

@@ -66,7 +66,7 @@ namespace ojph {
       dec_mel_st() : data(NULL), tmp(0), bits(0), size(0), unstuff(false),
         k(0), num_runs(0), runs(0)
       {}
-      // data decoding machinary
+      // data decoding machinery
       ui8* data;    //!<the address of data (or bitstream)
       ui64 tmp;     //!<temporary buffer for read data
       int bits;     //!<number of bits stored in tmp
@@ -507,7 +507,7 @@ namespace ojph {
      *         an architecture that read size must be compatible with the
      *         alignment of the read address
      *
-     *  There is another simiar subroutine rev_init.  This subroutine does 
+     *  There is another similar subroutine rev_init.  This subroutine does 
      *  NOT skip the first 12 bits, and starts with unstuff set to true.
      *
      *  @param [in]  mrp is a pointer to rev_struct structure
@@ -596,7 +596,7 @@ namespace ojph {
      *  X controls this value.
      *
      *  Unstuffing prevent sequences that are more than 0xFF7F from appearing
-     *  in the conpressed sequence.  So whenever a value of 0xFF is coded, the
+     *  in the compressed sequence.  So whenever a value of 0xFF is coded, the
      *  MSB of the next byte is set 0 and must be ignored during decoding.
      *
      *  Reading can go beyond the end of buffer by up to 16 bytes.

src/core/coding/ojph_block_decoder_wasm.cpp

@@ -74,7 +74,7 @@ namespace ojph {
       dec_mel_st() : data(NULL), tmp(0), bits(0), size(0), unstuff(false),
         k(0), num_runs(0), runs(0)
       {}
-      // data decoding machinary
+      // data decoding machinery
       ui8* data;    //!<the address of data (or bitstream)
       ui64 tmp;     //!<temporary buffer for read data
       int bits;     //!<number of bits stored in tmp
@@ -515,7 +515,7 @@ namespace ojph {
      *         an architecture that read size must be compatible with the
      *         alignment of the read address
      *
-     *  There is another simiar subroutine rev_init.  This subroutine does 
+     *  There is another similar subroutine rev_init.  This subroutine does 
      *  NOT skip the first 12 bits, and starts with unstuff set to true.
      *
      *  @param [in]  mrp is a pointer to rev_struct structure

src/core/common/ojph_codestream.h

@@ -75,6 +75,7 @@ namespace ojph {
     void set_profile(const char* s);
     void set_tilepart_divisions(bool at_resolutions, bool at_components);
     void request_tlm_marker(bool needed);    
+    bool is_tlm_requested();
 
     void write_headers(outfile_base *file, 
                        const comment_exchange* comments = NULL, 

src/core/common/ojph_params.h

@@ -136,11 +136,11 @@ namespace ojph {
     friend class local::codestream;
   public:
     comment_exchange() : data(NULL), len(0), Rcom(0) {}
-    void set_string(char* str);
-    void set_data(char* data, ui16 len);
+    void set_string(const char* str);
+    void set_data(const char* data, ui16 len);
 
   private:
-    char* data;
+    const char* data;
     ui16 len;
     ui16 Rcom;
   };