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

remove mingw warnings under win32

Browse Source
This commit is contained in:
HumanDynamo 2010-04-12 10:40:57 +00:00
parent 0325f5c005
commit 874119dedf
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xmpsdk/src/XMPCore_Impl.cpp
View File

@ -845,7 +845,8 @@ FindSchemaNode ( XMP_Node * xmpTree,
schemaNode = new XMP_Node ( xmpTree, nsURI, (kXMP_SchemaNode | kXMP_NewImplicitNode) );
XMP_StringPtr prefixPtr;
XMP_StringLen prefixLen;
bool found = XMPMeta::GetNamespacePrefix ( nsURI, &prefixPtr, &prefixLen ); // *** Use map directly?
bool found = false;
found = XMPMeta::GetNamespacePrefix ( nsURI, &prefixPtr, &prefixLen ); // *** Use map directly?
XMP_Assert ( found );
schemaNode->value.assign ( prefixPtr, prefixLen );

3
xmpsdk/src/XMPMeta.cpp
View File

@ -743,7 +743,8 @@ XMPMeta::Initialize()
XMP_Assert ( sizeof(XMP_Uns64) == 8 );
XMP_Assert ( sizeof(XMP_OptionBits) == 4 ); // Check that option masking work on all 32 bits.
XMP_OptionBits flag = ~0UL;
XMP_OptionBits flag;
flag = ~0UL;
XMP_Assert ( flag == (XMP_OptionBits)(-1L) );
XMP_Assert ( (flag ^ kXMP_PropHasLang) == 0xFFFFFFBFUL );
XMP_Assert ( (flag & ~kXMP_PropHasLang) == 0xFFFFFFBFUL );

6
xmpsdk/src/XMPUtils.cpp
View File

@ -602,7 +602,8 @@ static size_t MoveLargestProperty ( XMPMeta & stdXMP, XMPMeta * extXMP, PropSize
printf ( " Move %s, %d bytes\n", propName, propSize );
#endif
bool moved = MoveOneProperty ( stdXMP, extXMP, schemaURI, propName );
bool moved = false;
moved = MoveOneProperty ( stdXMP, extXMP, schemaURI, propName );
XMP_Assert ( moved );
propSizes.erase ( lastPos );
@ -1841,7 +1842,8 @@ XMPUtils::PackageForJPEG ( const XMPMeta & origXMP,
// Adjust the standard XMP padding to be up to 2KB.
XMP_Assert ( (sStandardXMP->size() > kTrailerLen) && (sStandardXMP->size() <= kStdXMPLimit) );
const char * packetEnd = sStandardXMP->c_str() + sStandardXMP->size() - kTrailerLen;
const char * packetEnd = 0;
packetEnd = sStandardXMP->c_str() + sStandardXMP->size() - kTrailerLen;
XMP_Assert ( XMP_LitMatch ( packetEnd, kPacketTrailer ) );
size_t extraPadding = kStdXMPLimit - sStandardXMP->size(); // ! Do this before erasing the trailer.