From: Hermet Park Date: Thu, 11 Jul 2019 08:34:14 +0000 (+0900) Subject: keep consistency of size_t usage. X-Git-Tag: submit/tizen/20190719.015332~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd38331bb5404c4ac2acf22e9d824a5d34934c1a;p=platform%2Fcore%2Fuifw%2Flottie-player.git keep consistency of size_t usage. --- diff --git a/src/lottie/lottieitem.cpp b/src/lottie/lottieitem.cpp index bec7dd1..7964ab5 100644 --- a/src/lottie/lottieitem.cpp +++ b/src/lottie/lottieitem.cpp @@ -1095,7 +1095,7 @@ void LOTContentGroupItem::renderList(std::vector &list) void LOTContentGroupItem::processPaintItems( std::vector &list) { - int curOpCount = list.size(); + size_t curOpCount = list.size(); for (auto i = mContents.rbegin(); i != mContents.rend(); ++i) { auto content = (*i).get(); switch (content->type()) { @@ -1121,7 +1121,7 @@ void LOTContentGroupItem::processPaintItems( void LOTContentGroupItem::processTrimItems(std::vector &list) { - int curOpCount = list.size(); + size_t curOpCount = list.size(); for (auto i = mContents.rbegin(); i != mContents.rend(); ++i) { auto content = (*i).get(); @@ -1320,7 +1320,7 @@ void LOTPaintDataItem::renderList(std::vector &list) } void LOTPaintDataItem::addPathItems(std::vector &list, - int startOffset) + size_t startOffset) { std::copy(list.begin() + startOffset, list.end(), back_inserter(mPathItems)); @@ -1539,7 +1539,7 @@ void LOTTrimItem::update() } void LOTTrimItem::addPathItems(std::vector &list, - int startOffset) + size_t startOffset) { std::copy(list.begin() + startOffset, list.end(), back_inserter(mPathItems)); diff --git a/src/lottie/lottieitem.h b/src/lottie/lottieitem.h index a363f47..5a65000 100644 --- a/src/lottie/lottieitem.h +++ b/src/lottie/lottieitem.h @@ -398,7 +398,7 @@ class LOTPaintDataItem : public LOTContentItem { public: LOTPaintDataItem(bool staticContent); - void addPathItems(std::vector &list, int startOffset); + void addPathItems(std::vector &list, size_t startOffset); void update(int frameNo, const VMatrix &parentMatrix, float parentAlpha, const DirtyFlag &flag) override; void renderList(std::vector &list) final; protected: @@ -488,7 +488,7 @@ public: LOTTrimItem(LOTTrimData *data); void update(int frameNo, const VMatrix &parentMatrix, float parentAlpha, const DirtyFlag &flag) final; void update(); - void addPathItems(std::vector &list, int startOffset); + void addPathItems(std::vector &list, size_t startOffset); private: bool pathDirty() const { for (auto &i : mPathItems) { diff --git a/src/lottie/lottiekeypath.h b/src/lottie/lottiekeypath.h index 527788f..921bcad 100644 --- a/src/lottie/lottiekeypath.h +++ b/src/lottie/lottiekeypath.h @@ -38,7 +38,7 @@ private: bool isGlobstar(uint depth) const {return mKeys[depth] == "**";} bool isGlob(uint depth) const {return mKeys[depth] == "*";} bool endsWithGlobstar() const { return mKeys.back() == "**"; } - uint size() const {return mKeys.size() - 1;} + size_t size() const {return mKeys.size() - 1;} private: std::vector mKeys; }; diff --git a/src/lottie/lottieparser.cpp b/src/lottie/lottieparser.cpp index 949283d..4a0df36 100644 --- a/src/lottie/lottieparser.cpp +++ b/src/lottie/lottieparser.cpp @@ -647,9 +647,9 @@ static std::string convertFromBase64(const std::string &str) { // usual header look like "data:image/png;base64," // so need to skip till ','. - int startIndex = str.find(",", 0); + size_t startIndex = str.find(",", 0); startIndex += 1; // skip "," - int length = str.length() - startIndex; + size_t length = str.length() - startIndex; const char *b64Data = str.c_str() + startIndex; diff --git a/src/vector/vdrawhelper.cpp b/src/vector/vdrawhelper.cpp index bc6b689..e137a35 100644 --- a/src/vector/vdrawhelper.cpp +++ b/src/vector/vdrawhelper.cpp @@ -137,9 +137,10 @@ bool VGradientCache::generateGradientColorTable(const VGradientStops &stops, float opacity, uint32_t *colorTable, int size) { - int dist, idist, pos = 0, i; + int dist, idist, pos = 0; + size_t i; bool alpha = false; - int stopCount = stops.size(); + size_t stopCount = stops.size(); const VGradientStop *curr, *next, *start; uint32_t curColor, nextColor; float delta, t, incr, fpos; diff --git a/src/vector/vpath.h b/src/vector/vpath.h index 1c4bf0b..ceebd4b 100644 --- a/src/vector/vpath.h +++ b/src/vector/vpath.h @@ -107,7 +107,7 @@ private: const std::vector &points() const { return m_points; } std::vector m_points; std::vector m_elements; - unsigned int m_segments; + size_t m_segments; VPointF mStartPoint; mutable float mLength{0}; mutable bool mLengthDirty{true}; diff --git a/src/vector/vrle.cpp b/src/vector/vrle.cpp index 988ea3a..ee4135e 100644 --- a/src/vector/vrle.cpp +++ b/src/vector/vrle.cpp @@ -384,7 +384,7 @@ static void rleIntersectWithRle(VRleHelper *tmp_clip, int clip_offset_x, VRleHelper *result) { VRle::Span *out = result->spans; - int available = result->alloc; + size_t available = result->alloc; VRle::Span *spans = tmp_obj->spans; VRle::Span *end = tmp_obj->spans + tmp_obj->size; VRle::Span *clipSpans = tmp_clip->spans; @@ -459,7 +459,7 @@ static void rleIntersectWithRect(const VRect &clip, VRleHelper *tmp_obj, VRleHelper *result) { VRle::Span *out = result->spans; - int available = result->alloc; + size_t available = result->alloc; VRle::Span *spans = tmp_obj->spans; VRle::Span *end = tmp_obj->spans + tmp_obj->size; short minx, miny, maxx, maxy;