From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Fri, 31 Jul 2015 03:23:01 +0000 (+0900)
Subject: Silence some MSVC2015 specific warnings.
X-Git-Tag: v1.10beta~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ad69a81dc08b1482ed150388bb6dc87e515f68f;p=taglib

Silence some MSVC2015 specific warnings.
---

diff --git a/taglib/mp4/mp4atom.cpp b/taglib/mp4/mp4atom.cpp
index bd9c7b16..5e94690f 100644
--- 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 6024ca7e..a424cb3c 100644
--- 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 5a9bf791..bdcc1183 100644
--- 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;