Fix mismatched file I/O buffer sizes.

diff --git a/taglib/toolkit/tfile.cpp b/taglib/toolkit/tfile.cpp
index af8ec3901b64e2f69f6320b0d1e68c640e1731ef..a01c346080dee07c4f8166255f844c1e1736deb2 100644 (file)
--- a/taglib/toolkit/tfile.cpp
+++ b/taglib/toolkit/tfile.cpp
@@ -66,15 +66,6 @@
 
 using namespace TagLib;
 
-namespace
-{
-#ifdef _WIN32
-  const TagLib::uint BufferSize = 8192;
-#else
-  const TagLib::uint BufferSize = 1024;
-#endif
-}
-
 class File::FilePrivate
 {
 public:
@@ -499,7 +490,7 @@ bool File::isWritable(const char *file)
 
 TagLib::uint File::bufferSize()
 {
-  return BufferSize;
+  return 1024;
 }
 
 void File::setValid(bool valid)

diff --git a/taglib/toolkit/tfilestream.cpp b/taglib/toolkit/tfilestream.cpp
index 93078ae950eb1421fc9a243f1f53cb24f94f93c5..4480c274faa47a070c81eefb2c0bc1bd0e7f7a2d 100644 (file)
--- a/taglib/toolkit/tfilestream.cpp
+++ b/taglib/toolkit/tfilestream.cpp
@@ -45,7 +45,6 @@ namespace
   typedef FileName FileNameHandle;
   typedef HANDLE FileHandle;
 
-  const TagLib::uint BufferSize = 8192;
   const FileHandle InvalidFileHandle = INVALID_HANDLE_VALUE;
 
   inline FileHandle openFile(const FileName &path, bool readOnly)
@@ -93,7 +92,6 @@ namespace
 
   typedef FILE* FileHandle;
 
-  const TagLib::uint BufferSize = 8192;
   const FileHandle InvalidFileHandle = 0;
 
   inline FileHandle openFile(const FileName &path, bool readOnly)
@@ -497,5 +495,5 @@ void FileStream::truncate(long length)
 
 TagLib::uint FileStream::bufferSize()
 {
-  return BufferSize;
+  return 1024;
 }