capi: code rectoring

keep code consistency of mask with matte.
This commit is contained in:
Hermet Park 2019-03-27 15:17:01 +09:00
parent 97cf5023d8
commit 5e2192c0f3
2 changed files with 12 additions and 13 deletions

View File

@ -116,11 +116,11 @@ typedef struct LOTGradientStop
typedef enum typedef enum
{ {
MaskModeAdd = 0, MaskAdd = 0,
MaskModeSubstract, MaskSubstract,
MaskModeIntersect, MaskIntersect,
MaskModeDifference MaskDifference
} LOTMaskMode; } LOTMaskType;
typedef struct LOTMask { typedef struct LOTMask {
struct { struct {
@ -129,8 +129,7 @@ typedef struct LOTMask {
const char* elmPtr; const char* elmPtr;
int elmCount; int elmCount;
} mPath; } mPath;
LOTMaskMode mMode; LOTMaskType mMode;
int mAlpha; int mAlpha;
}LOTMask; }LOTMask;

View File

@ -238,19 +238,19 @@ void LOTLayerItem::buildLayerNode()
cNode.mAlpha = mask.mCombinedAlpha * 255; cNode.mAlpha = mask.mCombinedAlpha * 255;
switch (mask.maskMode()) { switch (mask.maskMode()) {
case LOTMaskData::Mode::Add: case LOTMaskData::Mode::Add:
cNode.mMode = MaskModeAdd; cNode.mMode = MaskAdd;
break; break;
case LOTMaskData::Mode::Substarct: case LOTMaskData::Mode::Substarct:
cNode.mMode = MaskModeSubstract; cNode.mMode = MaskSubstract;
break; break;
case LOTMaskData::Mode::Intersect: case LOTMaskData::Mode::Intersect:
cNode.mMode = MaskModeIntersect; cNode.mMode = MaskIntersect;
break; break;
case LOTMaskData::Mode::Difference: case LOTMaskData::Mode::Difference:
cNode.mMode = MaskModeDifference; cNode.mMode = MaskDifference;
break; break;
default: default:
cNode.mMode = MaskModeAdd; cNode.mMode = MaskAdd;
break; break;
} }
mMasksCNode.push_back(std::move(cNode)); mMasksCNode.push_back(std::move(cNode));