/[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 1713 by persson, Thu Mar 6 20:42:22 2008 UTC revision 2543 by schoenebeck, Sat May 10 02:06:58 2014 UTC
# Line 2  Line 2 
2   *                                                                         *   *                                                                         *
3   *   libgig - C++ cross-platform Gigasampler format file access library    *   *   libgig - C++ cross-platform Gigasampler format file access library    *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003-2007 by Christian Schoenebeck                      *   *   Copyright (C) 2003-2014 by Christian Schoenebeck                      *
6   *                              <cuse@users.sourceforge.net>               *   *                              <cuse@users.sourceforge.net>               *
7   *                                                                         *   *                                                                         *
8   *   This library is free software; you can redistribute it and/or modify  *   *   This library is free software; you can redistribute it and/or modify  *
# Line 22  Line 22 
22   ***************************************************************************/   ***************************************************************************/
23    
24  #include <algorithm>  #include <algorithm>
25    #include <set>
26  #include <string.h>  #include <string.h>
27    
28  #include "RIFF.h"  #include "RIFF.h"
# Line 59  namespace RIFF { Line 60  namespace RIFF {
60          ulPos      = 0;          ulPos      = 0;
61          pParent    = NULL;          pParent    = NULL;
62          pChunkData = NULL;          pChunkData = NULL;
63            CurrentChunkSize = 0;
64            NewChunkSize = 0;
65          ulChunkDataSize = 0;          ulChunkDataSize = 0;
66          ChunkID    = CHUNK_ID_RIFF;          ChunkID    = CHUNK_ID_RIFF;
67          this->pFile = pFile;          this->pFile = pFile;
# Line 73  namespace RIFF { Line 76  namespace RIFF {
76          pParent       = Parent;          pParent       = Parent;
77          ulPos         = 0;          ulPos         = 0;
78          pChunkData    = NULL;          pChunkData    = NULL;
79            CurrentChunkSize = 0;
80            NewChunkSize = 0;
81          ulChunkDataSize = 0;          ulChunkDataSize = 0;
82          ReadHeader(StartPos);          ReadHeader(StartPos);
83      }      }
# Line 83  namespace RIFF { Line 88  namespace RIFF {
88          this->pParent    = pParent;          this->pParent    = pParent;
89          ulPos            = 0;          ulPos            = 0;
90          pChunkData       = NULL;          pChunkData       = NULL;
         ulChunkDataSize  = 0;  
