From 5e2192c0f3399721abe17e5158acbb2f19f86aa5 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Wed, 27 Mar 2019 15:17:01 +0900 Subject: [PATCH] capi: code rectoring keep code consistency of mask with matte. --- inc/rlottiecommon.h | 15 +++++++-------- src/lottie/lottieitem.cpp | 10 +++++----- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/inc/rlottiecommon.h b/inc/rlottiecommon.h index cc198a4baf..0d8bce553e 100644 --- a/inc/rlottiecommon.h +++ b/inc/rlottiecommon.h @@ -116,11 +116,11 @@ typedef struct LOTGradientStop typedef enum { - MaskModeAdd = 0, - MaskModeSubstract, - MaskModeIntersect, - MaskModeDifference -} LOTMaskMode; + MaskAdd = 0, + MaskSubstract, + MaskIntersect, + MaskDifference +} LOTMaskType; typedef struct LOTMask { struct { @@ -129,8 +129,7 @@ typedef struct LOTMask { const char* elmPtr; int elmCount; } mPath; - LOTMaskMode mMode; - + LOTMaskType mMode; int mAlpha; }LOTMask; @@ -209,7 +208,7 @@ typedef struct LOTLayerNode { } mLayerList; struct { - LOTNode **ptr; + LOTNode **ptr; unsigned int size; } mNodeList; diff --git a/src/lottie/lottieitem.cpp b/src/lottie/lottieitem.cpp index dc99df6397..9b259a8bd2 100644 --- a/src/lottie/lottieitem.cpp +++ b/src/lottie/lottieitem.cpp @@ -238,19 +238,19 @@ void LOTLayerItem::buildLayerNode() cNode.mAlpha = mask.mCombinedAlpha * 255; switch (mask.maskMode()) { case LOTMaskData::Mode::Add: - cNode.mMode = MaskModeAdd; + cNode.mMode = MaskAdd; break; case LOTMaskData::Mode::Substarct: - cNode.mMode = MaskModeSubstract; + cNode.mMode = MaskSubstract; break; case LOTMaskData::Mode::Intersect: - cNode.mMode = MaskModeIntersect; + cNode.mMode = MaskIntersect; break; case LOTMaskData::Mode::Difference: - cNode.mMode = MaskModeDifference; + cNode.mMode = MaskDifference; break; default: - cNode.mMode = MaskModeAdd; + cNode.mMode = MaskAdd; break; } mMasksCNode.push_back(std::move(cNode));