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

[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  36df97abaacf81c2c1fe184f2b0aa6f45efa7261 (commit)
       via  8f6d2b61c71f6097096889167fa9dafadf8e6d44 (commit)
      from  43a8b1e2afede697f1369cdba5778a29876d45a0 (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/36df97abaacf81c2c1fe184f2b0aa6f45efa7261/

commit 36df97abaacf81c2c1fe184f2b0aa6f45efa7261
Merge: 43a8b1e 8f6d2b6
Author: Mathieu Malaterre <mat...@gm...>
Date:   Mon Aug 21 16:33:23 2017 +0200

    Merge branch 'release'

diff --cc Source/MediaStorageAndFileFormat/gdcmDictPrinter.cxx
index 270ce84,886ed17..4f224d9
--- a/Source/MediaStorageAndFileFormat/gdcmDictPrinter.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmDictPrinter.cxx
@@@ -80,8 -80,8 +80,8 @@@ VM GuessVMType(DataElement const &de
            {
            assert( bv && "not bv" );
            const char *array = bv->GetPointer();
-           unsigned int c = VM::GetNumberOfElementsFromArray(array, vl);
+           size_t c = VM::GetNumberOfElementsFromArray(array, vl);
 -          vm = VM::GetVMTypeFromLength( (unsigned int)c, 1 );
 +          vm = VM::GetVMTypeFromLength( c, 1 );
            }
          }
        break;

https://sourceforge.net/p/gdcm/gdcm/ci/8f6d2b61c71f6097096889167fa9dafadf8e6d44/

commit 8f6d2b61c71f6097096889167fa9dafadf8e6d44
Author: Mathieu Malaterre <mat...@gm...>
Date:   Mon Aug 21 16:33:12 2017 +0200

    Remove a simple warning

diff --git a/Source/MediaStorageAndFileFormat/gdcmDictPrinter.cxx b/Source/MediaStorageAndFileFormat/gdcmDictPrinter.cxx
index 270ce84..886ed17 100644
--- a/Source/MediaStorageAndFileFormat/gdcmDictPrinter.cxx
+++ b/Source/MediaStorageAndFileFormat/gdcmDictPrinter.cxx
@@ -80,8 +80,8 @@ VM GuessVMType(DataElement const &de)
           {
           assert( bv && "not bv" );
           const char *array = bv->GetPointer();
-          unsigned int c = VM::GetNumberOfElementsFromArray(array, vl);
-          vm = VM::GetVMTypeFromLength( c, 1 );
+          size_t c = VM::GetNumberOfElementsFromArray(array, vl);
+          vm = VM::GetVMTypeFromLength( (unsigned int)c, 1 );
           }
         }
       break;

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

Summary of changes:
 Source/MediaStorageAndFileFormat/gdcmDictPrinter.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Grassroots DICOM