91          ChunkID          = uiChunkID;          ChunkID          = uiChunkID;
92            ulChunkDataSize  = 0;
93          CurrentChunkSize = 0;          CurrentChunkSize = 0;
94          NewChunkSize     = uiBodySize;          NewChunkSize     = uiBodySize;
95      }      }
96    
97      Chunk::~Chunk() {      Chunk::~Chunk() {
98          pFile->UnlogResized(this);          if (pFile) pFile->UnlogResized(this);
99          if (pChunkData) delete[] pChunkData;          if (pChunkData) delete[] pChunkData;
100      }      }
101    
# Line 98  namespace RIFF { Line 103  namespace RIFF {
103          #if DEBUG          #if DEBUG
104          std::cout << "Chunk::Readheader(" << fPos << ") ";          std::cout << "Chunk::Readheader(" << fPos << ") ";
105          #endif // DEBUG          #endif // DEBUG
106            ChunkID = 0;
107            NewChunkSize = CurrentChunkSize = 0;
108          #if POSIX          #if POSIX
109          if (lseek(pFile->hFileRead, fPos, SEEK_SET) != -1) {          if (lseek(pFile->hFileRead, fPos, SEEK_SET) != -1) {
110              read(pFile->hFileRead, &ChunkID, 4);              read(pFile->hFileRead, &ChunkID, 4);
# Line 128  namespace RIFF { Line 135  namespace RIFF {
135              }              }
136              #if DEBUG              #if DEBUG
137              std::cout << "ckID=" << convertToString(ChunkID) << " ";              std::cout << "ckID=" << convertToString(ChunkID) << " ";
138              std::cout << "ckSize=" << ChunkSize << " ";              std::cout << "ckSize=" << CurrentChunkSize << " ";
139              std::cout << "bEndianNative=" << bEndianNative << std::endl;              std::cout << "bEndianNative=" << pFile->bEndianNative << std::endl;
140              #endif // DEBUG              #endif // DEBUG
141              NewChunkSize = CurrentChunkSize;              NewChunkSize = CurrentChunkSize;
142          }          }
# Line 225  namespace RIFF { Line 232  namespace RIFF {
232         #if DEBUG         #if DEBUG
233         std::cout << "Chunk::Remainingbytes()=" << CurrentChunkSize - ulPos << std::endl;         std::cout << "Chunk::Remainingbytes()=" << CurrentChunkSize - ulPos << std::endl;
234         #endif // DEBUG         #endif // DEBUG
235          return CurrentChunkSize - ulPos;          return (CurrentChunkSize > ulPos) ? CurrentChunkSize - ulPos : 0;
236      }      }
237    
238      /**      /**
# Line 274  namespace RIFF { Line 281  namespace RIFF {
281         #if DEBUG         #if DEBUG
282         std::cout << "Chunk::Read(void*,ulong,ulong)" << std::endl;         std::cout << "Chunk::Read(void*,ulong,ulong)" << std::endl;
283         #endif // DEBUG         #endif // DEBUG
284            //if (ulStartPos == 0) return 0; // is only 0 if this is a new chunk, so nothing to read (yet)
285          if (ulPos >= CurrentChunkSize) return 0;          if (ulPos >= CurrentChunkSize) return 0;
286          if (ulPos + WordCount * WordSize >= CurrentChunkSize) WordCount = (CurrentChunkSize - ulPos) / WordSize;          if (ulPos + WordCount * WordSize >= CurrentChunkSize) WordCount = (CurrentChunkSize - ulPos) / WordSize;
287          #if POSIX          #if POSIX
# Line 587  namespace RIFF { Line 595  namespace RIFF {
595      }      }
596    
597      /**      /**
598         * Reads a null-padded string of size characters and copies it
599         * into the string \a s. The position within the chunk will
600         * automatically be incremented.
601         *
602         * @param s                 destination string
603         * @param size              number of characters to read
604         * @throws RIFF::Exception  if an error occured or less than
605         *                          \a size characters could be read!
606         */
607        void Chunk::ReadString(String& s, int size) {
608            char* buf = new char[size];
609            ReadSceptical(buf, 1, size);
610            s.assign(buf, std::find(buf, buf + size, '\0'));
611            delete[] buf;
612        }
613    
614        /**
615       * Writes \a WordCount number of 32 Bit unsigned integer words from the       * Writes \a WordCount number of 32 Bit unsigned integer words from the
616       * buffer pointed by \a pData to the chunk's body, directly to the       * buffer pointed by \a pData to the chunk's body, directly to the
617       * actual "physical" file. The position within the chunk will       * actual "physical" file. The position within the chunk will
# Line 726  namespace RIFF { Line 751  namespace RIFF {
751       * @see ReleaseChunkData()       * @see ReleaseChunkData()
752       */       */
753      void* Chunk::LoadChunkData() {      void* Chunk::LoadChunkData() {
754          if (!pChunkData && pFile->Filename != "") {          if (!pChunkData && pFile->Filename != "" /*&& ulStartPos != 0*/) {
755              #if POSIX              #if POSIX
756              if (lseek(pFile->hFileRead, ulStartPos, SEEK_SET) == -1) return NULL;              if (lseek(pFile->hFileRead, ulStartPos, SEEK_SET) == -1) return NULL;
757              #elif defined(WIN32)              #elif defined(WIN32)
# Line 853  namespace RIFF { Line 878  namespace RIFF {
878              #else              #else
879              int iBytesMoved = 1;              int iBytesMoved = 1;
880              #endif              #endif
881              for (unsigned long ulOffset = 0; iBytesMoved > 0; ulOffset += iBytesMoved, ulToMove -= iBytesMoved) {              for (unsigned long ulOffset = 0; ulToMove > 0 && iBytesMoved > 0; ulOffset += iBytesMoved, ulToMove -= iBytesMoved) {
882                  iBytesMoved = (ulToMove < 4096) ? ulToMove : 4096;                  iBytesMoved = (ulToMove < 4096) ? ulToMove : 4096;
883                  #if POSIX                  #if POSIX
884                  lseek(pFile->hFileRead, ulStartPos + ulCurrentDataOffset + ulOffset, SEEK_SET);                  lseek(pFile->hFileRead, ulStartPos + ulCurrentDataOffset + ulOffset, SEEK_SET);
# Line 943  namespace RIFF { Line 968  namespace RIFF {
968        #if DEBUG        #if DEBUG
969        std::cout << "List::~List()" << std::endl;        std::cout << "List::~List()" << std::endl;
970        #endif // DEBUG        #endif // DEBUG
971            DeleteChunkList();
972        }
973    
974        void List::DeleteChunkList() {
975          if (pSubChunks) {          if (pSubChunks) {
976              ChunkList::iterator iter = pSubChunks->begin();              ChunkList::iterator iter = pSubChunks->begin();
977              ChunkList::iterator end  = pSubChunks->end();              ChunkList::iterator end  = pSubChunks->end();
# Line 951  namespace RIFF { Line 980  namespace RIFF {
980                  iter++;                  iter++;
981              }              }
982              delete pSubChunks;              delete pSubChunks;
983                pSubChunks = NULL;
984            }
985            if (pSubChunksMap) {
986                delete pSubChunksMap;
987                pSubChunksMap = NULL;
988          }          }
         if (pSubChunksMap) delete pSubChunksMap;  
989      }      }
990    
991      /**      /**
# Line 1228  namespace RIFF { Line 1261  namespace RIFF {
1261        std::cout << "List::Readheader(ulong) ";        std::cout << "List::Readheader(ulong) ";
1262        #endif // DEBUG        #endif // DEBUG
1263          Chunk::ReadHeader(fPos);          Chunk::ReadHeader(fPos);
1264            if (CurrentChunkSize < 4) return;
1265          NewChunkSize = CurrentChunkSize -= 4;          NewChunkSize = CurrentChunkSize -= 4;
1266          #if POSIX          #if POSIX
1267          lseek(pFile->hFileRead, fPos + CHUNK_HEADER_SIZE, SEEK_SET);          lseek(pFile->hFileRead, fPos + CHUNK_HEADER_SIZE, SEEK_SET);
# Line 1367  namespace RIFF { Line 1401  namespace RIFF {
1401  // *************** File ***************  // *************** File ***************
1402  // *  // *
1403    
1404    //HACK: to avoid breaking DLL compatibility to older versions of libgig we roll the new std::set<Chunk*> into the old std::list<Chunk*> container, should be replaced on member variable level soon though
1405    #define _GET_RESIZED_CHUNKS() \
1406            (reinterpret_cast<std::set<Chunk*>*>(ResizedChunks.front()))
1407    
1408      /** @brief Create new RIFF file.      /** @brief Create new RIFF file.
1409       *       *
1410       * Use this constructor if you want to create a new RIFF file completely       * Use this constructor if you want to create a new RIFF file completely
# Line 1381  namespace RIFF { Line 1419  namespace RIFF {
1419       * @param FileType - four-byte identifier of the RIFF file type       * @param FileType - four-byte identifier of the RIFF file type
1420       * @see AddSubChunk(), AddSubList(), SetByteOrder()       * @see AddSubChunk(), AddSubList(), SetByteOrder()
1421       */       */
1422      File::File(uint32_t FileType) : List(this) {      File::File(uint32_t FileType)
1423            : List(this), bIsNewFile(true), Layout(layout_standard)
1424        {
1425            //HACK: see _GET_RESIZED_CHUNKS() comment
1426            ResizedChunks.push_back(reinterpret_cast<Chunk*>(new std::set<Chunk*>));
1427          #if defined(WIN32)          #if defined(WIN32)
1428          hFileRead = hFileWrite = INVALID_HANDLE_VALUE;          hFileRead = hFileWrite = INVALID_HANDLE_VALUE;
1429          #else          #else
# Line 1401  namespace RIFF { Line 1443  namespace RIFF {
1443       * @throws RIFF::Exception if error occured while trying to load the       * @throws RIFF::Exception if error occured while trying to load the
1444       *                         given RIFF file       *                         given RIFF file
1445       */       */
1446      File::File(const String& path) : List(this), Filename(path) {      File::File(const String& path)
1447        #if DEBUG          : List(this), Filename(path), bIsNewFile(false), Layout(layout_standard)
1448        std::cout << "File::File("<<path<<")" << std::endl;      {
1449        #endif // DEBUG         #if DEBUG
1450           std::cout << "File::File("<<path<<")" << std::endl;
1451           #endif // DEBUG
1452          bEndianNative = true;          bEndianNative = true;
1453            try {
1454                __openExistingFile(path);
1455                if (ChunkID != CHUNK_ID_RIFF && ChunkID != CHUNK_ID_RIFX) {
1456                    throw RIFF::Exception("Not a RIFF file");
1457                }
1458            }
1459            catch (...) {
1460                Cleanup();
1461                throw;
1462            }
1463        }
1464    
1465        /** @brief Load existing RIFF-like file.
1466         *
1467         * Loads an existing file, which is not a "real" RIFF file, but similar to
1468         * an ordinary RIFF file.
1469         *
1470         * A "real" RIFF file contains at top level a List chunk either with chunk
1471         * ID "RIFF" or "RIFX". The simple constructor above expects this to be
1472         * case, and if it finds the toplevel List chunk to have another chunk ID
1473         * than one of those two expected ones, it would throw an Exception and
1474         * would refuse to load the file accordingly.
1475         *
1476         * Since there are however a lot of file formats which use the same simple
1477         * principles of the RIFF format, with another toplevel List chunk ID
1478         * though, you can use this alternative constructor here to be able to load
1479         * and handle those files in the same way as you would do with "real" RIFF
1480         * files.
1481         *
1482         * @param path - path and file name of the RIFF-alike file to be opened
1483         * @param FileType - expected toplevel List chunk ID (this is the very
1484         *                   first chunk found in the file)
1485         * @param Endian - whether the file uses little endian or big endian layout
1486         * @param layout - general file structure type
1487         * @throws RIFF::Exception if error occured while trying to load the
1488         *                         given RIFF-alike file
1489         */
1490        File::File(const String& path, uint32_t FileType, endian_t Endian, layout_t layout)
1491            : List(this), Filename(path), bIsNewFile(false), Layout(layout)
1492        {
1493            SetByteOrder(Endian);
1494            try {
1495                __openExistingFile(path, &FileType);
1496            }
1497            catch (...) {
1498                Cleanup();
1499                throw;
1500            }
1501        }
1502    
1503        /**
1504         * Opens an already existing RIFF file or RIFF-alike file. This method
1505         * shall only be called once (in a File class constructor).
1506         *
1507         * @param path - path and file name of the RIFF file or RIFF-alike file to
1508         *               be opened
1509         * @param FileType - (optional) expected chunk ID of first chunk in file
1510         * @throws RIFF::Exception if error occured while trying to load the
1511         *                         given RIFF file or RIFF-alike file
1512         */
1513        void File::__openExistingFile(const String& path, uint32_t* FileType) {
1514            //HACK: see _GET_RESIZED_CHUNKS() comment
1515            ResizedChunks.push_back(reinterpret_cast<Chunk*>(new std::set<Chunk*>));
1516          #if POSIX          #if POSIX
1517          hFileRead = hFileWrite = open(path.c_str(), O_RDONLY | O_NONBLOCK);          hFileRead = hFileWrite = open(path.c_str(), O_RDONLY | O_NONBLOCK);
1518          if (hFileRead <= 0) {          if (hFileRead <= 0) {
# Line 1429  namespace RIFF { Line 1536  namespace RIFF {
1536          if (!hFileRead) throw RIFF::Exception("Can't open \"" + path + "\"");          if (!hFileRead) throw RIFF::Exception("Can't open \"" + path + "\"");
1537          #endif // POSIX          #endif // POSIX
1538          Mode = stream_mode_read;          Mode = stream_mode_read;
1539          ulStartPos = RIFF_HEADER_SIZE;          switch (Layout) {
1540          ReadHeader(0);              case layout_standard: // this is a normal RIFF file
1541          if (ChunkID != CHUNK_ID_RIFF) {                  ulStartPos = RIFF_HEADER_SIZE;
1542              throw RIFF::Exception("Not a RIFF file");                  ReadHeader(0);
1543                    if (FileType && ChunkID != *FileType)
1544                        throw RIFF::Exception("Invalid file container ID");
1545                    break;
1546                case layout_flat: // non-standard RIFF-alike file
1547                    ulStartPos = 0;
1548                    NewChunkSize = CurrentChunkSize = GetFileSize();
1549                    if (FileType) {
1550                        uint32_t ckid;
1551                        if (Read(&ckid, 4, 1) != 4) {
1552                            throw RIFF::Exception("Invalid file header ID (premature end of header)");
1553                        } else if (ckid != *FileType) {
1554                            String s = " (expected '" + convertToString(*FileType) + "' but got '" + convertToString(ckid) + "')";
1555                            throw RIFF::Exception("Invalid file header ID" + s);
1556                        }
1557                        SetPos(0); // reset to first byte of file
1558                    }
1559                    LoadSubChunks();
1560                    break;
1561          }          }
1562      }      }
1563    
1564      String File::GetFileName() {      String File::GetFileName() {
1565          return Filename;          return Filename;
1566      }      }
1567        
1568        void File::SetFileName(const String& path) {
1569            Filename = path;
1570        }
1571    
1572      stream_mode_t File::GetMode() {      stream_mode_t File::GetMode() {
1573          return Mode;          return Mode;
1574      }      }
1575    
1576        layout_t File::GetLayout() const {
1577            return Layout;
1578        }
1579    
1580      /** @brief Change file access mode.      /** @brief Change file access mode.
1581       *       *
1582       * Changes files access mode either to read-only mode or to read/write       * Changes files access mode either to read-only mode or to read/write
# Line 1576  namespace RIFF { Line 1709  namespace RIFF {
1709       *                         chunk or any kind of IO error occured       *                         chunk or any kind of IO error occured
1710       */       */
1711      void File::Save() {      void File::Save() {
1712            //TODO: implementation for the case where first chunk is not a global container (List chunk) is not implemented yet (i.e. Korg files)
1713            if (Layout == layout_flat)
1714                throw Exception("Saving a RIFF file with layout_flat is not implemented yet");
1715    
1716          // make sure the RIFF tree is built (from the original file)          // make sure the RIFF tree is built (from the original file)
1717          LoadSubChunksRecursively();          LoadSubChunksRecursively();
1718    
# Line 1591  namespace RIFF { Line 1728  namespace RIFF {
1728    
1729          // 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)
1730          unsigned long ulPositiveSizeDiff = 0;          unsigned long ulPositiveSizeDiff = 0;
1731          for (std::set<Chunk*>::const_iterator iter = ResizedChunks.begin(), end = ResizedChunks.end(); iter != end; ++iter) {          std::set<Chunk*>* resizedChunks = _GET_RESIZED_CHUNKS();
1732            for (std::set<Chunk*>::const_iterator iter = resizedChunks->begin(), end = resizedChunks->end(); iter != end; ++iter) {
1733              if ((*iter)->GetNewSize() == 0) {              if ((*iter)->GetNewSize() == 0) {
1734                  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));
1735              }              }
1736              unsigned long ulDiff = (*iter)->GetNewSize() + (*iter)->GetNewSize() % 2 - (*iter)->GetSize() - (*iter)->GetSize() % 2;              unsigned long newSizePadded = (*iter)->GetNewSize() + (*iter)->GetNewSize() % 2;
1737              if (ulDiff > 0) ulPositiveSizeDiff += ulDiff;              unsigned long oldSizePadded = (*iter)->GetSize() + (*iter)->GetSize() % 2;
1738                if (newSizePadded > oldSizePadded) ulPositiveSizeDiff += newSizePadded - oldSizePadded;
1739          }          }
1740    
1741          unsigned long ulWorkingFileSize = GetFileSize();          unsigned long ulWorkingFileSize = GetFileSize();
# Line 1646  namespace RIFF { Line 1785  namespace RIFF {
1785          if (ulTotalSize < ulActualSize) ResizeFile(ulTotalSize);          if (ulTotalSize < ulActualSize) ResizeFile(ulTotalSize);
1786    
1787          // forget all resized chunks          // forget all resized chunks
1788          ResizedChunks.clear();          resizedChunks->clear();
1789      }      }
1790    
1791      /** @brief Save changes to another file.      /** @brief Save changes to another file.
# Line 1665  namespace RIFF { Line 1804  namespace RIFF {
1804      void File::Save(const String& path) {      void File::Save(const String& path) {
1805          //TODO: we should make a check here if somebody tries to write to the same file and automatically call the other Save() method in that case          //TODO: we should make a check here if somebody tries to write to the same file and automatically call the other Save() method in that case
1806    
1807            //TODO: implementation for the case where first chunk is not a global container (List chunk) is not implemented yet (i.e. Korg files)
1808            if (Layout == layout_flat)
1809                throw Exception("Saving a RIFF file with layout_flat is not implemented yet");
1810    
1811          // make sure the RIFF tree is built (from the original file)          // make sure the RIFF tree is built (from the original file)
1812          LoadSubChunksRecursively();          LoadSubChunksRecursively();
1813    
1814          if (Filename.length() > 0) SetMode(stream_mode_read);          if (!bIsNewFile) SetMode(stream_mode_read);
1815          // open the other (new) file for writing and truncate it to zero size          // open the other (new) file for writing and truncate it to zero size
1816          #if POSIX          #if POSIX
1817          hFileWrite = open(path.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP);          hFileWrite = open(path.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP);
# Line 1703  namespace RIFF { Line 1846  namespace RIFF {
1846          if (ulTotalSize < ulActualSize) ResizeFile(ulTotalSize);          if (ulTotalSize < ulActualSize) ResizeFile(ulTotalSize);
1847    
1848          // forget all resized chunks          // forget all resized chunks
1849          ResizedChunks.clear();          _GET_RESIZED_CHUNKS()->clear();
1850    
1851          #if POSIX          #if POSIX
1852          if (hFileWrite) close(hFileWrite);          if (hFileWrite) close(hFileWrite);
# Line 1716  namespace RIFF { Line 1859  namespace RIFF {
1859    
1860          // associate new file with this File object from now on          // associate new file with this File object from now on
1861          Filename = path;          Filename = path;
1862            bIsNewFile = false;
1863          Mode = (stream_mode_t) -1;       // Just set it to an undefined mode ...          Mode = (stream_mode_t) -1;       // Just set it to an undefined mode ...
1864          SetMode(stream_mode_read_write); // ... so SetMode() has to reopen the file handles.          SetMode(stream_mode_read_write); // ... so SetMode() has to reopen the file handles.
1865      }      }
# Line 1739  namespace RIFF { Line 1883  namespace RIFF {
1883         #if DEBUG         #if DEBUG
1884         std::cout << "File::~File()" << std::endl;         std::cout << "File::~File()" << std::endl;
1885         #endif // DEBUG         #endif // DEBUG
1886            Cleanup();
1887        }
1888        
1889        /**
1890         * Returns @c true if this file has been created new from scratch and
1891         * has not been stored to disk yet.
1892         */
1893        bool File::IsNew() const {
1894            return bIsNewFile;
1895        }
1896    
1897        void File::Cleanup() {
1898          #if POSIX          #if POSIX
1899          if (hFileRead) close(hFileRead);          if (hFileRead) close(hFileRead);
1900          #elif defined(WIN32)          #elif defined(WIN32)
# Line 1746  namespace RIFF { Line 1902  namespace RIFF {
1902          #else          #else
1903          if (hFileRead) fclose(hFileRead);          if (hFileRead) fclose(hFileRead);
1904          #endif // POSIX          #endif // POSIX
1905            DeleteChunkList();
1906            pFile = NULL;
1907            //HACK: see _GET_RESIZED_CHUNKS() comment
1908            delete _GET_RESIZED_CHUNKS();
1909      }      }
1910    
1911      void File::LogAsResized(Chunk* pResizedChunk) {      void File::LogAsResized(Chunk* pResizedChunk) {
1912          ResizedChunks.insert(pResizedChunk);          _GET_RESIZED_CHUNKS()->insert(pResizedChunk);
1913      }      }
1914    
1915      void File::UnlogResized(Chunk* pResizedChunk) {      void File::UnlogResized(Chunk* pResizedChunk) {
1916          ResizedChunks.erase(pResizedChunk);          _GET_RESIZED_CHUNKS()->erase(pResizedChunk);
1917      }      }
1918    
1919      unsigned long File::GetFileSize() {      unsigned long File::GetFileSize() {
Legend:
Removed from v.1713  
changed lines
  Added in v.2543
  ViewVC Help
Powered by ViewVC