[aaf-commits] AAF/ref-impl/src/impl aafErr.cpp, 1.20, 1.21 aafTable.cpp, 1.22, 1.23 ImplAAFAIFCDesc

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	aafErr.cpp aafTable.cpp ImplAAFAIFCDescriptor.cpp 
	ImplAAFBWFImportDescriptor.cpp ImplAAFComponent.cpp 
	ImplAAFContentStorage.cpp ImplAAFDictionary.cpp 
	ImplAAFDigitalImageDescrip.cpp ImplAAFEssenceDescriptor.cpp 
	ImplAAFEssenceGroup.cpp ImplAAFHeader.cpp ImplAAFMob.cpp 
	ImplAAFModule.cpp ImplAAFMultipleDescriptor.cpp 
	ImplAAFNestedScope.cpp ImplAAFObject.cpp 
	ImplAAFOperationGroup.cpp ImplAAFPluginDef.cpp 
	ImplAAFPluginFile.cpp ImplAAFPluginManager.cpp 
	ImplAAFRGBADescriptor.cpp ImplAAFSelector.cpp 
	ImplAAFSequence.cpp ImplAAFSourceReference.cpp 
	ImplAAFTaggedValueUtil.cpp ImplAAFTIFFDescriptor.cpp 
	ImplAAFTypeDef.cpp ImplAAFTypeDef.h 
	ImplAAFTypeDefCharacter.cpp ImplAAFTypeDefCharacter.h 
	ImplAAFTypeDefEnum.cpp ImplAAFTypeDefEnum.h 
	ImplAAFTypeDefExtEnum.cpp ImplAAFTypeDefExtEnum.h 
	ImplAAFTypeDefFixedArray.cpp ImplAAFTypeDefFixedArray.h 
	ImplAAFTypeDefIndirect.cpp ImplAAFTypeDefIndirect.h 
	ImplAAFTypeDefInt.cpp ImplAAFTypeDefInt.h 
	ImplAAFTypeDefObjectRef.cpp ImplAAFTypeDefObjectRef.h 
	ImplAAFTypeDefRecord.cpp ImplAAFTypeDefRecord.h 
	ImplAAFTypeDefRename.cpp ImplAAFTypeDefRename.h 
	ImplAAFTypeDefsGen.h ImplAAFTypeDefStream.cpp 
	ImplAAFTypeDefStream.h ImplAAFTypeDefString.cpp 
	ImplAAFTypeDefString.h ImplAAFTypeDefStrongObjRef.cpp 
	ImplAAFTypeDefStrongObjRef.h ImplAAFTypeDefVariableArray.h 
	ImplAAFTypeDefVariableArry.cpp ImplAAFTypeDefWeakObjRef.cpp 
	ImplAAFTypeDefWeakObjRef.h ImplAAFVaryingValue.cpp 
	ImplAAFWAVEDescriptor.cpp 
Log Message:
Port to 64-bit Windows.

