[aaf-commits] AAF/ref-impl/src/OM OMKLVStoredObject.cpp, 1.234, 1.235

[Alexey K. <akh...@us...>]

Update of /cvsroot/aaf/AAF/ref-impl/src/OM
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv26189/src/OM

Modified Files:
	OMKLVStoredObject.cpp 
Log Message:
On restore do not require Object Directory to be present in the file.

Index: OMKLVStoredObject.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/OM/OMKLVStoredObject.cpp,v
retrieving revision 1.234
retrieving revision 1.235
diff -C2 -d -r1.234 -r1.235
*** OMKLVStoredObject.cpp	27 Jul 2007 21:19:04 -0000	1.234
--- OMKLVStoredObject.cpp	14 Dec 2007 16:45:48 -0000	1.235
***************
*** 826,830 ****
      // restore the meta object directory
      //
!     _storage->restoreObjectDirectory(headerPosition);
      _storage->readKLVKey(k);
      convert(cid, k);
--- 826,832 ----
      // restore the meta object directory
      //
!     if (_storage->objectDirectoryOffset() != 0) {
!       _storage->restoreObjectDirectory(headerPosition);
!     }
      _storage->readKLVKey(k);
      convert(cid, k);