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;