Allow creating BlockData with no backing storage.

wolfpld · Mar 5, 2014 · 84ad2e4 · 84ad2e4
1 parent 1bc0e1f
commit 84ad2e4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/BlockData.cpp b/BlockData.cpp
@@ -98,11 +98,29 @@ BlockData::BlockData( const char* fn, const v2i& size )
     m_data = OpenForWriting( fn, m_maplen, m_size, &m_file );
 }
 
+BlockData::BlockData( const v2i& size )
+    : m_size( size )
+    , m_done( false )
+    , m_dataOffset( 52 )
+    , m_file( nullptr )
+    , m_maplen( 52 + m_size.x*m_size.y/2 )
+{
+    assert( m_size.x%4 == 0 && m_size.y%4 == 0 );
+    m_data = new uint8[m_maplen];
+}
+
 BlockData::~BlockData()
 {
     if( !m_done ) Finish();
-    munmap( m_data, m_maplen );
-    fclose( m_file );
+    if( m_file )
+    {
+        munmap( m_data, m_maplen );
+        fclose( m_file );
+    }
+    else
+    {
+        delete[] m_data;
+    }
 }
 
 void BlockData::Process( const uint8* src, uint32 blocks, size_t offset, uint quality, Channels type )

diff --git a/BlockData.hpp b/BlockData.hpp
@@ -18,6 +18,7 @@ class BlockData
     BlockData( const char* fn );
     BlockData( const char* fn, const BlockBitmapPtr& bitmap, uint quality );
     BlockData( const char* fn, const v2i& size );
+    BlockData( const v2i& size );
     ~BlockData();
 
     BitmapPtr Decode();