From be8fff376892f67fbd1412820c36f6211e686e9d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= Date: Sun, 13 Feb 2011 12:45:24 +0000 Subject: [PATCH] Automatically generate the version number in taglib-config git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1220246 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- taglib-config.cmake | 2 +- taglib/asf/asffile.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/taglib-config.cmake b/taglib-config.cmake index ccec06f6..2c2d2dbc 100644 --- a/taglib-config.cmake +++ b/taglib-config.cmake @@ -35,7 +35,7 @@ do flags="$flags -I$includedir/taglib" ;; --version) - echo 1.7.0 + echo ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION} ;; --prefix) echo $prefix diff --git a/taglib/asf/asffile.cpp b/taglib/asf/asffile.cpp index 5c23ceb3..0a947472 100644 --- a/taglib/asf/asffile.cpp +++ b/taglib/asf/asffile.cpp @@ -149,7 +149,7 @@ public: void ASF::File::BaseObject::parse(ASF::File *file, unsigned int size) { data.clear(); - if (size > 24 && size <= file->length()) + if (size > 24 && size <= (unsigned int)(file->length())) data = file->readBlock(size - 24); else data = ByteVector::null; -- 2.40.0