From kde-commits  Sun Feb 13 12:45:24 2011
From: =?utf-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= <lalinsky () gmail ! com>
Date: Sun, 13 Feb 2011 12:45:24 +0000
To: kde-commits
Subject: kdesupport/taglib
Message-Id: <20110213124524.BF5C2AC8D0 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129760116213703

SVN commit 1220246 by lalinsky:

Automatically generate the version number in taglib-config

 M  +1 -1      taglib-config.cmake  
 M  +1 -1      taglib/asf/asffile.cpp  


--- trunk/kdesupport/taglib/taglib-config.cmake #1220245:1220246
@@ -35,7 +35,7 @@
 	  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
--- trunk/kdesupport/taglib/taglib/asf/asffile.cpp #1220245:1220246
@@ -149,7 +149,7 @@
 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;