[Gdcm-hackers] gdcm-git:Grassroots DICOM branch master updated. eb7b4f9b6a73e7b58084af1c8e2cfd9b1c70806b

[Mathieu M. <ma...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".

The branch, master has been updated
       via  eb7b4f9b6a73e7b58084af1c8e2cfd9b1c70806b (commit)
       via  02b731a214ef76da5c02c815d8f75ef6be79c6c7 (commit)
       via  fb3b249715599c805ca2e0aa5355277dd8c6d2ce (commit)
      from  03648668543685070ba85c1c6c65cc55d1c86804 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/eb7b4f9b6a73e7b58084af1c8e2cfd9b1c70806b/

commit eb7b4f9b6a73e7b58084af1c8e2cfd9b1c70806b
Merge: fb3b249 02b731a
Author: Mathieu Malaterre <mat...@gm...>
Date:   Mon Sep 26 16:09:23 2016 +0200

    Merge branch 'release'
    
    Conflicts:
    	Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx


https://sourceforge.net/p/gdcm/gdcm/ci/fb3b249715599c805ca2e0aa5355277dd8c6d2ce/

commit fb3b249715599c805ca2e0aa5355277dd8c6d2ce
Author: Mathieu Malaterre <mat...@gm...>
Date:   Mon Sep 26 16:00:25 2016 +0200

    remove some warnings

diff --git a/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx b/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx
index 49a8090..338a752 100644
--- a/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmJPEG2000Codec.cxx
@@ -196,8 +196,8 @@ static bool parsejp2_imp( const char * const stream, const size_t file_size, boo
 
   while( read32(&cur, &cur_size, &len32) )
     {
-    bool b = read32(&cur, &cur_size, &marker);
-    if( !b ) break;
+    bool b0 = read32(&cur, &cur_size, &marker);
+    if( !b0 ) break;
     len64 = len32;
     if( len32 == 1 ) /* 64bits ? */
       {
@@ -340,7 +340,8 @@ OPJ_BOOL opj_seek_from_memory (OPJ_OFF_T p_nb_bytes, myfile * p_file)
   //  return false;
   //  }
   //return true;
-  if( p_nb_bytes <= p_file->len )
+  assert( p_nb_bytes >= 0 );
+  if( (size_t)p_nb_bytes <= p_file->len )
     {
     p_file->cur = p_file->mem + p_nb_bytes;
     return OPJ_TRUE;
@@ -669,8 +670,10 @@ std::pair<char *, size_t> JPEG2000Codec::DecodeByStreamsCommon(char *dummy_buffe
   bool bResult;
   bResult = opj_setup_decoder(dinfo, &parameters);
   assert( bResult );
+#if 0
   OPJ_INT32 l_tile_x0,l_tile_y0;
   OPJ_UINT32 l_tile_width,l_tile_height,l_nb_tiles_x,l_nb_tiles_y;
+#endif
   bResult = opj_read_header(
     cio,
     dinfo,
@@ -1272,12 +1275,19 @@ bool JPEG2000Codec::GetHeaderInfo(const char * dummy_buffer, size_t buf_size, Tr
   /* setup the decoder decoding parameters using user parameters */
   opj_setup_decoder(dinfo, &parameters);
   bool bResult;
+#if 0
   OPJ_INT32 l_tile_x0,l_tile_y0;
   OPJ_UINT32 l_tile_width,l_tile_height,l_nb_tiles_x,l_nb_tiles_y;
+#endif
   bResult = opj_read_header(
     cio,
     dinfo,
     &image);
+  if(!bResult)
+  {
+  opj_stream_destroy(cio);
+    return false;
+  }
   //image = opj_decode(dinfo, cio);
   //bResult = bResult && (image != 00);
   //bResult = bResult && opj_end_decompress(dinfo,cio);
@@ -1290,7 +1300,7 @@ bool JPEG2000Codec::GetHeaderInfo(const char * dummy_buffer, size_t buf_size, Tr
   //  }
 
   int reversible;
-  int mct;
+  int mct = 0;
 #if 0
   reversible = opj_get_reversible(dinfo, &parameters );
   assert( reversible == 0 || reversible == 1 );

-----------------------------------------------------------------------

Summary of changes:
 .../gdcmJPEG2000Codec.cxx                          |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Grassroots DICOM