summaryrefslogtreecommitdiff
path: root/XMPFiles
diff options
context:
space:
mode:
authorHubert Figuière <hub@figuiere.net>2016-07-25 22:05:16 -0400
committerHubert Figuière <hub@figuiere.net>2016-07-25 22:10:10 -0400
commit531ec43e276ac3564047241f5bebf8e76c60b18d (patch)
treebe5a400dd489a3d056ed957a45039725e41bf234 /XMPFiles
parent62a561bd4d045364ac7fbee4f0ee563651f08938 (diff)
webp: fix code style
Diffstat (limited to 'XMPFiles')
-rw-r--r--XMPFiles/source/FileHandlers/WEBP_Handler.cpp21
-rw-r--r--XMPFiles/source/FileHandlers/WEBP_Handler.hpp2
-rw-r--r--XMPFiles/source/FormatSupport/WEBP_Support.cpp3
3 files changed, 17 insertions, 9 deletions
diff --git a/XMPFiles/source/FileHandlers/WEBP_Handler.cpp b/XMPFiles/source/FileHandlers/WEBP_Handler.cpp
index 2a4cdeb..e06c919 100644
--- a/XMPFiles/source/FileHandlers/WEBP_Handler.cpp
+++ b/XMPFiles/source/FileHandlers/WEBP_Handler.cpp
@@ -35,10 +35,12 @@ bool WEBP_CheckFormat(XMP_FileFormat format, XMP_StringPtr filePath,
XMP_Uns8 chunkID[12];
file->ReadAll(chunkID, 12);
- if (!CheckBytes(&chunkID[0], "RIFF", 4))
+ if (!CheckBytes(&chunkID[0], "RIFF", 4)) {
return false;
- if (CheckBytes(&chunkID[8], "WEBP", 4) && format == kXMP_WEBPFile)
+ }
+ if (CheckBytes(&chunkID[8], "WEBP", 4) && format == kXMP_WEBPFile) {
return true;
+ }
return false;
}
@@ -54,14 +56,18 @@ WEBP_MetaHandler::WEBP_MetaHandler(XMPFiles* parent) : exifMgr(0)
WEBP_MetaHandler::~WEBP_MetaHandler()
{
- if (this->mainChunk)
+ if (this->mainChunk) {
delete this->mainChunk;
- if (this->exifMgr)
+ }
+ if (this->exifMgr) {
delete this->exifMgr;
- if (this->iptcMgr)
+ }
+ if (this->iptcMgr) {
delete this->iptcMgr;
- if (this->psirMgr)
+ }
+ if (this->psirMgr) {
delete this->psirMgr;
+ }
}
void WEBP_MetaHandler::CacheFileData()
@@ -126,8 +132,9 @@ void WEBP_MetaHandler::ProcessXMP()
}
if (haveExif) {
XMP_OptionBits options = k2XMP_FileHadExif;
- if (this->containsXMP)
+ if (this->containsXMP) {
options |= k2XMP_FileHadXMP;
+ }
TIFF_Manager& exif = *this->exifMgr;
PSIR_Manager& psir = *this->psirMgr;
IPTC_Manager& iptc = *this->iptcMgr;
diff --git a/XMPFiles/source/FileHandlers/WEBP_Handler.hpp b/XMPFiles/source/FileHandlers/WEBP_Handler.hpp
index 52c5e7c..792f6b1 100644
--- a/XMPFiles/source/FileHandlers/WEBP_Handler.hpp
+++ b/XMPFiles/source/FileHandlers/WEBP_Handler.hpp
@@ -40,7 +40,7 @@ public:
// The PSIR_Manager and IPTC_Manager aren't actually used, but they need
// to be instantiated and passed to the function that reconciles EXIF and
// XMP data.
- PSIR_Manager* psirMgr;
+ PSIR_Manager* psirMgr;
IPTC_Manager* iptcMgr;
};
diff --git a/XMPFiles/source/FormatSupport/WEBP_Support.cpp b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
index 5d56b4b..329e666 100644
--- a/XMPFiles/source/FormatSupport/WEBP_Support.cpp
+++ b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
@@ -109,7 +109,8 @@ void XMPChunk::write(WEBP_MetaHandler* handler)
}
}
-VP8XChunk::VP8XChunk(Container* parent) : Chunk(parent, kChunk_VP8X)
+VP8XChunk::VP8XChunk(Container* parent)
+ : Chunk(parent, kChunk_VP8X)
{
this->needsRewrite = true;
this->size = 10;