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

Fix some "signed shift" warnings.

Browse Source
This commit is contained in:
Kevin Backhouse 2022-07-05 18:34:57 +01:00
parent fc0e0506a1
commit b3f2ab5988
No known key found for this signature in database
GPG Key ID: 9DD01852EE40366E
6 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/config.h.cmake
View File

@ -62,10 +62,10 @@
/* Define to the version of this package. */ /* Define to the version of this package. */
#cmakedefine EXV_PACKAGE_VERSION "@PROJECT_VERSION@" #cmakedefine EXV_PACKAGE_VERSION "@PROJECT_VERSION@"
#define EXIV2_MAJOR_VERSION (@PROJECT_VERSION_MAJOR@) #define EXIV2_MAJOR_VERSION (@PROJECT_VERSION_MAJOR@U)
#define EXIV2_MINOR_VERSION (@PROJECT_VERSION_MINOR@) #define EXIV2_MINOR_VERSION (@PROJECT_VERSION_MINOR@U)
#define EXIV2_PATCH_VERSION (@PROJECT_VERSION_PATCH@) #define EXIV2_PATCH_VERSION (@PROJECT_VERSION_PATCH@U)
#define EXIV2_TWEAK_VERSION (@PROJECT_VERSION_TWEAK@) #define EXIV2_TWEAK_VERSION (@PROJECT_VERSION_TWEAK@U)
// Definition to enable translation of Nikon lens names. // Definition to enable translation of Nikon lens names.
#cmakedefine EXV_HAVE_LENSDATA #cmakedefine EXV_HAVE_LENSDATA

6
include/exiv2/version.hpp
View File

