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

[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  ad2baf56c66a8dd073c03c5ea7b849bcc2f3efd3 (commit)
       via  bec8d6d6616ed48934f441e5c5831fb88b341610 (commit)
       via  1d083238d8e6feef3f599d4e63659807e666126e (commit)
       via  76680d884d2f0b79235b8db2600e546c26a6aad2 (commit)
       via  fb34bb7ff3480bd370719a94bb3e411187a40c0a (commit)
       via  f267c4d8b3aaac89ffc115b5afd580780cb91265 (commit)
       via  479898ae4d8f8412ae69b73c4550a9d581ae10d2 (commit)
       via  c7c5c6e94ad8955811c3e137d0f9eca200715d14 (commit)
       via  35923ded559fea8a2129d5976dbd1ed31a6dd402 (commit)
       via  9837fde38e6472e3fd2b8ebca11211b9dd1f55bf (commit)
       via  7d7fb586bd6f5e50b07c6f388aa20473e7f18e6c (commit)
      from  266053aecda0ee1cf658eb27a79cb7c29898fbd9 (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/ad2baf56c66a8dd073c03c5ea7b849bcc2f3efd3/

commit ad2baf56c66a8dd073c03c5ea7b849bcc2f3efd3
Merge: 266053a bec8d6d
Author: Mathieu Malaterre <mat...@vo...>
Date:   Fri Jun 13 17:46:57 2014 +0200

    Merge branch 'release'
    
    Conflicts:
    	Source/DataStructureAndEncodingDefinition/gdcmSequenceOfItems.cxx

diff --cc Source/DataStructureAndEncodingDefinition/gdcmSequenceOfItems.cxx
index 7e80697,4b3da17..ca62064
--- a/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfItems.cxx
+++ b/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfItems.cxx
@@@ -25,14 -25,22 +25,30 @@@ void SequenceOfItems::AddItem(Item cons
      }
  }
  
 +Item & SequenceOfItems::AddNewUndefinedLengthItem()
 +{
 +	gdcm::Item itemToAdd ;
 +	itemToAdd.SetVLToUndefined();
 +	this->AddItem( itemToAdd );
 +	return GetItem( this->GetNumberOfItems() );
 +}
 +
+ void SequenceOfItems::Clear()
+ {
+   Items.clear();
+   assert( SequenceLengthField.IsUndefined() );
+ }
+ 
+ bool SequenceOfItems::RemoveItemByIndex( const SizeType position )
+ {
+   if( position < 1 || position > Items.size() )
+     {
+     return false;
+     }
+   Items.erase (Items.begin() + position);
+   return true;
+ }
+ 
  Item &SequenceOfItems::GetItem(SizeType position)
  {
    if( position < 1 || position > Items.size() )
diff --cc Source/DataStructureAndEncodingDefinition/gdcmSequenceOfItems.h
index 452ebca,d5176a2..42d52a8
--- a/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfItems.h
+++ b/Source/DataStructureAndEncodingDefinition/gdcmSequenceOfItems.h
@@@ -72,10 -74,11 +74,14 @@@ public
  
    /// \brief Appends an Item to the already added ones
    void AddItem(Item const &item);
 +    
 +  /// \brief Appends an Item to the already added ones
 +  Item & AddNewUndefinedLengthItem();
  
+   /// Remove an Item as specified by its index, if index > size, false is returned
+   /// Index starts at 1 not 0
+   bool RemoveItemByIndex( const SizeType index );
+ 
    SizeType GetNumberOfItems() const {  return Items.size(); }
    void SetNumberOfItems(SizeType n) {  Items.resize(n); }
  

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

Summary of changes:
 CMake/UseCSharp.cmake                              |    2 +-
 Source/Common/CMakeLists.txt                       |    9 ++-
 Source/Common/gdcmSwapper.txx                      |   69 ++++++++++----------
 Source/Common/gdcmSystem.h                         |    2 +
 .../gdcmSequenceOfItems.cxx                        |   16 +++++
 .../gdcmSequenceOfItems.h                          |    8 ++-
 .../gdcmImageChangeTransferSyntax.cxx              |    2 +-
 .../MediaStorageAndFileFormat/gdcmImageHelper.cxx  |    9 ++-
 Testing/Source/Common/Cxx/TestSystem3.cxx          |    4 +-
 Utilities/VTK/vtkGDCMImageReader.cxx               |    2 +-
 Utilities/VTK/vtkGDCMImageReader2.cxx              |    2 +-
 Utilities/VTK/vtkGDCMImageWriter.cxx               |    8 +-
 Utilities/VTK/vtkGDCMPolyDataReader.cxx            |    4 +-
 Utilities/VTK/vtkGDCMPolyDataWriter.cxx            |    6 +-
 Utilities/doxygen/man/gdcm2pnm.man                 |    2 +-
 15 files changed, 89 insertions(+), 56 deletions(-)


hooks/post-receive
-- 
Grassroots DICOM