From 649c463f4eef3923f633500912f82a5846be6491 Mon Sep 17 00:00:00 2001 From: subhransu mohanty Date: Thu, 2 Aug 2018 14:57:08 +0900 Subject: [PATCH] lottie: always get the item by ref or const ref. Change-Id: Id798812b135d2e1ef1fb593412808f15e2645761 --- src/lottie/lottieitem.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lottie/lottieitem.cpp b/src/lottie/lottieitem.cpp index 1696957..c3bdd77 100644 --- a/src/lottie/lottieitem.cpp +++ b/src/lottie/lottieitem.cpp @@ -17,7 +17,7 @@ LOTCompItem::LOTCompItem(LOTModel *model) { // 1. build layer item list mCompData = model->mRoot.get(); - for (auto i : mCompData->mChildren) { + for (auto &i : mCompData->mChildren) { LOTLayerData *layerData = dynamic_cast(i.get()); if (layerData) { LOTLayerItem *layerItem = LOTCompItem::createLayerItem(layerData); @@ -29,7 +29,7 @@ LOTCompItem::LOTCompItem(LOTModel *model) } // 2. update parent layer - for (auto i : mLayers) { + for (auto &i : mLayers) { int id = i->parentId(); if (id >= 0) { auto search = mLayerMap.find(id); @@ -40,7 +40,7 @@ LOTCompItem::LOTCompItem(LOTModel *model) } } // 3. update static property of each layer - for (auto i : mLayers) { + for (auto &i : mLayers) { i->updateStaticProperty(); } @@ -49,7 +49,7 @@ LOTCompItem::LOTCompItem(LOTModel *model) LOTCompItem::~LOTCompItem() { - for (auto i : mLayers) { + for (auto &i : mLayers) { delete i; } } @@ -133,7 +133,7 @@ void LOTCompItem::buildRenderList() } mRenderList.clear(); - for (auto i : mDrawableList) { + for (auto &i : mDrawableList) { LOTDrawable *lotDrawable = static_cast(i); lotDrawable->sync(); mRenderList.push_back(&lotDrawable->mCNode); @@ -210,7 +210,7 @@ void LOTLayerItem::render(VPainter *painter, const VRle &inheritMask) mask = mask & inheritMask; } - for (auto i : list) { + for (auto &i : list) { painter->setBrush(i->mBrush); if (!mask.isEmpty()) { VRle rle = i->rle() & mask; @@ -256,7 +256,7 @@ LOTLayerItem::LOTLayerItem(LOTLayerData *layerData) mDirtyFlag(DirtyFlagBit::All) { if (mLayerData->mHasMask) { - for (auto i : mLayerData->mMasks) { + for (auto &i : mLayerData->mMasks) { mMasks.push_back(std::make_unique(i.get())); } } @@ -334,7 +334,7 @@ bool LOTLayerItem::visible() const LOTCompLayerItem::LOTCompLayerItem(LOTLayerData *layerModel) : LOTLayerItem(layerModel) { - for (auto i : mLayerData->mChildren) { + for (auto &i : mLayerData->mChildren) { LOTLayerData *layerModel = dynamic_cast(i.get()); if (layerModel) { LOTLayerItem *layerItem = LOTCompItem::createLayerItem(layerModel); @@ -346,7 +346,7 @@ LOTCompLayerItem::LOTCompLayerItem(LOTLayerData *layerModel) } // 2. update parent layer - for (auto i : mLayers) { + for (auto &i : mLayers) { int id = i->parentId(); if (id >= 0) { auto search = mLayerMap.find(id); @@ -363,7 +363,7 @@ void LOTCompLayerItem::updateStaticProperty() { LOTLayerItem::updateStaticProperty(); - for (auto i : mLayers) { + for (auto &i : mLayers) { i->updateStaticProperty(); } } @@ -379,14 +379,14 @@ void LOTCompLayerItem::render(VPainter *painter, const VRle &inheritMask) mask = mask & inheritMask; } - for (auto i : mLayers) { + for (auto &i : mLayers) { i->render(painter, mask); } } LOTCompLayerItem::~LOTCompLayerItem() { - for (auto i : mLayers) { + for (auto &i : mLayers) { delete i; } } -- 2.7.4