Index: ImplAAFTypeDefCharacter.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFTypeDefCharacter.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ImplAAFTypeDefCharacter.cpp	27 Feb 2004 14:26:49 -0000	1.13
--- ImplAAFTypeDefCharacter.cpp	15 Jun 2006 19:52:52 -0000	1.14
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 226,230 ****

  void ImplAAFTypeDefCharacter::reorder(OMByte* externalBytes,
!                              size_t ANAME(externalBytesSize)) const
  {
    TRACE("ImplAAFTypeDefCharacter::reorder");
--- 226,230 ----

  void ImplAAFTypeDefCharacter::reorder(OMByte* externalBytes,
!                              OMUInt32 ANAME(externalBytesSize)) const
  {
    TRACE("ImplAAFTypeDefCharacter::reorder");
***************
*** 235,240 ****
  }

! size_t ImplAAFTypeDefCharacter::externalSize(const OMByte* ANAME(internalBytes),
!                                     size_t ANAME(internalBytesSize)) const
  {
    TRACE("ImplAAFTypeDefCharacter::externalSize");
--- 235,240 ----
  }

! OMUInt32 ImplAAFTypeDefCharacter::externalSize(const OMByte* ANAME(internalBytes),
!                                     OMUInt32 ANAME(internalBytesSize)) const
  {
    TRACE("ImplAAFTypeDefCharacter::externalSize");
***************
*** 247,253 ****

  void ImplAAFTypeDefCharacter::externalize(const OMByte* internalBytes,
!                                  size_t ANAME(internalBytesSize),
                                   OMByte* externalBytes,
!                                  size_t externalBytesSize,
                                   OMByteOrder byteOrder) const
  {
--- 247,253 ----

  void ImplAAFTypeDefCharacter::externalize(const OMByte* internalBytes,
!                                  OMUInt32 ANAME(internalBytesSize),
                                   OMByte* externalBytes,
!                                  OMUInt32 externalBytesSize,
                                   OMByteOrder byteOrder) const
  {
***************
*** 266,271 ****
  }

! size_t ImplAAFTypeDefCharacter::internalSize(const OMByte* ANAME(externalBytes),
!                                     size_t ANAME(externalBytesSize)) const
  {
    TRACE("ImplAAFTypeDefCharacter::internalSize");
--- 266,271 ----
  }

! OMUInt32 ImplAAFTypeDefCharacter::internalSize(const OMByte* ANAME(externalBytes),
!                                     OMUInt32 ANAME(externalBytesSize)) const
  {
    TRACE("ImplAAFTypeDefCharacter::internalSize");
***************
*** 278,284 ****

  void ImplAAFTypeDefCharacter::internalize(const OMByte* externalBytes,
!                                  size_t ANAME(externalBytesSize),
                                   OMByte* internalBytes,
!                                  size_t internalBytesSize,
                                   OMByteOrder byteOrder) const
  {
--- 278,284 ----

  void ImplAAFTypeDefCharacter::internalize(const OMByte* externalBytes,
!                                  OMUInt32 ANAME(externalBytesSize),
                                   OMByte* internalBytes,
!                                  OMUInt32 internalBytesSize,
                                   OMByteOrder byteOrder) const
  {
***************
*** 316,320 ****

! size_t ImplAAFTypeDefCharacter::PropValSize (void) const
  {
    return kExternalCharacterSize; // We only support 2 byte unicode characters.
--- 316,320 ----

! OMUInt32 ImplAAFTypeDefCharacter::PropValSize (void) const
  {
    return kExternalCharacterSize; // We only support 2 byte unicode characters.
***************
*** 329,333 ****

! size_t ImplAAFTypeDefCharacter::NativeSize (void) const
  {
    TRACE("ImplAAFTypeDefCharacter::NativeSize");
--- 329,333 ----

! OMUInt32 ImplAAFTypeDefCharacter::NativeSize (void) const
  {
    TRACE("ImplAAFTypeDefCharacter::NativeSize");

Index: ImplAAFTypeDefInt.h
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFTypeDefInt.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ImplAAFTypeDefInt.h	24 May 2006 18:01:53 -0000	1.21
--- ImplAAFTypeDefInt.h	15 Jun 2006 19:53:15 -0000	1.22
***************
*** 149,170 ****

    virtual void reorder(OMByte* bytes,
!                        size_t bytesSize) const;

!   virtual size_t externalSize(const OMByte* internalBytes,
!                               size_t internalBytesSize) const;

    virtual void externalize(const OMByte* internalBytes,
!                            size_t internalBytesSize,
                             OMByte* externalBytes,
!                            size_t externalBytesSize,
                             OMByteOrder byteOrder) const;

!   virtual size_t internalSize(const OMByte* externalBytes,
!                               size_t externalSize) const;

    virtual void internalize(const OMByte* externalBytes,
!                            size_t externalBytesSize,
                             OMByte* internalBytes,
!                            size_t internalBytesSize,
                             OMByteOrder byteOrder) const;

--- 149,170 ----

    virtual void reorder(OMByte* bytes,
!                        OMUInt32 bytesSize) const;

!   virtual OMUInt32 externalSize(const OMByte* internalBytes,
!                                 OMUInt32 internalBytesSize) const;

    virtual void externalize(const OMByte* internalBytes,
!                            OMUInt32 internalBytesSize,
                             OMByte* externalBytes,
!                            OMUInt32 externalBytesSize,
                             OMByteOrder byteOrder) const;

!   virtual OMUInt32 internalSize(const OMByte* externalBytes,
!                                 OMUInt32 externalSize) const;

    virtual void internalize(const OMByte* externalBytes,
!                            OMUInt32 externalBytesSize,
                             OMByte* internalBytes,
!                            OMUInt32 internalBytesSize,
                             OMByteOrder byteOrder) const;

***************
*** 175,181 ****
    //
    aafBool IsFixedSize (void) const;
!   size_t PropValSize (void) const;
    aafBool IsRegistered (void) const;
!   size_t NativeSize (void) const;

    virtual OMProperty * 
--- 175,181 ----
    //
    aafBool IsFixedSize (void) const;
!   OMUInt32 PropValSize (void) const;
    aafBool IsRegistered (void) const;
!   OMUInt32 NativeSize (void) const;

    virtual OMProperty * 

Index: ImplAAFTypeDefWeakObjRef.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFTypeDefWeakObjRef.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** ImplAAFTypeDefWeakObjRef.cpp	24 May 2006 18:01:54 -0000	1.41
--- ImplAAFTypeDefWeakObjRef.cpp	15 Jun 2006 19:53:17 -0000	1.42
***************
*** 708,714 ****

! size_t ImplAAFTypeDefWeakObjRef::PropValSize (void) const
  {
!   return sizeof (ImplAAFStorable*);
  }

--- 708,716 ----

! OMUInt32 ImplAAFTypeDefWeakObjRef::PropValSize (void) const
  {
!   size_t sz = sizeof (ImplAAFStorable*);
!   ASSERTU(sz <= OMUINT32_MAX);
!   return static_cast<OMUInt32>(sz);
  }

***************
*** 720,726 ****

! size_t ImplAAFTypeDefWeakObjRef::NativeSize (void) const
  {
!   return sizeof (ImplAAFStorable*);
  }

--- 722,730 ----

! OMUInt32 ImplAAFTypeDefWeakObjRef::NativeSize (void) const
  {
!   size_t sz = sizeof (ImplAAFStorable*);
!   ASSERTU(sz <= OMUINT32_MAX);
!   return static_cast<OMUInt32>(sz);
  }

***************
*** 734,738 ****
  #if defined(USE_SIMPLEPROPERTY)

!   size_t elemSize = PropValSize ();
    OMProperty * result = new OMSimpleProperty (pid, name, elemSize);

--- 738,742 ----
  #if defined(USE_SIMPLEPROPERTY)

!   OMUInt32 elemSize = PropValSize ();
    OMProperty * result = new OMSimpleProperty (pid, name, elemSize);

Index: ImplAAFTypeDefInt.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFTypeDefInt.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** ImplAAFTypeDefInt.cpp	24 May 2006 18:01:53 -0000	1.36
--- ImplAAFTypeDefInt.cpp	15 Jun 2006 19:53:15 -0000	1.37
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 527,531 ****

  void ImplAAFTypeDefInt::reorder(OMByte* bytes,
! 								size_t bytesSize) const

  {
--- 527,531 ----

  void ImplAAFTypeDefInt::reorder(OMByte* bytes,
! 								OMUInt32 bytesSize) const

  {
***************
*** 538,543 ****

! size_t ImplAAFTypeDefInt::externalSize(const OMByte* /*internalBytes*/,
! 									   size_t /*internalBytesSize*/) const
  {
    ASSERTU (IsFixedSize());
--- 538,543 ----

! OMUInt32 ImplAAFTypeDefInt::externalSize(const OMByte* /*internalBytes*/,
! 									   OMUInt32 /*internalBytesSize*/) const
  {
    ASSERTU (IsFixedSize());
***************
*** 547,553 ****

  void ImplAAFTypeDefInt::externalize(const OMByte* internalBytes,
! 									size_t internalBytesSize,
  									OMByte* externalBytes,
! 									size_t externalBytesSize,
  									OMByteOrder byteOrder) const
  {
--- 547,553 ----

  void ImplAAFTypeDefInt::externalize(const OMByte* internalBytes,
! 									OMUInt32 internalBytesSize,
  									OMByte* externalBytes,
! 									OMUInt32 externalBytesSize,
  									OMByteOrder byteOrder) const
  {
***************
*** 555,559 ****
    ASSERTU (externalBytes);
    // ASSERTU (internalBytesSize == externalBytesSize);
!   const size_t thisPropValSize = PropValSize ();
    ASSERTU (externalBytesSize == thisPropValSize);

--- 555,559 ----
    ASSERTU (externalBytes);
    // ASSERTU (internalBytesSize == externalBytesSize);
!   const OMUInt32 thisPropValSize = PropValSize ();
    ASSERTU (externalBytesSize == thisPropValSize);

***************
*** 588,593 ****

! size_t ImplAAFTypeDefInt::internalSize(const OMByte* /*externalBytes*/,
! 									   size_t /*externalSize*/) const
  {
    return NativeSize ();
--- 588,593 ----

! OMUInt32 ImplAAFTypeDefInt::internalSize(const OMByte* /*externalBytes*/,
! 									   OMUInt32 /*externalSize*/) const
  {
    return NativeSize ();
***************
*** 596,602 ****

  void ImplAAFTypeDefInt::internalize(const OMByte* externalBytes,
! 									size_t externalBytesSize,
  									OMByte* internalBytes,
! 									size_t internalBytesSize,
  									OMByteOrder byteOrder) const
  {
--- 596,602 ----

  void ImplAAFTypeDefInt::internalize(const OMByte* externalBytes,
! 									OMUInt32 externalBytesSize,
  									OMByte* internalBytes,
! 									OMUInt32 internalBytesSize,
  									OMByteOrder byteOrder) const
  {
***************
*** 604,608 ****
    ASSERTU (internalBytes);
    // ASSERTU (internalBytesSize == externalBytesSize);
!   // const size_t thisNativeSize = NativeSize ();
    // ASSERTU (internalBytesSize == thisNativeSize);

--- 604,608 ----
    ASSERTU (internalBytes);
    // ASSERTU (internalBytesSize == externalBytesSize);
!   // const OMUInt32 thisNativeSize = NativeSize ();
    // ASSERTU (internalBytesSize == thisNativeSize);

***************
*** 643,647 ****

! size_t ImplAAFTypeDefInt::PropValSize (void) const
  {
    return _size;
--- 643,647 ----

! OMUInt32 ImplAAFTypeDefInt::PropValSize (void) const
  {
    return _size;
***************
*** 656,660 ****

! size_t ImplAAFTypeDefInt::NativeSize (void) const
  {
    // same as property value size
--- 656,660 ----

! OMUInt32 ImplAAFTypeDefInt::NativeSize (void) const
  {
    // same as property value size
***************
*** 668,672 ****
  {
    ASSERTU (name);
!   size_t elemSize = PropValSize ();
    OMProperty * result = new OMSimpleProperty (pid, name, elemSize);
    ASSERTU (result);
--- 668,674 ----
  {
    ASSERTU (name);
!   OMUInt32 es = PropValSize ();
!   ASSERTU(es <= OMPROPERTYSIZE_MAX);
!   OMPropertySize elemSize = static_cast<OMPropertySize>(es);
    OMProperty * result = new OMSimpleProperty (pid, name, elemSize);
    ASSERTU (result);

Index: ImplAAFHeader.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFHeader.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** ImplAAFHeader.cpp	24 May 2006 18:01:51 -0000	1.96
--- ImplAAFHeader.cpp	15 Jun 2006 19:52:50 -0000	1.97
***************
*** 15,19 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 15,19 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 128,133 ****
  	// Release all of the id pointers in the id list.
  	//
! 	size_t count = _identificationList.count();
! 	for (size_t i = 0; i < count; i++) {
  		ImplAAFIdentification *pIdent = _identificationList.clearValueAt(i);

--- 128,133 ----
  	// Release all of the id pointers in the id list.
  	//
! 	aafUInt32 count = _identificationList.count();
! 	for (aafUInt32 i = 0; i < count; i++) {
  		ImplAAFIdentification *pIdent = _identificationList.clearValueAt(i);

***************
*** 443,447 ****

    AAFRESULT result;
!   size_t count = _identificationList.count();

    if (count > 0) {
--- 443,447 ----

    AAFRESULT result;
!   aafUInt32 count = _identificationList.count();

    if (count > 0) {
***************
*** 508,512 ****
  	}

!  	size_t	count = _identificationList.count();
  	*pNumIdents = count;
  	return AAFRESULT_SUCCESS;
--- 508,512 ----
  	}

!  	aafUInt32 count = _identificationList.count();
  	*pNumIdents = count;
  	return AAFRESULT_SUCCESS;

Index: aafErr.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/aafErr.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** aafErr.cpp	12 Jun 2006 19:20:23 -0000	1.20
--- aafErr.cpp	15 Jun 2006 19:52:48 -0000	1.21
***************
*** 75,88 ****
  }

! size_t length(size_t index)
  {
!   size_t result;
    if (wcscmp(errorTable[index]._desc, L"") == 0) {
!     result  = (wcslen(errorTable[index]._name) + 1) * sizeof(wchar_t);
    } else {
!     result  = (wcslen(errorTable[index]._name) +
!                wcslen(errorTable[index]._desc) + 
!                wcslen(L" - ") + 1) * sizeof(wchar_t);
    }
    return result;
  }
--- 75,89 ----
  }

! OMUInt32 length(size_t index)
  {
!   size_t len;
    if (wcscmp(errorTable[index]._desc, L"") == 0) {
!     len = (wcslen(errorTable[index]._name) + 1) * sizeof(wchar_t);
    } else {
!     len = (wcslen(errorTable[index]._name) +
!            wcslen(errorTable[index]._desc) + 
!            wcslen(L" - ") + 1) * sizeof(wchar_t);
    }
+   OMUInt32 result  = static_cast<OMUInt32>(len);
    return result;
  }

Index: ImplAAFVaryingValue.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFVaryingValue.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** ImplAAFVaryingValue.cpp	24 May 2006 18:01:54 -0000	1.39
--- ImplAAFVaryingValue.cpp	15 Jun 2006 19:53:17 -0000	1.40
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 63,68 ****
  {
  	// Release all of the locator pointers.
! 	size_t count = _controlPoints.count();
! 	for (size_t i = 0; i < count; i++)
  	{
  		ImplAAFControlPoint *pControl = _controlPoints.clearValueAt(i);
--- 63,68 ----
  {
  	// Release all of the locator pointers.
! 	OMUInt32 count = _controlPoints.count();
! 	for (OMUInt32 i = 0; i < count; i++)
  	{
  		ImplAAFControlPoint *pControl = _controlPoints.clearValueAt(i);

Index: ImplAAFModule.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFModule.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** ImplAAFModule.cpp	8 Jun 2006 20:31:36 -0000	1.41
--- ImplAAFModule.cpp	15 Jun 2006 19:52:51 -0000	1.42
***************
*** 1480,1488 ****
  // The size of a buffer, in bytes, needed to hold s when properly
  // terminated and converted to aafCharacters.
! static size_t bufferByteSize(const char* s)
  {
    ASSERTU(s != 0);
!   size_t result = strlen(s) + 1; // characters needed
!   result = result * sizeof(aafCharacter); // bytes needed
    return result;
  }
--- 1480,1489 ----
  // The size of a buffer, in bytes, needed to hold s when properly
  // terminated and converted to aafCharacters.
! static aafUInt32 bufferByteSize(const char* s)
  {
    ASSERTU(s != 0);
!   size_t cc = strlen(s) + 1; // characters needed
!   aafUInt32 characterCount = static_cast<aafUInt32>(cc);
!   aafUInt32 result = characterCount * sizeof(aafCharacter); // bytes needed
    return result;
  }

Index: ImplAAFTypeDefStrongObjRef.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFTypeDefStrongObjRef.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** ImplAAFTypeDefStrongObjRef.cpp	24 May 2006 18:01:54 -0000	1.41
--- ImplAAFTypeDefStrongObjRef.cpp	15 Jun 2006 19:53:16 -0000	1.42
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 409,415 ****

! size_t ImplAAFTypeDefStrongObjRef::PropValSize (void) const
  {
!   return sizeof (ImplAAFObject*);
  }

--- 409,417 ----

! OMUInt32 ImplAAFTypeDefStrongObjRef::PropValSize (void) const
  {
!   size_t sz = sizeof (ImplAAFObject*);
!   ASSERTU(sz <= OMUINT32_MAX);
!   return static_cast<OMUInt32>(sz);
  }

***************
*** 421,427 ****

! size_t ImplAAFTypeDefStrongObjRef::NativeSize (void) const
  {
!   return sizeof (ImplAAFObject*);
  }

--- 423,431 ----

! OMUInt32 ImplAAFTypeDefStrongObjRef::NativeSize (void) const
  {
!   size_t sz = sizeof (ImplAAFObject*);
!   ASSERTU(sz <= OMUINT32_MAX);
!   return static_cast<OMUInt32>(sz);
  }

Index: ImplAAFAIFCDescriptor.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFAIFCDescriptor.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ImplAAFAIFCDescriptor.cpp	24 May 2006 18:01:50 -0000	1.10
--- ImplAAFAIFCDescriptor.cpp	15 Jun 2006 19:52:48 -0000	1.11
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 85,89 ****
  		return(AAFRESULT_BAD_SIZE);

! 	_summary.setValue(pSummary, size);

  	return(AAFRESULT_SUCCESS); 
--- 85,90 ----
  		return(AAFRESULT_BAD_SIZE);

! 	OMPropertySize sSize = static_cast<OMPropertySize>(size);
! 	_summary.setValue(pSummary, sSize);

  	return(AAFRESULT_SUCCESS); 

Index: ImplAAFNestedScope.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFNestedScope.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** ImplAAFNestedScope.cpp	24 May 2006 18:01:52 -0000	1.34
--- ImplAAFNestedScope.cpp	15 Jun 2006 19:52:51 -0000	1.35
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 71,76 ****
  {
  	// Release all of the slot(segments) pointers in the slot list.
! 	size_t count = _slots.count();
! 	for (size_t i = 0; i < count; i++)
  	{
  		ImplAAFSegment* pSegment = _slots.clearValueAt(i);
--- 71,76 ----
  {
  	// Release all of the slot(segments) pointers in the slot list.
! 	aafUInt32 count = _slots.count();
! 	for (aafUInt32 i = 0; i < count; i++)
  	{
  		ImplAAFSegment* pSegment = _slots.clearValueAt(i);
***************
*** 150,154 ****
      return (AAFRESULT_NULL_PARAM);

! 	size_t numSegments = _slots.count();

  	*pResult = numSegments;
--- 150,154 ----
      return (AAFRESULT_NULL_PARAM);

! 	aafUInt32 numSegments = _slots.count();

  	*pResult = numSegments;
***************
*** 240,245 ****
  	XPROTECT()
  	{
! 		size_t count = _slots.count();
! 		for (size_t n = 0; n < count; n++)
  		{
  			ImplAAFSegment	*pSegment;
--- 240,245 ----
  	XPROTECT()
  	{
! 		aafUInt32 count = _slots.count();
! 		for (aafUInt32 n = 0; n < count; n++)
  		{
  			ImplAAFSegment	*pSegment;

Index: ImplAAFSelector.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFSelector.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ImplAAFSelector.cpp	24 May 2006 18:01:52 -0000	1.28
--- ImplAAFSelector.cpp	15 Jun 2006 19:52:52 -0000	1.29
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 66,71 ****
  	}

! 	size_t count = _alternates.count();
! 	for (size_t i = 0; i < count; i++)
  	{
  		ImplAAFSegment* pSegment = _alternates.clearValueAt(i);
--- 66,71 ----
  	}

! 	aafUInt32 count = _alternates.count();
! 	for (aafUInt32 i = 0; i < count; i++)
  	{
  		ImplAAFSegment* pSegment = _alternates.clearValueAt(i);
***************
*** 209,213 ****
  	else
  	{
! 		size_t	numSegments = _alternates.count();
  		*pNumSegments = numSegments;
  	}
--- 209,213 ----
  	else
  	{
! 		aafUInt32 numSegments = _alternates.count();
  		*pNumSegments = numSegments;
  	}

Index: ImplAAFTypeDefString.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFTypeDefString.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** ImplAAFTypeDefString.cpp	24 May 2006 18:01:53 -0000	1.46
--- ImplAAFTypeDefString.cpp	15 Jun 2006 19:53:16 -0000	1.47
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 480,484 ****

  void ImplAAFTypeDefString::reorder(OMByte* externalBytes,
! 								   size_t externalBytesSize) const
  {
    ImplAAFTypeDefSP ptd = BaseType();
--- 480,484 ----

  void ImplAAFTypeDefString::reorder(OMByte* externalBytes,
! 								   OMUInt32 externalBytesSize) const
  {
    ImplAAFTypeDefSP ptd = BaseType();
***************
*** 500,505 ****

! size_t ImplAAFTypeDefString::externalSize(const OMByte* /*internalBytes*/,
! 										  size_t internalBytesSize) const
  {
    ImplAAFTypeDefSP ptd = BaseType();
--- 500,505 ----

! OMUInt32 ImplAAFTypeDefString::externalSize(const OMByte* /*internalBytes*/,
! 										  OMUInt32 internalBytesSize) const
  {
    ImplAAFTypeDefSP ptd = BaseType();
***************
*** 518,524 ****

  void ImplAAFTypeDefString::externalize(const OMByte* internalBytes,
! 									   size_t internalBytesSize,
  									   OMByte* externalBytes,
! 									   size_t externalBytesSize,
  									   OMByteOrder byteOrder) const
  {
--- 518,524 ----

  void ImplAAFTypeDefString::externalize(const OMByte* internalBytes,
! 									   OMUInt32 internalBytesSize,
  									   OMByte* externalBytes,
! 									   OMUInt32 externalBytesSize,
  									   OMByteOrder byteOrder) const
  {
***************
*** 551,556 ****

! size_t ImplAAFTypeDefString::internalSize(const OMByte* /*externalBytes*/,
! 										  size_t externalBytesSize) const
  {
    ImplAAFTypeDefSP ptd = BaseType();
--- 551,556 ----

! OMUInt32 ImplAAFTypeDefString::internalSize(const OMByte* /*externalBytes*/,
! 										  OMUInt32 externalBytesSize) const
  {
    ImplAAFTypeDefSP ptd = BaseType();
***************
*** 569,575 ****

  void ImplAAFTypeDefString::internalize(const OMByte* externalBytes,
! 									   size_t externalBytesSize,
  									   OMByte* internalBytes,
! 									   size_t internalBytesSize,
  									   OMByteOrder byteOrder) const
  {
--- 569,575 ----

  void ImplAAFTypeDefString::internalize(const OMByte* externalBytes,
! 									   OMUInt32 externalBytesSize,
  									   OMByte* internalBytes,
! 									   OMUInt32 internalBytesSize,
  									   OMByteOrder byteOrder) const
  {
***************
*** 610,614 ****

! size_t ImplAAFTypeDefString::PropValSize (void) const
  {
    ASSERTU (0);
--- 610,614 ----

! OMUInt32 ImplAAFTypeDefString::PropValSize (void) const
  {
    ASSERTU (0);
***************
*** 624,628 ****

! size_t ImplAAFTypeDefString::NativeSize (void) const
  {
    ASSERTU (0);
--- 624,628 ----

! OMUInt32 ImplAAFTypeDefString::NativeSize (void) const
  {
    ASSERTU (0);

Index: ImplAAFTypeDefIndirect.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFTypeDefIndirect.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ImplAAFTypeDefIndirect.cpp	24 May 2006 18:01:53 -0000	1.23
--- ImplAAFTypeDefIndirect.cpp	15 Jun 2006 19:53:15 -0000	1.24
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 1155,1159 ****

  void ImplAAFTypeDefIndirect::reorder(OMByte* externalBytes,
!                        size_t ANAME(externalBytesSize)) const
  {
    TRACE("ImplAAFTypeDefIndirect::reorder");
--- 1155,1159 ----

  void ImplAAFTypeDefIndirect::reorder(OMByte* externalBytes,
!                        OMUInt32 ANAME(externalBytesSize)) const
  {
    TRACE("ImplAAFTypeDefIndirect::reorder");
***************
*** 1179,1184 ****
  }

! size_t ImplAAFTypeDefIndirect::externalSize(const OMByte* internalBytes,
!                               size_t internalBytesSize) const
  {
    TRACE("ImplAAFTypeDefIndirect::externalSize");
--- 1179,1184 ----
  }

! OMUInt32 ImplAAFTypeDefIndirect::externalSize(const OMByte* internalBytes,
!                               OMUInt32 internalBytesSize) const
  {
    TRACE("ImplAAFTypeDefIndirect::externalSize");
***************
*** 1208,1214 ****
  void ImplAAFTypeDefIndirect::externalize(
    const OMByte* internalBytes,
!   size_t ANAME(internalBytesSize),
    OMByte* externalBytes,
!   size_t externalBytesSize,
    OMByteOrder NNAME(byteOrder)) const
  {
--- 1208,1214 ----
  void ImplAAFTypeDefIndirect::externalize(
    const OMByte* internalBytes,
!   OMUInt32 ANAME(internalBytesSize),
    OMByte* externalBytes,
!   OMUInt32 externalBytesSize,
    OMByteOrder NNAME(byteOrder)) const
  {
***************
*** 1246,1252 ****

! size_t ImplAAFTypeDefIndirect::internalSize(
    const OMByte* externalBytes,
!   size_t externalSize) const
  {
    TRACE("ImplAAFTypeDefIndirect::internalSize");
--- 1246,1252 ----

! OMUInt32 ImplAAFTypeDefIndirect::internalSize(
    const OMByte* externalBytes,
!   OMUInt32 externalSize) const
  {
    TRACE("ImplAAFTypeDefIndirect::internalSize");
***************
*** 1276,1282 ****
  void ImplAAFTypeDefIndirect::internalize(
    const OMByte* externalBytes,
!   size_t externalBytesSize,
    OMByte* internalBytes,
!   size_t ANAME(internalBytesSize),
    OMByteOrder ANAME(byteOrder)) const
  {
--- 1276,1282 ----
  void ImplAAFTypeDefIndirect::internalize(
    const OMByte* externalBytes,
!   OMUInt32 externalBytesSize,
    OMByte* internalBytes,
!   OMUInt32 ANAME(internalBytesSize),
    OMByteOrder ANAME(byteOrder)) const
  {
***************
*** 1337,1341 ****

! size_t ImplAAFTypeDefIndirect::PropValSize (void) const
  {
    ASSERTU (0);
--- 1337,1341 ----

! OMUInt32 ImplAAFTypeDefIndirect::PropValSize (void) const
  {
    ASSERTU (0);
***************
*** 1351,1355 ****

! size_t ImplAAFTypeDefIndirect::NativeSize (void) const
  {
    ASSERTU (0);
--- 1351,1355 ----

! OMUInt32 ImplAAFTypeDefIndirect::NativeSize (void) const
  {
    ASSERTU (0);

Index: ImplAAFTypeDefFixedArray.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFTypeDefFixedArray.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** ImplAAFTypeDefFixedArray.cpp	24 May 2006 18:01:53 -0000	1.50
--- ImplAAFTypeDefFixedArray.cpp	15 Jun 2006 19:53:14 -0000	1.51
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 206,210 ****

  void ImplAAFTypeDefFixedArray::reorder(OMByte* externalBytes,
! 									   size_t externalBytesSize) const
  {
    aafUInt32 numElems = _ElementCount;
--- 206,210 ----

  void ImplAAFTypeDefFixedArray::reorder(OMByte* externalBytes,
! 									   OMUInt32 externalBytesSize) const
  {
    aafUInt32 numElems = _ElementCount;
***************
*** 225,235 ****

! size_t ImplAAFTypeDefFixedArray::externalSize(const OMByte* /*internalBytes*/,
! 											  size_t /*internalBytesSize*/) const
  {
    ImplAAFTypeDefSP ptd = BaseType ();
    ASSERTU (ptd->IsFixedSize ());
!   // size_t result = _ElementCount * ptd->externalSize (0, 0);
!   size_t result = _ElementCount * ptd->PropValSize ();
    return result;
  }
--- 225,235 ----

! OMUInt32 ImplAAFTypeDefFixedArray::externalSize(const OMByte* /*internalBytes*/,
! 											  OMUInt32 /*internalBytesSize*/) const
  {
    ImplAAFTypeDefSP ptd = BaseType ();
    ASSERTU (ptd->IsFixedSize ());
!   // OMUInt32 result = _ElementCount * ptd->externalSize (0, 0);
!   OMUInt32 result = _ElementCount * ptd->PropValSize ();
    return result;
  }
***************
*** 237,243 ****

  void ImplAAFTypeDefFixedArray::externalize(const OMByte* internalBytes,
! 										   size_t internalBytesSize,
  										   OMByte* externalBytes,
! 										   size_t externalBytesSize,
  										   OMByteOrder byteOrder) const
  {
--- 237,243 ----

  void ImplAAFTypeDefFixedArray::externalize(const OMByte* internalBytes,
! 										   OMUInt32 internalBytesSize,
  										   OMByte* externalBytes,
! 										   OMUInt32 externalBytesSize,
  										   OMByteOrder byteOrder) const
  {
***************
*** 280,290 ****

! size_t ImplAAFTypeDefFixedArray::internalSize(const OMByte* /*externalBytes*/,
! 											  size_t /*externalBytesSize*/) const
  {
    ImplAAFTypeDefSP ptd = BaseType ();
    ASSERTU (ptd->IsFixedSize ());
!   // size_t result = _ElementCount * ptd->internalSize (0, 0);
!   size_t result = _ElementCount * ptd->ActualSize ();
    return result;
  }
--- 280,290 ----

! OMUInt32 ImplAAFTypeDefFixedArray::internalSize(const OMByte* /*externalBytes*/,
! 											  OMUInt32 /*externalBytesSize*/) const
  {
    ImplAAFTypeDefSP ptd = BaseType ();
    ASSERTU (ptd->IsFixedSize ());
!   // OMUInt32 result = _ElementCount * ptd->internalSize (0, 0);
!   OMUInt32 result = _ElementCount * ptd->ActualSize ();
    return result;
  }
***************
*** 292,298 ****

  void ImplAAFTypeDefFixedArray::internalize(const OMByte* externalBytes,
! 										   size_t externalBytesSize,
  										   OMByte* internalBytes,
! 										   size_t internalBytesSize,
  										   OMByteOrder byteOrder) const
  {
--- 292,298 ----

  void ImplAAFTypeDefFixedArray::internalize(const OMByte* externalBytes,
! 										   OMUInt32 externalBytesSize,
  										   OMByte* internalBytes,
! 										   OMUInt32 internalBytesSize,
  										   OMByteOrder byteOrder) const
  {
***************
*** 349,353 ****
  }

! size_t ImplAAFTypeDefFixedArray::PropValSize (void) const
  {
    return (BaseType()->PropValSize()) * _ElementCount;
--- 349,353 ----
  }

! OMUInt32 ImplAAFTypeDefFixedArray::PropValSize (void) const
  {
    return (BaseType()->PropValSize()) * _ElementCount;
***************
*** 361,370 ****

! size_t ImplAAFTypeDefFixedArray::NativeSize (void) const
  {
    ((ImplAAFTypeDefFixedArray*)this)->AttemptBuiltinRegistration ();
    ASSERTU (IsRegistered());

!   size_t result;
    ImplAAFTypeDefSP elemType;
    elemType = BaseType ();
--- 361,370 ----

! OMUInt32 ImplAAFTypeDefFixedArray::NativeSize (void) const
  {
    ((ImplAAFTypeDefFixedArray*)this)->AttemptBuiltinRegistration ();
    ASSERTU (IsRegistered());

!   OMUInt32 result;
    ImplAAFTypeDefSP elemType;
    elemType = BaseType ();
***************
*** 402,406 ****
  	  // We don't support variable arrays of variably-sized properties.
  	  ASSERTU (IsFixedSize());
! 	  aafUInt32 arraySize = NativeSize ();

  	  // But even though elems are fixed size, the variable array is
--- 402,408 ----
  	  // We don't support variable arrays of variably-sized properties.
  	  ASSERTU (IsFixedSize());
! 	  aafUInt32 as = NativeSize ();
! 	  ASSERTU(as <= OMPROPERTYSIZE_MAX);
! 	  OMPropertySize arraySize = static_cast<OMPropertySize>(as);

  	  // But even though elems are fixed size, the variable array is

Index: ImplAAFDigitalImageDescrip.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFDigitalImageDescrip.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ImplAAFDigitalImageDescrip.cpp	24 May 2006 18:01:51 -0000	1.28
--- ImplAAFDigitalImageDescrip.cpp	15 Jun 2006 19:52:50 -0000	1.29
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 186,193 ****
  		return(AAFRESULT_NULL_PARAM);

! 	if ((numberElements * sizeof(aafInt32)) > OMPROPERTYSIZE_MAX)
  		return(AAFRESULT_BAD_SIZE);

! 	_videoLineMap.setValue(pVideoLineMap, numberElements * sizeof(aafInt32));

  	return AAFRESULT_SUCCESS;
--- 186,195 ----
  		return(AAFRESULT_NULL_PARAM);

! 	aafUInt32 ns = numberElements * sizeof(aafInt32);
! 	if (ns > OMPROPERTYSIZE_MAX)
  		return(AAFRESULT_BAD_SIZE);
+ 	OMPropertySize newSize = static_cast<OMPropertySize>(ns);

! 	_videoLineMap.setValue(pVideoLineMap, newSize);

  	return AAFRESULT_SUCCESS;

Index: ImplAAFTypeDefExtEnum.h
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFTypeDefExtEnum.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ImplAAFTypeDefExtEnum.h	24 May 2006 18:01:53 -0000	1.24
--- ImplAAFTypeDefExtEnum.h	15 Jun 2006 19:53:14 -0000	1.25
***************
*** 20,24 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 20,24 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 195,201 ****
  	// non-published overrides from AAFTypeDef
  	aafBool IsFixedSize (void) const;
! 	size_t PropValSize (void) const;
  	aafBool IsRegistered (void) const;
! 	size_t NativeSize (void) const;

  	virtual OMProperty * 
--- 195,201 ----
  	// non-published overrides from AAFTypeDef
  	aafBool IsFixedSize (void) const;
! 	OMUInt32 PropValSize (void) const;
  	aafBool IsRegistered (void) const;
! 	OMUInt32 NativeSize (void) const;

  	virtual OMProperty * 
***************
*** 211,232 ****

  	virtual void reorder(OMByte* bytes,
! 		size_t bytesSize) const;

! 	virtual size_t externalSize(const OMByte* internalBytes,
! 		size_t internalBytesSize) const;

  	virtual void externalize(const OMByte* internalBytes,
! 		size_t internalBytesSize,
  		OMByte* externalBytes,
! 		size_t externalBytesSize,
  		OMByteOrder byteOrder) const;

! 	virtual size_t internalSize(const OMByte* externalBytes,
! 		size_t externalBytesSize) const;

  	virtual void internalize(const OMByte* externalBytes,
! 		size_t externalBytesSize,
  		OMByte* internalBytes,
! 		size_t internalBytesSize,
  		OMByteOrder byteOrder) const;

--- 211,232 ----

  	virtual void reorder(OMByte* bytes,
! 		OMUInt32 bytesSize) const;

! 	virtual OMUInt32 externalSize(const OMByte* internalBytes,
! 		OMUInt32 internalBytesSize) const;

  	virtual void externalize(const OMByte* internalBytes,
! 		OMUInt32 internalBytesSize,
  		OMByte* externalBytes,
! 		OMUInt32 externalBytesSize,
  		OMByteOrder byteOrder) const;

! 	virtual OMUInt32 internalSize(const OMByte* externalBytes,
! 		OMUInt32 externalBytesSize) const;

  	virtual void internalize(const OMByte* externalBytes,
! 		OMUInt32 externalBytesSize,
  		OMByte* internalBytes,
! 		OMUInt32 internalBytesSize,
  		OMByteOrder byteOrder) const;

Index: ImplAAFRGBADescriptor.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFRGBADescriptor.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ImplAAFRGBADescriptor.cpp	24 May 2006 18:01:52 -0000	1.10
--- ImplAAFRGBADescriptor.cpp	15 Jun 2006 19:52:52 -0000	1.11
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 153,160 ****
  		return(AAFRESULT_NULL_PARAM);

! 	if ((numberElements * sizeof(aafUInt8)) > OMPROPERTYSIZE_MAX)
  		return(AAFRESULT_BAD_SIZE);

! 	_palette.setValue(pPalette, numberElements * sizeof(aafUInt8));

  	return AAFRESULT_SUCCESS;
--- 153,162 ----
  		return(AAFRESULT_NULL_PARAM);

! 	size_t sz = numberElements * sizeof(aafUInt8);
! 	if (sz > OMPROPERTYSIZE_MAX)
  		return(AAFRESULT_BAD_SIZE);

! 	OMPropertySize size = static_cast<OMPropertySize>(sz);
! 	_palette.setValue(pPalette, size);

  	return AAFRESULT_SUCCESS;

Index: ImplAAFTypeDefVariableArry.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFTypeDefVariableArry.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** ImplAAFTypeDefVariableArry.cpp	24 May 2006 18:01:54 -0000	1.64
--- ImplAAFTypeDefVariableArry.cpp	15 Jun 2006 19:53:17 -0000	1.65
***************
*** 368,372 ****

  void ImplAAFTypeDefVariableArray::reorder(OMByte* externalBytes,
! 										  size_t externalBytesSize) const
  {
  	ImplAAFTypeDefSP ptd = BaseType ();
--- 368,372 ----

  void ImplAAFTypeDefVariableArray::reorder(OMByte* externalBytes,
! 										  OMUInt32 externalBytesSize) const
  {
  	ImplAAFTypeDefSP ptd = BaseType ();
***************
*** 389,394 ****

! size_t ImplAAFTypeDefVariableArray::externalSize(const OMByte* /*internalBytes*/,
! 												 size_t internalBytesSize) const
  {
  	ImplAAFTypeDefSP ptd = BaseType ();
--- 389,394 ----

! OMUInt32 ImplAAFTypeDefVariableArray::externalSize(const OMByte* /*internalBytes*/,
! 												 OMUInt32 internalBytesSize) const
  {
  	ImplAAFTypeDefSP ptd = BaseType ();
***************
*** 408,414 ****

  void ImplAAFTypeDefVariableArray::externalize(const OMByte* internalBytes,
! 											  size_t internalBytesSize,
  											  OMByte* externalBytes,
! 											  size_t externalBytesSize,
  											  OMByteOrder byteOrder) const
  {
--- 408,414 ----

  void ImplAAFTypeDefVariableArray::externalize(const OMByte* internalBytes,
! 											  OMUInt32 internalBytesSize,
  											  OMByte* externalBytes,
! 											  OMUInt32 externalBytesSize,
  											  OMByteOrder byteOrder) const
  {
***************
*** 455,460 ****

! size_t ImplAAFTypeDefVariableArray::internalSize(const OMByte* /*externalBytes*/,
! 												 size_t externalBytesSize) const
  {
  	ImplAAFTypeDefSP ptd = BaseType ();
--- 455,460 ----

! OMUInt32 ImplAAFTypeDefVariableArray::internalSize(const OMByte* /*externalBytes*/,
! 												 OMUInt32 externalBytesSize) const
  {
  	ImplAAFTypeDefSP ptd = BaseType ();
***************
*** 474,480 ****

  void ImplAAFTypeDefVariableArray::internalize(const OMByte* externalBytes,
! 											  size_t externalBytesSize,
  											  OMByte* internalBytes,
! 											  size_t internalBytesSize,
  											  OMByteOrder byteOrder) const
  {
--- 474,480 ----

  void ImplAAFTypeDefVariableArray::internalize(const OMByte* externalBytes,
! 											  OMUInt32 externalBytesSize,
  											  OMByte* internalBytes,
! 											  OMUInt32 internalBytesSize,
  											  OMByteOrder byteOrder) const
  {
***************
*** 550,554 ****

! size_t ImplAAFTypeDefVariableArray::PropValSize (void) const
  {
  	ASSERTU (0);
--- 550,554 ----

! OMUInt32 ImplAAFTypeDefVariableArray::PropValSize (void) const
  {
  	ASSERTU (0);
***************
*** 564,568 ****

! size_t ImplAAFTypeDefVariableArray::NativeSize (void) const
  {
  	ASSERTU (0);
--- 564,568 ----

! OMUInt32 ImplAAFTypeDefVariableArray::NativeSize (void) const
  {
  	ASSERTU (0);

Index: ImplAAFTypeDefFixedArray.h
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFTypeDefFixedArray.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ImplAAFTypeDefFixedArray.h	24 May 2006 18:01:53 -0000	1.33
--- ImplAAFTypeDefFixedArray.h	15 Jun 2006 19:53:15 -0000	1.34
***************
*** 122,143 ****

    virtual void reorder(OMByte* bytes,
!                        size_t bytesSize) const;

!   virtual size_t externalSize(const OMByte* internalBytes,
!                               size_t internalBytesSize) const;

    virtual void externalize(const OMByte* internalBytes,
!                            size_t internalBytesSize,
                             OMByte* externalBytes,
!                            size_t externalBytesSize,
                             OMByteOrder byteOrder) const;

!   virtual size_t internalSize(const OMByte* externalBytes,
!                               size_t externalBytesSize) const;

    virtual void internalize(const OMByte* externalBytes,
!                            size_t externalBytesSize,
                             OMByte* internalBytes,
!                            size_t internalBytesSize,
                             OMByteOrder byteOrder) const;

--- 122,143 ----

    virtual void reorder(OMByte* bytes,
!                        OMUInt32 bytesSize) const;

!   virtual OMUInt32 externalSize(const OMByte* internalBytes,
!                                 OMUInt32 internalBytesSize) const;

    virtual void externalize(const OMByte* internalBytes,
!                            OMUInt32 internalBytesSize,
                             OMByte* externalBytes,
!                            OMUInt32 externalBytesSize,
                             OMByteOrder byteOrder) const;

!   virtual OMUInt32 internalSize(const OMByte* externalBytes,
!                                 OMUInt32 externalBytesSize) const;

    virtual void internalize(const OMByte* externalBytes,
!                            OMUInt32 externalBytesSize,
                             OMByte* internalBytes,
!                            OMUInt32 internalBytesSize,
                             OMByteOrder byteOrder) const;

***************
*** 177,183 ****
    //
    virtual aafBool IsFixedSize (void) const;
!   virtual size_t PropValSize (void) const;
    aafBool IsRegistered (void) const;
!   size_t NativeSize (void) const;

    virtual OMProperty * 
--- 177,183 ----
    //
    virtual aafBool IsFixedSize (void) const;
!   virtual OMUInt32 PropValSize (void) const;
    aafBool IsRegistered (void) const;
!   OMUInt32 NativeSize (void) const;

    virtual OMProperty * 

Index: ImplAAFTypeDefVariableArray.h
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFTypeDefVariableArray.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** ImplAAFTypeDefVariableArray.h	24 May 2006 18:01:54 -0000	1.36
--- ImplAAFTypeDefVariableArray.h	15 Jun 2006 19:53:16 -0000	1.37
***************
*** 129,150 ****

    virtual void reorder(OMByte* externalBytes,
!                        size_t externalBytesSize) const;

!   virtual size_t externalSize(const OMByte* internalBytes,
! 							  size_t internalBytesSize) const;

    virtual void externalize(const OMByte* internalBytes,
!                            size_t internalBytesSize,
                             OMByte* externalBytes,
!                            size_t externalBytesSize,
                             OMByteOrder byteOrder) const;

!   virtual size_t internalSize(const OMByte* externalBytes,
! 							  size_t externalBytesSize) const;

    virtual void internalize(const OMByte* externalBytes,
!                            size_t externalBytesSize,
                             OMByte* internalBytes,
!                            size_t internalBytesSize,
                             OMByteOrder byteOrder) const;

--- 129,150 ----

    virtual void reorder(OMByte* externalBytes,
!                        OMUInt32 externalBytesSize) const;

!   virtual OMUInt32 externalSize(const OMByte* internalBytes,
!                                 OMUInt32 internalBytesSize) const;

    virtual void externalize(const OMByte* internalBytes,
!                            OMUInt32 internalBytesSize,
                             OMByte* externalBytes,
!                            OMUInt32 externalBytesSize,
                             OMByteOrder byteOrder) const;

!   virtual OMUInt32 internalSize(const OMByte* externalBytes,
!                                 OMUInt32 externalBytesSize) const;

    virtual void internalize(const OMByte* externalBytes,
!                            OMUInt32 externalBytesSize,
                             OMByte* internalBytes,
!                            OMUInt32 internalBytesSize,
                             OMByteOrder byteOrder) const;

***************
*** 211,217 ****
    //
    virtual aafBool IsFixedSize (void) const;
!   virtual size_t PropValSize (void) const;
    virtual aafBool IsRegistered (void) const;
!   virtual size_t NativeSize (void) const;

    virtual OMProperty * 
--- 211,217 ----
    //
    virtual aafBool IsFixedSize (void) const;
!   virtual OMUInt32 PropValSize (void) const;
    virtual aafBool IsRegistered (void) const;
!   virtual OMUInt32 NativeSize (void) const;

    virtual OMProperty * 

Index: ImplAAFEssenceDescriptor.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFEssenceDescriptor.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** ImplAAFEssenceDescriptor.cpp	24 May 2006 18:01:51 -0000	1.38
--- ImplAAFEssenceDescriptor.cpp	15 Jun 2006 19:52:50 -0000	1.39
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 70,75 ****
  {
  	// Release all of the locator and subdescriptor pointers.
! 	size_t count = _locators.count();
! 	for (size_t i = 0; i < count; i++)
  	{
  		ImplAAFLocator *pLocator = _locators.clearValueAt(i);
--- 70,75 ----
  {
  	// Release all of the locator and subdescriptor pointers.
! 	aafUInt32 count = _locators.count();
! 	for (aafUInt32  i = 0; i < count; i++)
  	{
  		ImplAAFLocator *pLocator = _locators.clearValueAt(i);
***************
*** 80,85 ****
  		}
  	}
! 	size_t count2 = _subdescriptors.count();
! 	for (size_t i = 0; i < count2; i++)
  	{
  		ImplAAFSubDescriptor *pSubDescriptor = _subdescriptors.clearValueAt(i);
--- 80,85 ----
  		}
  	}
! 	aafUInt32 count2 = _subdescriptors.count();
! 	for (aafUInt32 i = 0; i < count2; i++)
  	{
  		ImplAAFSubDescriptor *pSubDescriptor = _subdescriptors.clearValueAt(i);
***************
*** 208,212 ****
      return AAFRESULT_OBJECT_NOT_ATTACHED;

!   size_t index;
    if (_locators.findIndex (pLocator, index))
  	  return RemoveLocatorAt (index);
--- 208,212 ----
      return AAFRESULT_OBJECT_NOT_ATTACHED;

!   OMUInt32 index;
    if (_locators.findIndex (pLocator, index))
  	  return RemoveLocatorAt (index);
***************
*** 361,365 ****
      return AAFRESULT_OBJECT_NOT_ATTACHED;

!   size_t index;
    if (_subdescriptors.findIndex (pSubDescriptor, index))
  	  return RemoveSubDescriptorAt (index);
--- 361,365 ----
      return AAFRESULT_OBJECT_NOT_ATTACHED;

!   OMUInt32 index;
    if (_subdescriptors.findIndex (pSubDescriptor, index))
  	  return RemoveSubDescriptorAt (index);

Index: ImplAAFTaggedValueUtil.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFTaggedValueUtil.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ImplAAFTaggedValueUtil.cpp	24 May 2006 18:01:53 -0000	1.3
--- ImplAAFTaggedValueUtil.cpp	15 Jun 2006 19:52:52 -0000	1.4
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 77,83 ****

      // Init the tagged value.
      CHECK( pTaggedVal->Initialize( pName,
  				   pTaggedValType,
! 				   (wcslen(pValue)+1)*sizeof(aafCharacter),
  				   reinterpret_cast<aafDataBuffer_t>(const_cast<aafCharacter*>(pValue)) ) );

--- 77,87 ----

      // Init the tagged value.
+     size_t cc = wcslen(pValue)+1;
+     ASSERTU(cc <= OMUINT32_MAX);
+     OMUInt32 characterCount = static_cast<OMUInt32>(cc);
+     OMUInt32 byteCount = characterCount * sizeof(aafCharacter);
      CHECK( pTaggedVal->Initialize( pName,
  				   pTaggedValType,
! 				   byteCount,
  				   reinterpret_cast<aafDataBuffer_t>(const_cast<aafCharacter*>(pValue)) ) );

***************
*** 167,171 ****
    }

!   size_t index;
    if ( taggedValVector.findIndex (pEntry, index) ) {
      taggedValVector.removeAt(index);
--- 171,175 ----
    }

!   OMUInt32 index;
    if ( taggedValVector.findIndex (pEntry, index) ) {
      taggedValVector.removeAt(index);

Index: ImplAAFTypeDefRecord.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFTypeDefRecord.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** ImplAAFTypeDefRecord.cpp	24 May 2006 18:01:53 -0000	1.47
--- ImplAAFTypeDefRecord.cpp	15 Jun 2006 19:53:15 -0000	1.48
***************
*** 14,18 ****
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2004, Licensor of the
  // AAF Association.
  //
--- 14,18 ----
  // under the License.
  //
! // The Original Code of this file is Copyright 1998-2006, Licensor of the
  // AAF Association.
  //
***************
*** 151,160 ****
  		return AAFRESULT_TYPE_NOT_FOUND;

! 	  totalNameSize += (wcslen (pMemberNames[i]) + 1);
  	}

!   if ((totalNameSize * sizeof(aafCharacter)) > OMPROPERTYSIZE_MAX)
  	return AAFRESULT_BAD_SIZE;

    aafCharacter * namesBuf = new aafCharacter[totalNameSize];
    if (!namesBuf)
--- 151,166 ----
  		return AAFRESULT_TYPE_NOT_FOUND;

! 	  size_t mnl = wcslen (pMemberNames[i]);
! 	  ASSERTU(mnl <= OMUINT32_MAX);
! 	  OMUInt32 memberNameLength = static_cast<OMUInt32>(mnl);
! 	  totalNameSize += (memberNameLength + 1);
  	}

!   aafUInt32 tb = totalNameSize * sizeof(aafCharacter);
!   if (tb > OMPROPERTYSIZE_MAX)
  	return AAFRESULT_BAD_SIZE;

+   OMPropertySize totalBytes = static_cast<OMPropertySize>(tb);
+ 
    aafCharacter * namesBuf = new aafCharacter[totalNameSize];
    if (!namesBuf)
***************
*** 193,197 ****
  //  _memberTypes.setValue(buf, numMembers*sizeof(aafUID_t));
  //  delete[] buf;
!   _memberNames.setValue (namesBuf, totalNameSize * sizeof(aafCharacter));
    delete[] namesBuf;

--- 199,203 ----
  //  _memberTypes.setValue(buf, numMembers*sizeof(aafUID_t));
  //  delete[] buf;
!   _memberNames.setValue (namesBuf, totalBytes);
    delete[] namesBuf;

***************
*** 231,237 ****
  		return AAFRESULT_NULL_PARAM;

! 	  totalNameSize += (wcslen (pMemberNames[i]) + 1);
  	}

    aafCharacter * namesBuf = new aafCharacter[totalNameSize];
    if (!namesBuf)
--- 237,252 ----
  		return AAFRESULT_NULL_PARAM;

! 	  size_t mnl = wcslen (pMemberNames[i]);
! 	  ASSERTU(mnl <= OMUINT32_MAX);
! 	  OMUInt32 memberNameLength = static_cast<OMUInt32>(mnl);
! 	  totalNameSize += (memberNameLength + 1);
  	}

+   aafUInt32 tb = totalNameSize * sizeof(aafCharacter);
+   if (tb > OMPROPERTYSIZE_MAX)
+ 	return AAFRESULT_BAD_SIZE;
+ 
+   OMPropertySize totalBytes = static_cast<OMPropertySize>(tb);
+ 
    aafCharacter * namesBuf = new aafCharacter[totalNameSize];
    if (!namesBuf)
***************
*** 259,263 ****
  //  _memberTypes.setValue(buf, numMembers*sizeof(aafUID_t));
   // delete[] buf;
!   _memberNames.setValue (namesBuf, totalNameSize * sizeof(aafCharacter));
    delete[] namesBuf;

--- 274,278 ----
  //  _memberTypes.setValue(buf, numMembers*sizeof(aafUID_t));
   // delete[] buf;
!   _memberNames.setValue (namesBuf, totalBytes);
    delete[] namesBuf;

***************
*** 350,354 ****
    if (0 != index)
  	{
! 	  for (size_t i = 0; i < numChars; i++)
  		{
  		  indexIntoProp++;
--- 365,369 ----
    if (0 != index)
  	{
! 	  for (OMUInt32 i = 0; i < numChars; i++)
  		{
  		  indexIntoProp++;
***************
*** 409,413 ****
    if (0 != index)
  	{
! 	  for (size_t i = 0; i < numChars; i++)
  		{
  		  indexIntoProp++;
--- 424,428 ----
    if (0 != index)
  	{
! 	  for (OMUInt32 i = 0; i < numChars; i++)
  		{
  		  indexIntoProp++;
***************
*** 1022,1026 ****

  void ImplAAFTypeDefRecord::reorder(OMByte* externalBytes,
! 								   size_t externalBytesSize) const
  {
    AAFRESULT hr;
--- 1037,1041 ----

  void ImplAAFTypeDefRecord::reorder(OMByte* externalBytes,
! 								   OMUInt32 externalBytesSize) const
  {
    AAFRESULT hr;
***************
*** 1052,1057 ****

! size_t ImplAAFTypeDefRecord::externalSize(const OMByte* /*internalBytes*/,
! 										  size_t /*internalBytesSize*/) const
  {
    return PropValSize ();
--- 1067,1072 ----

! OMUInt32 ImplAAFTypeDefRecord::externalSize(const OMByte* /*internalBytes*/,
! 										  OMUInt32 /*internalBytesSize*/) const
  {
    return PropValSize ();
***************
*** 1060,1066 ****

  void ImplAAFTypeDefRecord::externalize(const OMByte* internalBytes,
! 									   size_t internalBytesSize,
  									   OMByte* externalBytes,
! 									   size_t externalBytesSize,
  									   OMByteOrder byteOrder) const
  {
--- 1075,1081 ----

  void ImplAAFTypeDefRecord::externalize(const OMByte* internalBytes,
! 									   OMUInt32 internalBytesSize,
  									   OMByte* externalBytes,
! 									   OMUInt32 externalBytesSize,
  									   OMByteOrder byteOrder) const
  {
***************
*** 1113,1117 ****

! size_t ImplAAFTypeDefRecord::internalSize(void) const
  {
    if (IsRegistered ())
--- 1128,1132 ----

! OMUInt32 ImplAAFTypeDefRecord::internalSize(void) const
  {
    if (IsRegistered ())
***************
*** 1121,1126 ****
  }

! size_t ImplAAFTypeDefRecord::internalSize(const OMByte* /*externalBytes*/,
! 										  size_t /*externalBytesSize*/) const
  {
    if (IsRegistered ())
--- 1136,1141 ----
  }

! OMUInt32 ImplAAFTypeDefRecord::internalSize(const OMByte* /*externalBytes*/,
! 										  OMUInt32 /*externalBytesSize*/) const
  {
    if (IsRegistered ())
***************
*** 1132,1138 ****

  void ImplAAFTypeDefRecord::internalize(const OMByte* externalBytes,
! 									   size_t externalBytesSize,
  									   OMByte* internalBytes,
! 									   size_t internalBytesSize,
  									   OMByteOrder byteOrder) const
  {
--- 1147,1153 ----

  void ImplAAFTypeDefRecord::internalize(const OMByte* externalBytes,
! 									   OMUInt32 externalBytesSize,
  									   OMByte* internalBytes,
! 									   OMUInt32 internalBytesSize,
  									   OMByteOrder byteOrder) const
  {
***************
*** 1192,1199 ****

! size_t ImplAAFTypeDefRecord::PropValSize (void) const
  {
    aafUInt32 count;
!   size_t totalSize = 0;
    AAFRESULT hr;

--- 1207,1214 ----

! OMUInt32 ImplAAFTypeDefRecord::PropValSize (void) const
  {
    aafUInt32 count;
!   OMUInt32 totalSize = 0;
  ...

[truncated message content]