@ -72,9 +72,9 @@
// namespace extensions // namespace extensions
namespace Exiv2 { namespace Exiv2 {
/*! /*!
@brief Return the version of %Exiv2 available at runtime as an integer. @brief Return the version of %Exiv2 available at runtime as a uint32_t.
*/ */
EXIV2API int versionNumber(); EXIV2API uint32_t versionNumber();
/*! /*!
@brief Return the version string Example: "0.25.0" (major.minor.patch) @brief Return the version string Example: "0.25.0" (major.minor.patch)
*/ */
@ -96,7 +96,7 @@ EXIV2API const char* version();
Versions are denoted using a triplet of integers: \em major.minor.patch . Versions are denoted using a triplet of integers: \em major.minor.patch .
The fourth version number is designated a "tweak" an used by Release Candidates The fourth version number is designated a "tweak" an used by Release Candidates
*/ */
EXIV2API bool testVersion(int major, int minor, int patch); EXIV2API bool testVersion(uint32_t major, uint32_t minor, uint32_t patch);
/*! /*!
@brief dumpLibraryInfo implements the exiv2 option --version --verbose @brief dumpLibraryInfo implements the exiv2 option --version --verbose
used by exiv2 test suite to inspect libraries loaded at run-time used by exiv2 test suite to inspect libraries loaded at run-time

3
include/exiv2/webpimage.hpp
View File

@ -70,7 +70,8 @@ class EXIV2API WebPImage : public Image {
static bool equalsWebPTag(Exiv2::DataBuf& buf, const char* str); static bool equalsWebPTag(Exiv2::DataBuf& buf, const char* str);
void debugPrintHex(byte* data, size_t size); void debugPrintHex(byte* data, size_t size);
void decodeChunks(uint32_t filesize); void decodeChunks(uint32_t filesize);
void inject_VP8X(BasicIo& iIo, bool has_xmp, bool has_exif, bool has_alpha, bool has_icc, int width, int height); void inject_VP8X(BasicIo& iIo, bool has_xmp, bool has_exif, bool has_alpha, bool has_icc, uint32_t width,
uint32_t height);
/* Misc. */ /* Misc. */
static constexpr byte WEBP_PAD_ODD = 0; static constexpr byte WEBP_PAD_ODD = 0;
static constexpr int WEBP_TAG_SIZE = 0x4; static constexpr int WEBP_TAG_SIZE = 0x4;

48
src/types.cpp
View File

@ -332,26 +332,26 @@ double getDouble(const byte* buf, ByteOrder byteOrder) {
long us2Data(byte* buf, uint16_t s, ByteOrder byteOrder) { long us2Data(byte* buf, uint16_t s, ByteOrder byteOrder) {
if (byteOrder == littleEndian) { if (byteOrder == littleEndian) {
buf[0] = static_cast<byte>(s & 0x00ff); buf[0] = static_cast<byte>(s & 0x00ffU);
buf[1] = static_cast<byte>((s & 0xff00) >> 8); buf[1] = static_cast<byte>((s & 0xff00U) >> 8);
} else { } else {
buf[0] = static_cast<byte>((s & 0xff00) >> 8); buf[0] = static_cast<byte>((s & 0xff00U) >> 8);
buf[1] = static_cast<byte>(s & 0x00ff); buf[1] = static_cast<byte>(s & 0x00ffU);
} }
return 2; return 2;
} }
long ul2Data(byte* buf, uint32_t l, ByteOrder byteOrder) { long ul2Data(byte* buf, uint32_t l, ByteOrder byteOrder) {
if (byteOrder == littleEndian) { if (byteOrder == littleEndian) {
buf[0] = static_cast<byte>(l & 0x000000ff); buf[0] = static_cast<byte>(l & 0x000000ffU);
buf[1] = static_cast<byte>((l & 0x0000ff00) >> 8); buf[1] = static_cast<byte>((l & 0x0000ff00U) >> 8);
buf[2] = static_cast<byte>((l & 0x00ff0000) >> 16); buf[2] = static_cast<byte>((l & 0x00ff0000U) >> 16);
buf[3] = static_cast<byte>((l & 0xff000000) >> 24); buf[3] = static_cast<byte>((l & 0xff000000U) >> 24);
} else { } else {
buf[0] = static_cast<byte>((l & 0xff000000) >> 24); buf[0] = static_cast<byte>((l & 0xff000000U) >> 24);
buf[1] = static_cast<byte>((l & 0x00ff0000) >> 16); buf[1] = static_cast<byte>((l & 0x00ff0000U) >> 16);
buf[2] = static_cast<byte>((l & 0x0000ff00) >> 8); buf[2] = static_cast<byte>((l & 0x0000ff00U) >> 8);
buf[3] = static_cast<byte>(l & 0x000000ff); buf[3] = static_cast<byte>(l & 0x000000ffU);
} }
return 4; return 4;
} }
@ -379,26 +379,26 @@ long ur2Data(byte* buf, URational l, ByteOrder byteOrder) {
long s2Data(byte* buf, int16_t s, ByteOrder byteOrder) { long s2Data(byte* buf, int16_t s, ByteOrder byteOrder) {
if (byteOrder == littleEndian) { if (byteOrder == littleEndian) {
buf[0] = static_cast<byte>(s & 0x00ff); buf[0] = static_cast<byte>(s & 0x00ffU);
buf[1] = static_cast<byte>((s & 0xff00) >> 8); buf[1] = static_cast<byte>((s & 0xff00U) >> 8);
} else { } else {
buf[0] = static_cast<byte>((s & 0xff00) >> 8); buf[0] = static_cast<byte>((s & 0xff00U) >> 8);
buf[1] = static_cast<byte>(s & 0x00ff); buf[1] = static_cast<byte>(s & 0x00ffU);
} }
return 2; return 2;
} }
long l2Data(byte* buf, int32_t l, ByteOrder byteOrder) { long l2Data(byte* buf, int32_t l, ByteOrder byteOrder) {
if (byteOrder == littleEndian) { if (byteOrder == littleEndian) {
buf[0] = static_cast<byte>(l & 0x000000ff); buf[0] = static_cast<byte>(l & 0x000000ffU);
buf[1] = static_cast<byte>((l & 0x0000ff00) >> 8); buf[1] = static_cast<byte>((l & 0x0000ff00U) >> 8);
buf[2] = static_cast<byte>((l & 0x00ff0000) >> 16); buf[2] = static_cast<byte>((l & 0x00ff0000U) >> 16);
buf[3] = static_cast<byte>((l & 0xff000000) >> 24); buf[3] = static_cast<byte>((l & 0xff000000U) >> 24);
} else { } else {
buf[0] = static_cast<byte>((l & 0xff000000) >> 24); buf[0] = static_cast<byte>((l & 0xff000000U) >> 24);
buf[1] = static_cast<byte>((l & 0x00ff0000) >> 16); buf[1] = static_cast<byte>((l & 0x00ff0000U) >> 16);
buf[2] = static_cast<byte>((l & 0x0000ff00) >> 8); buf[2] = static_cast<byte>((l & 0x0000ff00U) >> 8);
buf[3] = static_cast<byte>(l & 0x000000ff); buf[3] = static_cast<byte>(l & 0x000000ffU);
} }
return 4; return 4;
} }

4
src/version.cpp
View File

@ -58,7 +58,7 @@
#endif #endif
namespace Exiv2 { namespace Exiv2 {
int versionNumber() { uint32_t versionNumber() {
return EXIV2_MAKE_VERSION(EXIV2_MAJOR_VERSION, EXIV2_MINOR_VERSION, EXIV2_PATCH_VERSION); return EXIV2_MAKE_VERSION(EXIV2_MAJOR_VERSION, EXIV2_MINOR_VERSION, EXIV2_PATCH_VERSION);
} }
@ -78,7 +78,7 @@ const char* version() {
return EXV_PACKAGE_VERSION; return EXV_PACKAGE_VERSION;
} }
bool testVersion(int major, int minor, int patch) { bool testVersion(uint32_t major, uint32_t minor, uint32_t patch) {
return versionNumber() >= EXIV2_MAKE_VERSION(major, minor, patch); return versionNumber() >= EXIV2_MAKE_VERSION(major, minor, patch);
} }
} // namespace Exiv2 } // namespace Exiv2

16
src/webpimage.cpp
View File

@ -132,8 +132,8 @@ void WebPImage::doWriteMetadata(BasicIo& outIo) {
bool has_alpha = false; bool has_alpha = false;
bool has_icc = iccProfileDefined(); bool has_icc = iccProfileDefined();
int width = 0; uint32_t width = 0;
int height = 0; uint32_t height = 0;
byte size_buff[WEBP_TAG_SIZE]; byte size_buff[WEBP_TAG_SIZE];
Blob blob; Blob blob;
@ -244,8 +244,8 @@ void WebPImage::doWriteMetadata(BasicIo& outIo) {
// Fetch height - 14 bits wide // Fetch height - 14 bits wide
memcpy(&size_buf_h, payload.c_data(2), 3); memcpy(&size_buf_h, payload.c_data(2), 3);
size_buf_h[0] = ((size_buf_h[0] >> 6) & 0x3) | ((size_buf_h[1] & 0x3F) << 0x2); size_buf_h[0] = ((size_buf_h[0] >> 6) & 0x3) | ((size_buf_h[1] & 0x3FU) << 0x2);
size_buf_h[1] = ((size_buf_h[1] >> 6) & 0x3) | ((size_buf_h[2] & 0xF) << 0x2); size_buf_h[1] = ((size_buf_h[1] >> 6) & 0x3) | ((size_buf_h[2] & 0xFU) << 0x2);
height = Exiv2::getUShort(size_buf_h, littleEndian) + 1; height = Exiv2::getUShort(size_buf_h, littleEndian) + 1;
} }
@ -567,8 +567,8 @@ void WebPImage::decodeChunks(uint32_t filesize) {
// Fetch height // Fetch height
memcpy(&size_buf_h, payload.c_data(2), 3); memcpy(&size_buf_h, payload.c_data(2), 3);
size_buf_h[0] = ((size_buf_h[0] >> 6) & 0x3) | ((size_buf_h[1] & 0x3F) << 0x2); size_buf_h[0] = ((size_buf_h[0] >> 6) & 0x3) | ((size_buf_h[1] & 0x3FU) << 0x2);
size_buf_h[1] = ((size_buf_h[1] >> 6) & 0x3) | ((size_buf_h[2] & 0xF) << 0x2); size_buf_h[1] = ((size_buf_h[1] >> 6) & 0x3) | ((size_buf_h[2] & 0xFU) << 0x2);
pixelHeight_ = Exiv2::getUShort(size_buf_h, littleEndian) + 1; pixelHeight_ = Exiv2::getUShort(size_buf_h, littleEndian) + 1;
} else if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_ANMF) && !has_canvas_data) { } else if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_ANMF) && !has_canvas_data) {
enforce(size >= 12, Exiv2::ErrorCode::kerCorruptedMetadata); enforce(size >= 12, Exiv2::ErrorCode::kerCorruptedMetadata);
@ -737,8 +737,8 @@ bool WebPImage::equalsWebPTag(Exiv2::DataBuf& buf, const char* str) {
@param has_exif Verify if we have exif data and set required flag @param has_exif Verify if we have exif data and set required flag
@return Returns void @return Returns void
*/ */
void WebPImage::inject_VP8X(BasicIo& iIo, bool has_xmp, bool has_exif, bool has_alpha, bool has_icc, int width, void WebPImage::inject_VP8X(BasicIo& iIo, bool has_xmp, bool has_exif, bool has_alpha, bool has_icc, uint32_t width,
int height) { uint32_t height) {
byte size[4] = {0x0A, 0x00, 0x00, 0x00}; byte size[4] = {0x0A, 0x00, 0x00, 0x00};
byte data[10] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; byte data[10] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
iIo.write(reinterpret_cast<const byte*>(WEBP_CHUNK_HEADER_VP8X), WEBP_TAG_SIZE); iIo.write(reinterpret_cast<const byte*>(WEBP_CHUNK_HEADER_VP8X), WEBP_TAG_SIZE);