xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed g++-4.3 errors and warnings.

Browse Source
v0.27.3
Andreas Huggel 17 years ago
parent 38be96fe2a
commit 81ff0d6a7c
11 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File

2
config/config.mk.in
Unescape Escape View File

@ -58,7 +58,7 @@ GXX = @GXX@
# Common compiler flags (warnings, symbols [-ggdb], optimization [-O2], etc)
CXXFLAGS = @CXXFLAGS@
ifeq ($(GXX),yes)
CXXFLAGS += -Wall -Wcast-align -Wconversion -Wpointer-arith -Wformat-security -Wmissing-format-attribute -W
CXXFLAGS += -Wall -Wcast-align -Wpointer-arith -Wformat-security -Wmissing-format-attribute -W
endif
# Command to run only the preprocessor

8
src/actions.cpp
Unescape Escape View File

@ -1125,10 +1125,10 @@ namespace Action {
rc = insertThumbnail(path);
}
if ( rc == 0
&& Params::instance().target_ & Params::ctExif
|| Params::instance().target_ & Params::ctIptc
|| Params::instance().target_ & Params::ctComment
|| Params::instance().target_ & Params::ctXmp) {
&& ( Params::instance().target_ & Params::ctExif
|| Params::instance().target_ & Params::ctIptc
|| Params::instance().target_ & Params::ctComment
|| Params::instance().target_ & Params::ctXmp)) {
std::string suffix = Params::instance().suffix_;
if (suffix.empty()) suffix = ".exv";
std::string exvPath = newFilePath(path, suffix);

6
src/cr2image.cpp
Unescape Escape View File

@ -74,9 +74,9 @@ namespace Exiv2 {
{ "*", 0x8649, Group::ifd0, &TiffMetadataDecoder::decodeIptc }
};
const DecoderFct Cr2Decoder::findDecoder(const std::string& make,
uint32_t extendedTag,
uint16_t group)
DecoderFct Cr2Decoder::findDecoder(const std::string& make,
uint32_t extendedTag,
uint16_t group)
{
DecoderFct decoderFct = &TiffMetadataDecoder::decodeStdTiffEntry;
const TiffDecoderInfo* td = find(cr2DecoderInfo_,

6
src/cr2image.hpp
Unescape Escape View File

@ -137,9 +137,9 @@ namespace Exiv2 {
@return Pointer to the decoder function
*/
static const DecoderFct findDecoder(const std::string& make,
uint32_t extendedTag,
uint16_t group);
static DecoderFct findDecoder(const std::string& make,
uint32_t extendedTag,
uint16_t group);
private:
static const TiffDecoderInfo cr2DecoderInfo_[]; //<! CR2 decoder table

2
src/exif.cpp
Unescape Escape View File

@ -959,7 +959,7 @@ namespace Exiv2 {
+ pGpsIfd_->dataSize());
}
if ( maxOffset > pIfd1_->offset()
|| maxOffset > pIfd1_->dataOffset() && pIfd1_->dataOffset() > 0)
|| (maxOffset > pIfd1_->dataOffset() && pIfd1_->dataOffset() > 0))
rc = false;
/*
Todo: Removed condition from the above if(). Should be re-added...

6
src/sigmamn.cpp
Unescape Escape View File

@ -178,10 +178,10 @@ namespace Exiv2 {
int rc = 0;
// Check the SIGMA or FOVEON prefix
if ( header_.size_ < 10
|| std::string(reinterpret_cast<char*>(header_.pData_), 8)
|| ( std::string(reinterpret_cast<char*>(header_.pData_), 8)
!= std::string("SIGMA\0\0\0", 8)
&& std::string(reinterpret_cast<char*>(header_.pData_), 8)
!= std::string("FOVEON\0\0", 8)) {
&& std::string(reinterpret_cast<char*>(header_.pData_), 8)
!= std::string("FOVEON\0\0", 8))) {
rc = 2;
}
return rc;

8
src/tags.cpp
Unescape Escape View File

@ -1269,7 +1269,7 @@ namespace Exiv2 {
const TagInfo* ExifTags::makerTagInfo(uint16_t tag, IfdId ifdId)
{
int i = 0;
for (; i < MAX_MAKER_TAG_INFOS && makerIfdIds_[i] != ifdId; ++i);
for (; i < MAX_MAKER_TAG_INFOS && makerIfdIds_[i] != ifdId; ++i) {}
if (i == MAX_MAKER_TAG_INFOS) return 0;
for (int k = 0; makerTagInfos_[i][k].tag_ != 0xffff; ++k) {
@ -1283,7 +1283,7 @@ namespace Exiv2 {
IfdId ifdId)
{
int i = 0;
for (; i < MAX_MAKER_TAG_INFOS && makerIfdIds_[i] != ifdId; ++i);
for (; i < MAX_MAKER_TAG_INFOS && makerIfdIds_[i] != ifdId; ++i) {}
if (i == MAX_MAKER_TAG_INFOS) return 0;
for (int k = 0; makerTagInfos_[i][k].tag_ != 0xffff; ++k) {
@ -1298,7 +1298,7 @@ namespace Exiv2 {
bool ExifTags::isMakerIfd(IfdId ifdId)
{
int i = 0;
for (; i < MAX_MAKER_TAG_INFOS && makerIfdIds_[i] != ifdId; ++i);
for (; i < MAX_MAKER_TAG_INFOS && makerIfdIds_[i] != ifdId; ++i) {}
return i != MAX_MAKER_TAG_INFOS && makerIfdIds_[i] != IfdId(0);
}
@ -1491,7 +1491,7 @@ namespace Exiv2 {
void ExifTags::makerTaglist(std::ostream& os, IfdId ifdId)
{
int i = 0;
for (; i < MAX_MAKER_TAG_INFOS && makerIfdIds_[i] != ifdId; ++i);
for (; i < MAX_MAKER_TAG_INFOS && makerIfdIds_[i] != ifdId; ++i) {}
if (i != MAX_MAKER_TAG_INFOS) {
const TagInfo* mnTagInfo = makerTagInfos_[i];
for (int k=0; mnTagInfo[k].tag_ != 0xffff; ++k) {

6
src/tifffwd.hpp
Unescape Escape View File

@ -81,9 +81,9 @@ namespace Exiv2 {
/*!
@brief Type for a function pointer for a function to decode a TIFF component.
*/
typedef const DecoderFct (*FindDecoderFct)(const std::string& make,
uint32_t extendedTag,
uint16_t group);
typedef DecoderFct (*FindDecoderFct)(const std::string& make,
uint32_t extendedTag,
uint16_t group);
/*!
@brief Type for a function pointer for a function to create a TIFF component.
Use TiffComponent::AutoPtr, it is not used in this declaration only

6
src/tiffparser.cpp
Unescape Escape View File

@ -148,9 +148,9 @@ namespace Exiv2 {
{ "*", 0x8649, Group::ifd0, &TiffMetadataDecoder::decodeIptc }
};
const DecoderFct TiffDecoder::findDecoder(const std::string& make,
uint32_t extendedTag,
uint16_t group)
DecoderFct TiffDecoder::findDecoder(const std::string& make,
uint32_t extendedTag,
uint16_t group)
{
DecoderFct decoderFct = &TiffMetadataDecoder::decodeStdTiffEntry;
const TiffDecoderInfo* td = find(tiffDecoderInfo_,

6
src/tiffparser.hpp
Unescape Escape View File

@ -118,9 +118,9 @@ namespace Exiv2 {
@return Pointer to the decoder function
*/
static const DecoderFct findDecoder(const std::string& make,
uint32_t extendedTag,
uint16_t group);
static DecoderFct findDecoder(const std::string& make,
uint32_t extendedTag,
uint16_t group);
private:
static const TiffDecoderInfo tiffDecoderInfo_[]; //<! TIFF decoder table

1
xmpsdk/src/XMPCore_Impl.hpp
Unescape Escape View File

@ -24,6 +24,7 @@
#include <map>
#include <cassert>
#include <cstring>
#if XMP_MacBuild
#include <Multiprocessing.h>

Write Preview
Loading…
Cancel
Save