diff options
| author | Hubert Figuière <hub@figuiere.net> | 2014-04-22 14:02:25 -0400 |
|---|---|---|
| committer | Hubert Figuière <hub@figuiere.net> | 2014-04-22 14:02:25 -0400 |
| commit | 5013ac34dda98b65d8916eca1303488abaade995 (patch) | |
| tree | 982a1fcb2bee476dd955b0795d109df0b50d1cd2 /XMPFiles | |
| parent | c8c9bda727bcad559c684b9b9759d867671e8db6 (diff) | |
| parent | 0f1af3217b8d1f3d191b86d1ce3d2b2ef1fe483e (diff) | |
Merge branch 'exempi-2.3-branch'
Conflicts:
samples/source/common/LargeFileAccess.cpp
source/XMPFiles/FileHandlers/MP3_Handler.cpp
source/XMPFiles/FormatSupport/ID3_Support.hpp
Diffstat (limited to 'XMPFiles')
| -rw-r--r-- | XMPFiles/source/FileHandlers/MP3_Handler.cpp | 2 | ||||
| -rw-r--r-- | XMPFiles/source/FormatSupport/ID3_Support.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/XMPFiles/source/FileHandlers/MP3_Handler.cpp b/XMPFiles/source/FileHandlers/MP3_Handler.cpp index a568c1a..c43a078 100644 --- a/XMPFiles/source/FileHandlers/MP3_Handler.cpp +++ b/XMPFiles/source/FileHandlers/MP3_Handler.cpp @@ -432,7 +432,7 @@ void MP3_MetaHandler::ProcessXMP() bool haveNewDateTime = (newDateTime.year != 0) && ( (newDateTime.year != oldDateTime.year) || ( (newDateTime.month != 0 ) && ( (newDateTime.day != oldDateTime.day) || (newDateTime.month != oldDateTime.month) ) ) || - ( newDateTime.hasTime && ( (newDateTime.hour != oldDateTime.minute) || (newDateTime.hour != oldDateTime.minute) ) ) ); + ( newDateTime.hasTime && ( (newDateTime.hour != oldDateTime.hour) || (newDateTime.minute != oldDateTime.minute) ) ) ); if ( haveNewDateTime ) { this->xmpObj.SetProperty_Date ( kXMP_NS_XMP, "CreateDate", newDateTime ); } diff --git a/XMPFiles/source/FormatSupport/ID3_Support.cpp b/XMPFiles/source/FormatSupport/ID3_Support.cpp index e33e39e..97f8403 100644 --- a/XMPFiles/source/FormatSupport/ID3_Support.cpp +++ b/XMPFiles/source/FormatSupport/ID3_Support.cpp @@ -440,7 +440,7 @@ ID3v2Frame::ID3v2Frame ( XMP_Uns32 id ) : frameDefaults void ID3v2Frame::release() { - if ( this->content != 0 ) delete this->content; + if ( this->content != 0 ) delete [] this->content; this->content = 0; this->contentSize = 0; } |