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

diff --git a/taglib-config.cmake b/taglib-config.cmake
index ccec06f6702e3d9fd1ecd65ea5ffa0c3893713a4..2c2d2dbc49f1c569bb0de06e1ffb4cc13b29978b 100644 (file)
--- 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 5c23ceb3f820d002b4eec8d4815253e17cd4fb5c..0a947472a8751caa40b492a6b3516a98e4153c29 100644 (file)
--- 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;