summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Figuière <hub@figuiere.net>2017-01-11 19:20:48 -0500
committerHubert Figuière <hub@figuiere.net>2017-01-11 19:20:48 -0500
commit80fd502741e2244277521d83b27d1f0ef150b343 (patch)
tree656efb4f93209dec157f3cae7a8c72fa587e3c88
parent404a101e1d7bffe9a093ef38773996f37535d0c7 (diff)
Adobe SDK: fix some format mismatched types
-rw-r--r--XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h4
-rw-r--r--XMPFiles/source/FormatSupport/RIFF.cpp8
-rw-r--r--XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h4
-rw-r--r--XMPFiles/source/FormatSupport/WAVE/CartMetadata.h4
-rw-r--r--XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h4
-rw-r--r--XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h4
-rw-r--r--XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h4
-rw-r--r--XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h4
-rw-r--r--XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h4
9 files changed, 22 insertions, 18 deletions
diff --git a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h
index 13dbf1c..c4d584d 100644
--- a/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h
+++ b/XMPFiles/source/FormatSupport/AIFF/AIFFMetadata.h
@@ -54,8 +54,8 @@ protected:
private:
// Operators hidden on purpose
- AIFFMetadata( const AIFFMetadata& ) {};
- AIFFMetadata& operator=( const AIFFMetadata& ) { return *this; };
+ AIFFMetadata( const AIFFMetadata& );
+ AIFFMetadata& operator=( const AIFFMetadata& );
};
} // namespace
diff --git a/XMPFiles/source/FormatSupport/RIFF.cpp b/XMPFiles/source/FormatSupport/RIFF.cpp
index f258f8a..4bcce6e 100644
--- a/XMPFiles/source/FormatSupport/RIFF.cpp
+++ b/XMPFiles/source/FormatSupport/RIFF.cpp
@@ -218,7 +218,8 @@ std::string Chunk::toString(XMP_Uns8 /*level*/)
"oldSize: 0x%.8llX, "
"newSize: 0x%.8llX, "
"oldPos: 0x%.8llX\n",
- (char*)(&this->id), this->oldSize, this->newSize, this->oldPos );
+ (char*)(&this->id), (long long unsigned)this->oldSize,
+ (long long unsigned)this->newSize, (long long unsigned)this->oldPos );
return std::string(buffer);
}
@@ -600,7 +601,10 @@ std::string ContainerChunk::toString(XMP_Uns8 level )
"oldSize: 0x%8llX, "
"newSize: 0x%.8llX, "
"oldPos: 0x%.8llX\n",
- (char*)(&this->id), (char*)(&this->containerType), this->oldSize, this->newSize, this->oldPos );
+ (char*)(&this->id), (char*)(&this->containerType),
+ (long long unsigned)this->oldSize,
+ (long long unsigned)this->newSize,
+ (long long unsigned)this->oldPos );
std::string r(buffer);
chunkVectIter iter;
diff --git a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h
index 0f57246..5bf40f1 100644
--- a/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h
+++ b/XMPFiles/source/FormatSupport/WAVE/BEXTMetadata.h
@@ -90,8 +90,8 @@ protected:
private:
// Operators hidden on purpose
- BEXTMetadata( const BEXTMetadata& ) {};
- BEXTMetadata& operator=( const BEXTMetadata& ) { return *this; };
+ BEXTMetadata( const BEXTMetadata& );
+ BEXTMetadata& operator=( const BEXTMetadata& );
};
}
diff --git a/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h
index b007afc..2af05fd 100644
--- a/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h
+++ b/XMPFiles/source/FormatSupport/WAVE/CartMetadata.h
@@ -85,8 +85,8 @@ protected:
private:
// Operators hidden on purpose.
- CartMetadata ( const CartMetadata& ) {};
- CartMetadata& operator= ( const CartMetadata& ) { return *this; };
+ CartMetadata ( const CartMetadata& );
+ CartMetadata& operator= ( const CartMetadata& );
}; // CartMetadata
diff --git a/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h
index 451f430..c034ee0 100644
--- a/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h
+++ b/XMPFiles/source/FormatSupport/WAVE/Cr8rMetadata.h
@@ -82,8 +82,8 @@ protected:
private:
// Operators hidden on purpose
- Cr8rMetadata( const Cr8rMetadata& ) {};
- Cr8rMetadata& operator=( const Cr8rMetadata& ) { return *this; };
+ Cr8rMetadata( const Cr8rMetadata& );
+ Cr8rMetadata& operator=( const Cr8rMetadata& );
};
}
diff --git a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h
index 7db1891..d5a6702 100644
--- a/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h
+++ b/XMPFiles/source/FormatSupport/WAVE/DISPMetadata.h
@@ -88,8 +88,8 @@ protected:
private:
// Operators hidden on purpose
- DISPMetadata( const DISPMetadata& ) {};
- DISPMetadata& operator=( const DISPMetadata& ) { return *this; };
+ DISPMetadata( const DISPMetadata& );
+ DISPMetadata& operator=( const DISPMetadata& );
};
}
diff --git a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h
index 74d024c..c512cb0 100644
--- a/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h
+++ b/XMPFiles/source/FormatSupport/WAVE/INFOMetadata.h
@@ -79,8 +79,8 @@ protected:
private:
// Operators hidden on purpose
- INFOMetadata( const INFOMetadata& ) {};
- INFOMetadata& operator=( const INFOMetadata& ) { return *this; };
+ INFOMetadata( const INFOMetadata& );
+ INFOMetadata& operator=( const INFOMetadata& );
};
}
diff --git a/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h
index 8eb7102..da89147 100644
--- a/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h
+++ b/XMPFiles/source/FormatSupport/WAVE/PrmLMetadata.h
@@ -81,8 +81,8 @@ protected:
private:
// Operators hidden on purpose
- PrmLMetadata( const PrmLMetadata& ) {};
- PrmLMetadata& operator=( const PrmLMetadata& ) { return *this; };
+ PrmLMetadata( const PrmLMetadata& );
+ PrmLMetadata& operator=( const PrmLMetadata& );
};
}
diff --git a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h
index 5c18268..5bc62d0 100644
--- a/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h
+++ b/XMPFiles/source/FormatSupport/WAVE/iXMLMetadata.h
@@ -174,8 +174,8 @@ namespace IFF_RIFF {
bool validateTrackListInfo( ValueObject * value );
private:
// Operators hidden on purpose
- iXMLMetadata( const iXMLMetadata& ) {};
- iXMLMetadata& operator=( const iXMLMetadata& ) { return *this; };
+ iXMLMetadata( const iXMLMetadata& );
+ iXMLMetadata& operator=( const iXMLMetadata& );
ExpatAdapter * mExpatAdapter;
XML_Node * mRootNode;