From a2c9e23b3eec38c09a439ea3bb49157c4a35016c Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Thu, 14 Nov 2019 09:56:15 +0900 Subject: [PATCH] rlottie: Add initialization of pointer members that were not Change-Id: Ia1cf809c684241fcebef618c97f38d52081611a0 --- src/lottie/lottieitem.h | 24 ++++++++++++------------ src/lottie/lottiemodel.h | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lottie/lottieitem.h b/src/lottie/lottieitem.h index b6cda32..b0b420d 100644 --- a/src/lottie/lottieitem.h +++ b/src/lottie/lottieitem.h @@ -75,8 +75,8 @@ private: VBitmap mSurface; VMatrix mScaleMatrix; VSize mViewSize; - LOTCompositionData *mCompData; - LOTLayerItem *mRootLayer; + LOTCompositionData *mCompData{nullptr}; + LOTLayerItem *mRootLayer{nullptr}; VArenaAlloc mAllocator{2048}; int mCurFrameNo; bool mKeepAspectRatio{true}; @@ -239,7 +239,7 @@ protected: void preprocessStage(const VRect& clip) final; void updateContent() final; std::vector mDrawableList; - LOTContentGroupItem *mRoot; + LOTContentGroupItem *mRoot{nullptr}; }; class LOTNullLayerItem: public LOTLayerItem @@ -275,7 +275,7 @@ public: VRle rle(); void preprocess(const VRect &clip); public: - LOTMaskData *mData; + LOTMaskData *mData{nullptr}; VPath mLocalPath; VPath mFinalPath; VRasterizer mRasterizer; @@ -389,7 +389,7 @@ public: explicit LOTRectItem(LOTRectData *data); protected: void updatePath(VPath& path, int frameNo) final; - LOTRectData *mData; + LOTRectData *mData{nullptr}; bool hasChanged(int prevFrame, int curFrame) final { return (mData->mPos.changed(prevFrame, curFrame) || @@ -404,7 +404,7 @@ public: explicit LOTEllipseItem(LOTEllipseData *data); private: void updatePath(VPath& path, int frameNo) final; - LOTEllipseData *mData; + LOTEllipseData *mData{nullptr}; bool hasChanged(int prevFrame, int curFrame) final { return (mData->mPos.changed(prevFrame, curFrame) || mData->mSize.changed(prevFrame, curFrame)); @@ -417,7 +417,7 @@ public: explicit LOTShapeItem(LOTShapeData *data); private: void updatePath(VPath& path, int frameNo) final; - LOTShapeData *mData; + LOTShapeData *mData{nullptr}; bool hasChanged(int prevFrame, int curFrame) final { return mData->mShape.changed(prevFrame, curFrame); } @@ -429,7 +429,7 @@ public: explicit LOTPolystarItem(LOTPolystarData *data); private: void updatePath(VPath& path, int frameNo) final; - LOTPolystarData *mData; + LOTPolystarData *mData{nullptr}; bool hasChanged(int prevFrame, int curFrame) final { return (mData->mPos.changed(prevFrame, curFrame) || @@ -484,7 +484,7 @@ public: protected: bool updateContent(int frameNo, const VMatrix &matrix, float alpha) final; private: - LOTGFillData *mData; + LOTGFillData *mData{nullptr}; std::unique_ptr mGradient; }; @@ -506,7 +506,7 @@ public: protected: bool updateContent(int frameNo, const VMatrix &matrix, float alpha) final; private: - LOTGStrokeData *mData; + LOTGStrokeData *mData{nullptr}; std::unique_ptr mGradient; }; @@ -535,7 +535,7 @@ private: }; Cache mCache; std::vector mPathItems; - LOTTrimData *mData; + LOTTrimData *mData{nullptr}; VPathMesure mPathMesure; bool mDirty{true}; }; @@ -547,7 +547,7 @@ public: void update(int frameNo, const VMatrix &parentMatrix, float parentAlpha, const DirtyFlag &flag) final; void renderList(std::vector &list) final; private: - LOTRepeaterData *mRepeaterData; + LOTRepeaterData *mRepeaterData{nullptr}; bool mHidden{false}; int mCopies{0}; }; diff --git a/src/lottie/lottiemodel.h b/src/lottie/lottiemodel.h index e92c841..fe94bca 100644 --- a/src/lottie/lottiemodel.h +++ b/src/lottie/lottiemodel.h @@ -461,7 +461,7 @@ private: }; union { Data mData; - char *mPtr; + char *mPtr{nullptr}; }; }; @@ -572,7 +572,7 @@ private: VMatrix mMatrix; }; union details { - TransformData *mData; + TransformData *mData{nullptr}; static_data mStaticData; details(){}; details(const details&) = delete; @@ -589,7 +589,7 @@ struct ExtraLayerData std::string mPreCompRefId; LOTAnimatable mTimeRemap; /* "tm" */ LOTCompositionData *mCompRef{nullptr}; - LOTAsset *mAsset; + LOTAsset *mAsset{nullptr}; std::vector mMasks; }; @@ -683,7 +683,7 @@ public: long mEndFrame{0}; float mFrameRate{60}; LottieBlendMode mBlendMode{LottieBlendMode::Normal}; - LOTLayerData *mRootLayer; + LOTLayerData *mRootLayer{nullptr}; std::unordered_map mAssets; -- 2.34.1