From be8d71dad8aa3217b263ad22da99df17fbc38a5b Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 17 Dec 2023 15:00:59 -0800
Subject: [PATCH] MSVC: fix signed/unsigned comparison

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 taglib/mpeg/id3v2/id3v2framefactory.cpp | 2 +-
 taglib/toolkit/tfilestream.cpp          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
index b3968b91..785a42a8 100644
--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
@@ -122,7 +122,7 @@ std::pair<Frame::Header *, bool> FrameFactory::prepareFrameHeader(
   // A quick sanity check -- make sure that the frameID is 4 uppercase Latin1
   // characters.  Also make sure that there is data in the frame.
 
-  if(frameID.size() != (version < 3 ? 3 : 4) ||
+  if(frameID.size() != (version < 3U ? 3U : 4U) ||
      header->frameSize() <= static_cast<unsigned int>(header->dataLengthIndicator() ? 4 : 0) ||
      header->frameSize() > data.size())
   {
diff --git a/taglib/toolkit/tfilestream.cpp b/taglib/toolkit/tfilestream.cpp
index 31ce47ef..3898576c 100644
--- a/taglib/toolkit/tfilestream.cpp
+++ b/taglib/toolkit/tfilestream.cpp
@@ -28,6 +28,7 @@
 #ifdef _WIN32
 # include <windows.h>
 #else
+# include <climits>
 # include <cstdio>
 # include <unistd.h>
 #endif
@@ -326,7 +327,8 @@ void FileStream::removeBlock(offset_t start, size_t length)
 
   ByteVector buffer(bufferLength);
 
-  for(unsigned int bytesRead = -1; bytesRead != 0;) {
+  unsigned int bytesRead = UINT_MAX;
+  while(bytesRead != 0) {
     seek(readPosition);
     bytesRead = static_cast<unsigned int>(readFile(d->file, buffer));
     readPosition += bytesRead;