Silence some MSVC2015 specific warnings.

diff --git a/taglib/mp4/mp4atom.cpp b/taglib/mp4/mp4atom.cpp
index bd9c7b1695986a993a285b67e7dd992a219563b2..5e94690f5f82cbbdf6c2f8fef2d0fb97af1c7fca 100644 (file)
--- a/taglib/mp4/mp4atom.cpp
+++ b/taglib/mp4/mp4atom.cpp
@@ -59,12 +59,12 @@ MP4::Atom::Atom(File *file)
   if(length == 1) {
     const long long longLength = file->readBlock(8).toLongLong();
     if(sizeof(long) == sizeof(long long)) {
-      length = longLength;
+      length = static_cast<long>(longLength);
     }
     else {
       if(longLength <= LONG_MAX) {
         // The atom has a 64-bit length, but it's actually a 31-bit value
-        length = (long)longLength;
+        length = static_cast<long>(longLength);
       }
       else {
         debug("MP4: 64-bit atoms are not supported");

diff --git a/taglib/mpeg/id3v2/frames/chapterframe.cpp b/taglib/mpeg/id3v2/frames/chapterframe.cpp
index 6024ca7e4c022d2b5bc77dccedb98f87d9733b34..a424cb3c4f2611ebc60f343113998821e5ad5c21 100644 (file)
--- a/taglib/mpeg/id3v2/frames/chapterframe.cpp
+++ b/taglib/mpeg/id3v2/frames/chapterframe.cpp
@@ -263,7 +263,7 @@ void ChapterFrame::parseFields(const ByteVector &data)
     return;
 
   while((uint)embPos < size - header()->size()) {
-    Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos), d->tagHeader);
+    Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos), (d->tagHeader != 0));
 
     if(!frame)
       return;

diff --git a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
index 5a9bf791c3e35cfcce6edc590867200f8cd5ced5..bdcc11830e10a6062de5fddd06a5d5a024f4bc84 100644 (file)
--- a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
+++ b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
@@ -286,7 +286,7 @@ void TableOfContentsFrame::parseFields(const ByteVector &data)
     return;
 
   while(embPos < size - header()->size()) {
-    Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos), d->tagHeader);
+    Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos), (d->tagHeader != 0));
 
     if(!frame)
       return;