From: Scott Wheeler <scott@directededge.com>
Date: Tue, 10 Sep 2019 22:58:18 +0000 (+0200)
Subject: Revert switch to other static size method
X-Git-Tag: v1.12-beta-1~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b99cd9bac52e0aa398b46511580b2a6aba393cf;p=taglib

Revert switch to other static size method

This was based on a misread of the header:  at present there is no
non-static size() method, so removing the argument makes the behavior
incorrect.
---

diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
index be07754a..ad598332 100644
--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
@@ -169,7 +169,7 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, const Header *tagHe
   if(version > 3 && (tagHeader->unsynchronisation() || header->unsynchronisation())) {
     // Data lengths are not part of the encoded data, but since they are synch-safe
     // integers they will be never actually encoded.
-    ByteVector frameData = data.mid(header->size(), header->frameSize());
+    ByteVector frameData = data.mid(Frame::Header::size(version), header->frameSize());
     frameData = SynchData::decode(frameData);
     data = data.mid(0, Frame::Header::size(version)) + frameData;
   }