third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correction to earlier commit. Should not have updated the xmpsdk/include files with files creating using xmpsdk/buildXMPsdk.sh

Browse Source
This commit is contained in:
clanmills
2017-08-08 17:33:16 +01:00
parent 6085392857
commit 36d2a4f5db
15 changed files with 1055 additions and 1340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xmpsdk/include/client-glue/TXMPIterator.incl_cpp
+15 -12
View File
@@ -1,6 +1,6 @@
// =================================================================================================
// ADOBE SYSTEMS INCORPORATED
// Copyright 2002 Adobe Systems Incorporated
// Copyright 2002-2007 Adobe Systems Incorporated
// All Rights Reserved
//
// NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
@@ -11,7 +11,7 @@
/// \file TXMPIterator.incl_cpp
/// \brief The implementation of the TXMPIterator template class.
#include "XMP.hpp"
#include "XMPSDK.hpp"
#include "client-glue/WXMP_Common.hpp"
#include "client-glue/WXMPIterator.hpp"
@@ -79,15 +79,6 @@
// -------------------------------------------------------------------------------------------------
XMP_MethodIntro(TXMPIterator,void)::
SetClientString ( void * clientPtr, XMP_StringPtr valuePtr, XMP_StringLen valueLen )
{
tStringObj * clientStr = (tStringObj*) clientPtr;
clientStr->assign ( valuePtr, valueLen );
}
// -------------------------------------------------------------------------------------------------
XMP_CTorDTorIntro(TXMPIterator)::
TXMPIterator ( const TXMPIterator<tStringObj> & original ) : iterRef(original.iterRef)
{
@@ -208,7 +199,19 @@ Next ( tStringObj * schemaNS /* = 0 */,
tStringObj * propValue /* = 0 */,
XMP_OptionBits * options /* = 0 */ )
{
WrapCheckBool ( found, zXMPIterator_Next_1 ( schemaNS, propPath, propValue, options, SetClientString ) );
XMP_StringPtr schemaPtr = 0;
XMP_StringLen schemaLen = 0;
XMP_StringPtr pathPtr = 0;
XMP_StringLen pathLen = 0;
XMP_StringPtr valuePtr = 0;
XMP_StringLen valueLen = 0;
WrapCheckBool ( found, zXMPIterator_Next_1 ( &schemaPtr, &schemaLen, &pathPtr, &pathLen, &valuePtr, &valueLen, options ) );
if ( found ) {
if ( schemaNS != 0 ) schemaNS->assign ( schemaPtr, schemaLen );
if ( propPath != 0 ) propPath->assign ( pathPtr, pathLen );
if ( propValue != 0 ) propValue->assign ( valuePtr, valueLen );
WXMPUtils_UnlockIter_1 ( this->iterRef, 0 );
}
return found;
}