/[svn]/libgig/trunk/src/RIFF.cpp
ViewVC logotype

Diff of /libgig/trunk/src/RIFF.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1459 by schoenebeck, Fri Oct 26 10:58:41 2007 UTC revision 1678 by persson, Sun Feb 10 16:07:22 2008 UTC
# Line 89  namespace RIFF { Line 89  namespace RIFF {
89      }      }
90    
91      Chunk::~Chunk() {      Chunk::~Chunk() {
92          if (CurrentChunkSize != NewChunkSize) pFile->UnlogResized(this);          pFile->UnlogResized(this);
93          if (pChunkData) delete[] pChunkData;          if (pChunkData) delete[] pChunkData;
94      }      }
95    
# Line 1152  namespace RIFF { Line 1152  namespace RIFF {
1152          pSubChunks->push_back(pNewChunk);          pSubChunks->push_back(pNewChunk);
1153          (*pSubChunksMap)[uiChunkID] = pNewChunk;          (*pSubChunksMap)[uiChunkID] = pNewChunk;
1154          pNewChunk->Resize(uiBodySize);          pNewChunk->Resize(uiBodySize);
1155            NewChunkSize += CHUNK_HEADER_SIZE;
1156            pFile->LogAsResized(this);
1157          return pNewChunk;          return pNewChunk;
1158      }      }
1159    
# Line 1187  namespace RIFF { Line 1189  namespace RIFF {
1189          List* pNewListChunk = new List(pFile, this, uiListType);          List* pNewListChunk = new List(pFile, this, uiListType);
1190          pSubChunks->push_back(pNewListChunk);          pSubChunks->push_back(pNewListChunk);
1191          (*pSubChunksMap)[CHUNK_ID_LIST] = pNewListChunk;          (*pSubChunksMap)[CHUNK_ID_LIST] = pNewListChunk;
1192            NewChunkSize += LIST_HEADER_SIZE;
1193            pFile->LogAsResized(this);
1194          return pNewListChunk;          return pNewListChunk;
1195      }      }
1196    
# Line 1586  namespace RIFF { Line 1590  namespace RIFF {
1590    
1591          // first we sum up all positive chunk size changes (and skip all negative ones)          // first we sum up all positive chunk size changes (and skip all negative ones)
1592          unsigned long ulPositiveSizeDiff = 0;          unsigned long ulPositiveSizeDiff = 0;
1593          for (ChunkList::iterator iter = ResizedChunks.begin(), end = ResizedChunks.end(); iter != end; ++iter) {          for (std::set<Chunk*>::const_iterator iter = ResizedChunks.begin(), end = ResizedChunks.end(); iter != end; ++iter) {
1594              if ((*iter)->GetNewSize() == 0) {              if ((*iter)->GetNewSize() == 0) {
1595                  throw Exception("There is at least one empty chunk (zero size): " + __resolveChunkPath(*iter));                  throw Exception("There is at least one empty chunk (zero size): " + __resolveChunkPath(*iter));
1596              }              }
1597              if ((*iter)->GetNewSize() + 1L > (*iter)->GetSize()) {              unsigned long ulDiff = (*iter)->GetNewSize() + (*iter)->GetNewSize() % 2 - (*iter)->GetSize() - (*iter)->GetSize() % 2;
1598                  unsigned long ulDiff = (*iter)->GetNewSize() - (*iter)->GetSize() + 1L; // +1 in case we have to add a pad byte              if (ulDiff > 0) ulPositiveSizeDiff += ulDiff;
                 ulPositiveSizeDiff += ulDiff;  
             }  
1599          }          }
1600    
1601          unsigned long ulWorkingFileSize = GetFileSize();          unsigned long ulWorkingFileSize = GetFileSize();
# Line 1611  namespace RIFF { Line 1613  namespace RIFF {
1613              #else              #else
1614              int iBytesMoved = 1;              int iBytesMoved = 1;
1615              #endif              #endif
1616              for (unsigned long ulPos = 0; iBytesMoved > 0; ulPos += iBytesMoved) {              for (unsigned long ulPos = ulFileSize; iBytesMoved > 0; ) {
1617                  const unsigned long ulToMove = ulFileSize - ulPos;                  iBytesMoved = (ulPos < 4096) ? ulPos : 4096;
1618                  iBytesMoved = (ulToMove < 4096) ? ulToMove : 4096;                  ulPos -= iBytesMoved;
1619                  #if POSIX                  #if POSIX
1620                  lseek(hFileRead, ulPos, SEEK_SET);                  lseek(hFileRead, ulPos, SEEK_SET);
1621                  iBytesMoved = read(hFileRead, pCopyBuffer, iBytesMoved);                  iBytesMoved = read(hFileRead, pCopyBuffer, iBytesMoved);
# Line 1746  namespace RIFF { Line 1748  namespace RIFF {
1748      }      }
1749    
1750      void File::LogAsResized(Chunk* pResizedChunk) {      void File::LogAsResized(Chunk* pResizedChunk) {
1751          ResizedChunks.push_back(pResizedChunk);          ResizedChunks.insert(pResizedChunk);
1752      }      }
1753    
1754      void File::UnlogResized(Chunk* pResizedChunk) {      void File::UnlogResized(Chunk* pResizedChunk) {
1755          ResizedChunks.remove(pResizedChunk);          ResizedChunks.erase(pResizedChunk);
1756      }      }
1757    
1758      unsigned long File::GetFileSize() {      unsigned long File::GetFileSize() {
Legend:
Removed from v.1459  
changed lines
  Added in v.1678
  ViewVC Help
Powered by ViewVC