Merge pull request #42 from phmkopp/addConst

Make dummy mesh use const& and fix types in zlib writer

README.md

@@ -2,6 +2,8 @@
 
 _Vtu11_ is a small C++ header-only library to write unstructured grids using the vtu file format. It keeps the mess of dealing with file writing in different formats away from you. Currently it does not add any features for setting up the required data structure because this vastly differs based on the context in which _vtu11_ is used.
 
+You can download a single header version in the latest release.
+
 ## Serial example
 
 ```cpp

vtu11/impl/zlibWriter_impl.hpp

@@ -20,28 +20,36 @@ namespace detail
 template<typename T>
 std::vector<HeaderType> zlibCompressData( const std::vector<T>& data,
                                           std::vector<std::vector<Byte>>& targetBlocks,
-                                          size_t blocksize = 32768 ) // 2^15
+                                          size_t blockSize = 32768 ) // 2^15
 {
+  using IntType = uLong;
+
+  if( data.size( ) > std::numeric_limits<IntType>::max( ) ||
+      blockSize > std::numeric_limits<IntType>::max( ) )
+  {
+      throw std::runtime_error( "Size too large for uLong zlib type." );
+  }
+
   std::vector<HeaderType> header( 3, 0 );
 
   if( data.empty( ) )
   {
     return header;
   }
 
+  auto blocksize = static_cast<IntType>( blockSize );
+
   auto compressedBuffersize = compressBound( blocksize );
 
   Byte* buffer = new Byte[compressedBuffersize];
   Byte* currentByte = const_cast<Byte*>( reinterpret_cast<const Byte*>( &data[0] ) );
+
+  IntType numberOfBytes = static_cast<IntType>( data.size( ) ) * sizeof( T );
+  IntType numberOfBlocks = ( numberOfBytes - 1 ) / blocksize + 1;
 
-  size_t numberOfBytes = data.size( ) * sizeof( T );
-  size_t numberOfBlocks = ( numberOfBytes - 1 ) / blocksize + 1;
-
-  using ZlibSizeType = decltype( compressedBuffersize );
-
-  auto compressBlock = [&]( ZlibSizeType numberOfBytesInBlock )
+  auto compressBlock = [&]( IntType numberOfBytesInBlock )
   {
-    ZlibSizeType compressedLength = compressedBuffersize;
+      IntType compressedLength = compressedBuffersize;
 
     int errorCode = compress( buffer, &compressedLength, currentByte, numberOfBytesInBlock );
 
@@ -58,12 +66,12 @@ std::vector<HeaderType> zlibCompressData( const std::vector<T>& data,
     currentByte += numberOfBytesInBlock;
   };
 
-  for( size_t iBlock = 0; iBlock < numberOfBlocks - 1; ++iBlock )
+  for( IntType iBlock = 0; iBlock < numberOfBlocks - 1; ++iBlock )
   {
-    compressBlock( blocksize );
+    compressBlock( static_cast<IntType>( blocksize ) );
   }
 
-  size_t remainder = numberOfBytes - ( numberOfBlocks - 1 ) * blocksize;
+  IntType remainder = numberOfBytes - ( numberOfBlocks - 1 ) * blocksize;
 
   compressBlock( remainder );
 

vtu11/vtu11.hpp

@@ -18,15 +18,15 @@ namespace vtu11
 
 struct Vtu11UnstructuredMesh
 {
-  std::vector<double>& points_;
-  std::vector<VtkIndexType>& connectivity_;
-  std::vector<VtkIndexType>& offsets_;
-  std::vector<VtkCellType>& types_;
+  const std::vector<double>& points_;
+  const std::vector<VtkIndexType>& connectivity_;
+  const std::vector<VtkIndexType>& offsets_;
+  const std::vector<VtkCellType>& types_;
 
-  std::vector<double>& points( ){ return points_; }
-  std::vector<VtkIndexType>& connectivity( ){ return connectivity_; }
-  std::vector<VtkIndexType>& offsets( ){ return offsets_; }
-  std::vector<VtkCellType>& types( ){ return types_; }
+  const std::vector<double>& points( ){ return points_; }
+  const std::vector<VtkIndexType>& connectivity( ){ return connectivity_; }
+  const std::vector<VtkIndexType>& offsets( ){ return offsets_; }
+  const std::vector<VtkCellType>& types( ){ return types_; }
 
   size_t numberOfPoints( ){ return points_.size( ) / 3; }
   size_t numberOfCells( ){ return types_.size( ); }