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

#922. Fixing MSVC warnings.

Browse Source
This commit is contained in:
Robin Mills 2015-04-27 21:33:14 +00:00
parent fd1852da84
commit b1ad7a925c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/image.cpp
View File

@ -356,7 +356,7 @@ namespace Exiv2 {
{
std::string result;
int need = fmt.size()*4; // initial guess
int need = (int) fmt.size()*4; // initial guess
char* buffer = new char[need]; // allocate a buffer
va_list ap; // variable arg list
@ -366,6 +366,7 @@ namespace Exiv2 {
if (need < 0) { // make buffer bigger
delete[] buffer;
need = -need ;
buffer = new char[need+2];
va_start(ap, fmt);
need=vsnprintf(buffer, need, fmt.c_str(), ap);

4
src/tiffimage.cpp
View File

@ -484,8 +484,8 @@ namespace Exiv2 {
: count > 5 ? 5
: count
;
size_t pad = isStringType(type) ? 1 : 0;
size_t size = isStringType(type) ? 1
uint32_t pad = isStringType(type) ? 1 : 0;
uint32_t size = isStringType(type) ? 1
: is2ByteType(type) ? 2
: is4ByteType(type) ? 4
: 1