include/vcl/animate/Animation.hxx | 6 +-
vcl/source/animate/Animation.cxx | 91 +++++++++++++++++++-------------------
2 files changed, 49 insertions(+), 48 deletions(-)
New commits:
commit 7e81b2292fa881f5c6efecd259fbbb82a1c75759
Author: Chris Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Sat May 21 03:09:27 2022 +1000
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Wed Jun 15 15:28:03 2022 +0200
vcl: change maList in Animation to maFrames
Change-Id: I2358434ffa3aff8bda16576bf8849eed52a3edd2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/76401
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/include/vcl/animate/Animation.hxx
b/include/vcl/animate/Animation.hxx
index 94cefee2e570..809b8eac434d 100644
--- a/include/vcl/animate/Animation.hxx
+++ b/include/vcl/animate/Animation.hxx
@@ -66,8 +66,8 @@ public:
void SetNotifyHdl(const Link<Animation*, void>& rLink) { maNotifyLink =
rLink; }
const Link<Animation*, void>& GetNotifyHdl() const { return maNotifyLink; }
- std::vector<std::unique_ptr<AnimationBitmap>>& GetAnimationFrames() {
return maList; }
- size_t Count() const { return maList.size(); }
+ std::vector<std::unique_ptr<AnimationBitmap>>& GetAnimationFrames() {
return maFrames; }
+ size_t Count() const { return maFrames.size(); }
bool Insert(const AnimationBitmap& rAnimationBitmap);
const AnimationBitmap& Get(sal_uInt16 nAnimation) const;
void Replace(const AnimationBitmap& rNewAnimationBmp, sal_uInt16
nAnimation);
@@ -96,7 +96,7 @@ public:
private:
SAL_DLLPRIVATE static sal_uLong mnAnimCount;
- std::vector<std::unique_ptr<AnimationBitmap>> maList;
+ std::vector<std::unique_ptr<AnimationBitmap>> maFrames;
std::vector<std::unique_ptr<ImplAnimView>> maViewList;
Link<Animation*, void> maNotifyLink;
diff --git a/vcl/source/animate/Animation.cxx b/vcl/source/animate/Animation.cxx
index ae7fc1a214fb..e1086cd8d3eb 100644
--- a/vcl/source/animate/Animation.cxx
+++ b/vcl/source/animate/Animation.cxx
@@ -53,8 +53,8 @@ Animation::Animation(const Animation& rAnimation)
, mbIsInAnimation(false)
, mbLoopTerminated(rAnimation.mbLoopTerminated)
{
- for (auto const& i : rAnimation.maList)
- maList.emplace_back(new AnimationBitmap(*i));
+ for (auto const& i : rAnimation.maFrames)
+ maFrames.emplace_back(new AnimationBitmap(*i));
maTimer.SetInvokeHandler(LINK(this, Animation, ImplTimeoutHdl));
mnLoops = mbLoopTerminated ? 0 : mnLoopCount;
@@ -72,8 +72,8 @@ Animation& Animation::operator=(const Animation& rAnimation)
{
Clear();
- for (auto const& i : rAnimation.maList)
- maList.emplace_back(new AnimationBitmap(*i));
+ for (auto const& i : rAnimation.maFrames)
+ maFrames.emplace_back(new AnimationBitmap(*i));
maGlobalSize = rAnimation.maGlobalSize;
maBitmapEx = rAnimation.maBitmapEx;
@@ -87,9 +87,9 @@ Animation& Animation::operator=(const Animation& rAnimation)
bool Animation::operator==(const Animation& rAnimation) const
{
- return maList.size() == rAnimation.maList.size() && maBitmapEx ==
rAnimation.maBitmapEx
+ return maFrames.size() == rAnimation.maFrames.size() && maBitmapEx ==
rAnimation.maBitmapEx
&& maGlobalSize == rAnimation.maGlobalSize
- && std::equal(maList.begin(), maList.end(),
rAnimation.maList.begin(),
+ && std::equal(maFrames.begin(), maFrames.end(),
rAnimation.maFrames.begin(),
[](const std::unique_ptr<AnimationBitmap>& pAnim1,
const std::unique_ptr<AnimationBitmap>& pAnim2) ->
bool {
return *pAnim1 == *pAnim2;
@@ -102,7 +102,7 @@ void Animation::Clear()
mbIsInAnimation = false;
maGlobalSize = Size();
maBitmapEx.SetEmpty();
- maList.clear();
+ maFrames.clear();
maViewList.clear();
}
@@ -116,7 +116,7 @@ bool Animation::IsTransparent() const
// graphics due to performance reasons.
return maBitmapEx.IsAlpha()
- || std::any_of(maList.begin(), maList.end(),
+ || std::any_of(maFrames.begin(), maFrames.end(),
[&aRect](const std::unique_ptr<AnimationBitmap>&
pAnim) -> bool {
return pAnim->meDisposal == Disposal::Back
&& tools::Rectangle{
pAnim->maPositionPixel,
@@ -129,7 +129,7 @@ sal_uLong Animation::GetSizeBytes() const
{
sal_uLong nSizeBytes = GetBitmapEx().GetSizeBytes();
- for (auto const& pAnimationBitmap : maList)
+ for (auto const& pAnimationBitmap : maFrames)
{
nSizeBytes += pAnimationBitmap->maBitmapEx.GetSizeBytes();
}
@@ -143,7 +143,7 @@ BitmapChecksum Animation::GetChecksum() const
BitmapChecksumOctetArray aBCOA;
BitmapChecksum nCrc = GetBitmapEx().GetChecksum();
- UInt32ToSVBT32(maList.size(), aBT32);
+ UInt32ToSVBT32(maFrames.size(), aBT32);
nCrc = vcl_get_checksum(nCrc, aBT32, 4);
Int32ToSVBT32(maGlobalSize.Width(), aBT32);
@@ -152,7 +152,7 @@ BitmapChecksum Animation::GetChecksum() const
Int32ToSVBT32(maGlobalSize.Height(), aBT32);
nCrc = vcl_get_checksum(nCrc, aBT32, 4);
- for (auto const& i : maList)
+ for (auto const& i : maFrames)
{
BCToBCOA(i->GetChecksum(), aBCOA);
nCrc = vcl_get_checksum(nCrc, aBCOA, BITMAP_CHECKSUM_SIZE);
@@ -166,10 +166,10 @@ bool Animation::Start(OutputDevice& rOut, const Point&
rDestPt, const Size& rDes
{
bool bRet = false;
- if (!maList.empty())
+ if (!maFrames.empty())
{
if ((rOut.GetOutDevType() == OUTDEV_WINDOW) && !mbLoopTerminated
- && (ANIMATION_TIMEOUT_ON_CLICK != maList[mnPos]->mnWait))
+ && (ANIMATION_TIMEOUT_ON_CLICK != maFrames[mnPos]->mnWait))
{
bool differs = true;
@@ -204,7 +204,7 @@ bool Animation::Start(OutputDevice& rOut, const Point&
rDestPt, const Size& rDes
if (!mbIsInAnimation)
{
- ImplRestartTimer(maList[mnPos]->mnWait);
+ ImplRestartTimer(maFrames[mnPos]->mnWait);
mbIsInAnimation = true;
}
}
@@ -239,15 +239,15 @@ void Animation::Draw(OutputDevice& rOut, const Point&
rDestPt) const
void Animation::Draw(OutputDevice& rOut, const Point& rDestPt, const Size&
rDestSz) const
{
- const size_t nCount = maList.size();
+ const size_t nCount = maFrames.size();
if (!nCount)
return;
- AnimationBitmap* pObj = maList[std::min(mnPos, nCount - 1)].get();
+ AnimationBitmap* pObj = maFrames[std::min(mnPos, nCount - 1)].get();
if (rOut.GetConnectMetaFile() || (rOut.GetOutDevType() == OUTDEV_PRINTER))
- maList[0]->maBitmapEx.Draw(&rOut, rDestPt, rDestSz);
+ maFrames[0]->maBitmapEx.Draw(&rOut, rDestPt, rDestSz);
else if (ANIMATION_TIMEOUT_ON_CLICK == pObj->mnWait)
pObj->maBitmapEx.Draw(&rOut, rDestPt, rDestSz);
else
@@ -277,7 +277,7 @@ void Animation::ImplRestartTimer(sal_uLong nTimeout)
IMPL_LINK_NOARG(Animation, ImplTimeoutHdl, Timer*, void)
{
- const size_t nAnimCount = maList.size();
+ const size_t nAnimCount = maFrames.size();
if (nAnimCount)
{
@@ -330,7 +330,8 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl, Timer*, void)
ImplRestartTimer(10);
else
{
- AnimationBitmap* pStepBmp = (++mnPos < maList.size()) ?
maList[mnPos].get() : nullptr;
+ AnimationBitmap* pStepBmp
+ = (++mnPos < maFrames.size()) ? maFrames[mnPos].get() :
nullptr;
if (!pStepBmp)
{
@@ -339,7 +340,7 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl, Timer*, void)
Stop();
mbLoopTerminated = true;
mnPos = nAnimCount - 1;
- maBitmapEx = maList[mnPos]->maBitmapEx;
+ maBitmapEx = maFrames[mnPos]->maBitmapEx;
return;
}
else
@@ -348,7 +349,7 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl, Timer*, void)
mnLoops--;
mnPos = 0;
- pStepBmp = maList[mnPos].get();
+ pStepBmp = maFrames[mnPos].get();
}
}
@@ -386,10 +387,10 @@ bool Animation::Insert(const AnimationBitmap& rStepBmp)
maGlobalSize
= aGlobalRect.Union(tools::Rectangle(rStepBmp.maPositionPixel,
rStepBmp.maSizePixel))
.GetSize();
- maList.emplace_back(new AnimationBitmap(rStepBmp));
+ maFrames.emplace_back(new AnimationBitmap(rStepBmp));
// As a start, we make the first BitmapEx the replacement BitmapEx
- if (maList.size() == 1)
+ if (maFrames.size() == 1)
maBitmapEx = rStepBmp.maBitmapEx;
bRet = true;
@@ -400,20 +401,20 @@ bool Animation::Insert(const AnimationBitmap& rStepBmp)
const AnimationBitmap& Animation::Get(sal_uInt16 nAnimation) const
{
- SAL_WARN_IF((nAnimation >= maList.size()), "vcl", "No object at this
position");
- return *maList[nAnimation];
+ SAL_WARN_IF((nAnimation >= maFrames.size()), "vcl", "No object at this
position");
+ return *maFrames[nAnimation];
}
void Animation::Replace(const AnimationBitmap& rNewAnimationBitmap, sal_uInt16
nAnimation)
{
- SAL_WARN_IF((nAnimation >= maList.size()), "vcl", "No object at this
position");
+ SAL_WARN_IF((nAnimation >= maFrames.size()), "vcl", "No object at this
position");
- maList[nAnimation].reset(new AnimationBitmap(rNewAnimationBitmap));
+ maFrames[nAnimation].reset(new AnimationBitmap(rNewAnimationBitmap));
// If we insert at first position we also need to
// update the replacement BitmapEx
- if ((!nAnimation && (!mbLoopTerminated || (maList.size() == 1)))
- || ((nAnimation == maList.size() - 1) && mbLoopTerminated))
+ if ((!nAnimation && (!mbLoopTerminated || (maFrames.size() == 1)))
+ || ((nAnimation == maFrames.size() - 1) && mbLoopTerminated))
{
maBitmapEx = rNewAnimationBitmap.maBitmapEx;
}
@@ -437,12 +438,12 @@ void Animation::Convert(BmpConversion eConversion)
bool bRet;
- if (!IsInAnimation() && !maList.empty())
+ if (!IsInAnimation() && !maFrames.empty())
{
bRet = true;
- for (size_t i = 0, n = maList.size(); (i < n) && bRet; ++i)
- bRet = maList[i]->maBitmapEx.Convert(eConversion);
+ for (size_t i = 0, n = maFrames.size(); (i < n) && bRet; ++i)
+ bRet = maFrames[i]->maBitmapEx.Convert(eConversion);
maBitmapEx.Convert(eConversion);
}
@@ -454,13 +455,13 @@ bool Animation::ReduceColors(sal_uInt16 nNewColorCount)
bool bRet;
- if (!IsInAnimation() && !maList.empty())
+ if (!IsInAnimation() && !maFrames.empty())
{
bRet = true;
- for (size_t i = 0, n = maList.size(); (i < n) && bRet; ++i)
+ for (size_t i = 0, n = maFrames.size(); (i < n) && bRet; ++i)
{
- bRet = BitmapFilter::Filter(maList[i]->maBitmapEx,
+ bRet = BitmapFilter::Filter(maFrames[i]->maBitmapEx,
BitmapColorQuantizationFilter(nNewColorCount));
}
@@ -480,12 +481,12 @@ bool Animation::Invert()
bool bRet;
- if (!IsInAnimation() && !maList.empty())
+ if (!IsInAnimation() && !maFrames.empty())
{
bRet = true;
- for (size_t i = 0, n = maList.size(); (i < n) && bRet; ++i)
- bRet = maList[i]->maBitmapEx.Invert();
+ for (size_t i = 0, n = maFrames.size(); (i < n) && bRet; ++i)
+ bRet = maFrames[i]->maBitmapEx.Invert();
maBitmapEx.Invert();
}
@@ -501,7 +502,7 @@ void Animation::Mirror(BmpMirrorFlags nMirrorFlags)
bool bRet;
- if (IsInAnimation() || maList.empty())
+ if (IsInAnimation() || maFrames.empty())
return;
bRet = true;
@@ -509,9 +510,9 @@ void Animation::Mirror(BmpMirrorFlags nMirrorFlags)
if (nMirrorFlags == BmpMirrorFlags::NONE)
return;
- for (size_t i = 0, n = maList.size(); (i < n) && bRet; ++i)
+ for (size_t i = 0, n = maFrames.size(); (i < n) && bRet; ++i)
{
- AnimationBitmap* pStepBmp = maList[i].get();
+ AnimationBitmap* pStepBmp = maFrames[i].get();
bRet = pStepBmp->maBitmapEx.Mirror(nMirrorFlags);
if (bRet)
{
@@ -535,15 +536,15 @@ void Animation::Adjust(short nLuminancePercent, short
nContrastPercent, short nC
bool bRet;
- if (IsInAnimation() || maList.empty())
+ if (IsInAnimation() || maFrames.empty())
return;
bRet = true;
- for (size_t i = 0, n = maList.size(); (i < n) && bRet; ++i)
+ for (size_t i = 0, n = maFrames.size(); (i < n) && bRet; ++i)
{
- bRet = maList[i]->maBitmapEx.Adjust(nLuminancePercent,
nContrastPercent, nChannelRPercent,
- nChannelGPercent,
nChannelBPercent, fGamma, bInvert);
+ bRet = maFrames[i]->maBitmapEx.Adjust(nLuminancePercent,
nContrastPercent, nChannelRPercent,
+ nChannelGPercent,
nChannelBPercent, fGamma, bInvert);
}
maBitmapEx.Adjust(nLuminancePercent, nContrastPercent, nChannelRPercent,
nChannelGPercent,
