From 6c0227ee13afb5a5aabe0c64c0a7613e62d516dd Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Thu, 23 Aug 2012 19:58:21 +0900 Subject: [PATCH] Fix compilation errors with Visual Studio 2010 --- taglib/ape/apetag.cpp | 2 +- taglib/mpc/mpcproperties.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/taglib/ape/apetag.cpp b/taglib/ape/apetag.cpp index f1af0028..664ee3a8 100644 --- a/taglib/ape/apetag.cpp +++ b/taglib/ape/apetag.cpp @@ -260,7 +260,7 @@ PropertyMap APE::Tag::setProperties(const PropertyMap &origProps) bool APE::Tag::checkKey(const String &key) { - if(key.size() < 2 or key.size() > 16) + if(key.size() < 2 || key.size() > 16) return false; for(String::ConstIterator it = key.begin(); it != key.end(); it++) // only allow printable ASCII including space (32..127) diff --git a/taglib/mpc/mpcproperties.cpp b/taglib/mpc/mpcproperties.cpp index 7046db99..637bb480 100644 --- a/taglib/mpc/mpcproperties.cpp +++ b/taglib/mpc/mpcproperties.cpp @@ -279,10 +279,10 @@ void MPC::Properties::readSV7(const ByteVector &data) } if (d->trackPeak != 0) - d->trackPeak = (int)(log10(d->trackPeak) * 20 * 256 + .5); + d->trackPeak = (int)(log10((double)d->trackPeak) * 20 * 256 + .5); if (d->albumPeak != 0) - d->albumPeak = (int)(log10(d->albumPeak) * 20 * 256 + .5); + d->albumPeak = (int)(log10((double)d->albumPeak) * 20 * 256 + .5); bool trueGapless = (gapless >> 31) & 0x0001; if(trueGapless) {