From 28470221c0fd15801e8c7f71d9113814794951b9 Mon Sep 17 00:00:00 2001
From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Mon, 31 Oct 2016 01:03:33 +0900
Subject: [PATCH] Suppress MSVC warnings about narrowing conversions.

---
 taglib/asf/asfutils.h    | 2 +-
 taglib/fileref.cpp       | 2 +-
 taglib/ogg/oggpage.cpp   | 4 ++--
 taglib/ogg/oggpage.h     | 2 +-
 taglib/riff/rifffile.cpp | 4 ++--
 taglib/toolkit/tzlib.cpp | 4 ++--
 taglib/xm/xmfile.cpp     | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/taglib/asf/asfutils.h b/taglib/asf/asfutils.h
index 29b0c0fb..736fe9bb 100644
--- a/taglib/asf/asfutils.h
+++ b/taglib/asf/asfutils.h
@@ -73,7 +73,7 @@ namespace TagLib
       inline String readString(File *file, int length)
       {
         ByteVector data = file->readBlock(length);
-        unsigned int size = data.size();
+        size_t size = data.size();
         while (size >= 2) {
           if(data[size - 1] != '\0' || data[size - 2] != '\0') {
             break;
diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp
index 938f68b2..56f6ef28 100644
--- a/taglib/fileref.cpp
+++ b/taglib/fileref.cpp
@@ -119,7 +119,7 @@ namespace
       return file;
 
 #ifdef _WIN32
-    const String s = toFileName(arg).toString();
+    const String s(toFileName(arg).wstr());
 #else
     const String s(toFileName(arg));
 #endif
diff --git a/taglib/ogg/oggpage.cpp b/taglib/ogg/oggpage.cpp
index 911cc7ca..d95c2cfe 100644
--- a/taglib/ogg/oggpage.cpp
+++ b/taglib/ogg/oggpage.cpp
@@ -132,9 +132,9 @@ Ogg::Page::ContainsPacketFlags Ogg::Page::containsPacket(int index) const
   return flags;
 }
 
-size_t Ogg::Page::packetCount() const
+unsigned int Ogg::Page::packetCount() const
 {
-  return d->header.packetSizes().size();
+  return static_cast<unsigned int>(d->header.packetSizes().size());
 }
 
 ByteVectorList Ogg::Page::packets() const
diff --git a/taglib/ogg/oggpage.h b/taglib/ogg/oggpage.h
index a8c689b8..7d8d54f5 100644
--- a/taglib/ogg/oggpage.h
+++ b/taglib/ogg/oggpage.h
@@ -138,7 +138,7 @@ namespace TagLib {
       /*!
        * Returns the number of packets (whole or partial) in this page.
        */
-      size_t packetCount() const;
+      unsigned int packetCount() const;
 
       /*!
        * Returns a list of the packets in this page.
diff --git a/taglib/riff/rifffile.cpp b/taglib/riff/rifffile.cpp
index 83251109..a3df492b 100644
--- a/taglib/riff/rifffile.cpp
+++ b/taglib/riff/rifffile.cpp
@@ -184,7 +184,7 @@ void RIFF::File::setChunkData(unsigned int i, const ByteVector &data)
 
   writeChunk(it->name, data, it->offset - 8, it->size + it->padding + 8);
 
-  it->size    = data.size();
+  it->size    = static_cast<unsigned int>(data.size());
   it->padding = data.size() % 2;
 
   const long long diff = static_cast<long long>(it->size) + it->padding - originalSize;
@@ -253,7 +253,7 @@ void RIFF::File::setChunkData(const ByteVector &name, const ByteVector &data, bo
 
   Chunk chunk;
   chunk.name    = name;
-  chunk.size    = data.size();
+  chunk.size    = static_cast<unsigned int>(data.size());
   chunk.offset  = offset + 8;
   chunk.padding = data.size() % 2;
 
diff --git a/taglib/toolkit/tzlib.cpp b/taglib/toolkit/tzlib.cpp
index 40158fd2..118e723e 100644
--- a/taglib/toolkit/tzlib.cpp
+++ b/taglib/toolkit/tzlib.cpp
@@ -115,9 +115,9 @@ ByteVector zlib::decompress(const ByteVector &data)
 
     std::streamsize write(char const* s, std::streamsize n)
     {
-      const unsigned int originalSize = data.size();
+      const size_t originalSize = data.size();
 
-      data.resize(static_cast<unsigned int>(originalSize + n));
+      data.resize(static_cast<size_t>(originalSize + n));
       ::memcpy(data.data() + originalSize, s, static_cast<size_t>(n));
 
       return n;
diff --git a/taglib/xm/xmfile.cpp b/taglib/xm/xmfile.cpp
index bb8d6493..ef48d29f 100644
--- a/taglib/xm/xmfile.cpp
+++ b/taglib/xm/xmfile.cpp
@@ -133,8 +133,8 @@ namespace
     {
       ByteVector data = file.readBlock(std::min(m_size, limit));
       size_t count = data.size();
-      int index = data.find((char) 0);
-      if(index > -1) {
+      size_t index = data.find('\0');
+      if(index != ByteVector::npos()) {
         data.resize(index);
       }
       data.replace('\xff', ' ');