From 7c776935e4e1c7aa8e1f2f41db930648d1f72cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= Date: Sun, 30 Jan 2011 12:50:38 +0000 Subject: [PATCH] Revert r1217775 Please see my post in the mailing list. This can be done, but in a different way. CCMAIL:shafff@ukr.net git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1218000 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- taglib/asf/asffile.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/taglib/asf/asffile.cpp b/taglib/asf/asffile.cpp index b7057c65..5c23ceb3 100644 --- a/taglib/asf/asffile.cpp +++ b/taglib/asf/asffile.cpp @@ -320,23 +320,18 @@ void ASF::File::HeaderExtensionObject::parse(ASF::File *file, uint /*size*/) while(dataPos < dataSize) { ByteVector guid = file->readBlock(16); long long size = file->readQWORD(); - BaseObject *obj = 0; + BaseObject *obj; if(guid == metadataGuid) { obj = new MetadataObject(); } else if(guid == metadataLibraryGuid) { obj = new MetadataLibraryObject(); } -//FIXME this UnknownObject can be as large as whole file, so i disable it for now --Nick Shaforostoff -/* else { obj = new UnknownObject(guid); } -*/ - if(obj) { - obj->parse(file, size); - objects.append(obj); - } + obj->parse(file, size); + objects.append(obj); dataPos += size; } } @@ -365,7 +360,6 @@ ASF::File::File(FileName file, bool readProperties, Properties::ReadStyle proper ASF::File::~File() { for(unsigned int i = 0; i < d->objects.size(); i++) { - d->objects[i]->data.clear(); delete d->objects[i]; } if(d->tag) {