From 53e71eb670874f6a90570171bf377428f54fb8c7 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Thu, 22 Nov 2018 20:44:18 +0900 Subject: [PATCH] interface: fix to compatible with C language. C++ structure type declaration is more flexible than C's. C always need to declare "struct Name" to use. That's way we use typedef struct Name as a alias "Name". Here patch just reorder the structure declaration for C language. Change-Id: I43bc8d1fafb10e42cb22fcad4bc1115925a3cda2 --- inc/lottiecommon.h | 50 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/inc/lottiecommon.h b/inc/lottiecommon.h index 75ede5d..0e89e01 100644 --- a/inc/lottiecommon.h +++ b/inc/lottiecommon.h @@ -77,8 +77,6 @@ typedef struct LOTGradientStop unsigned char r, g, b, a; } LOTGradientStop; -struct LOTNode; - typedef enum { MaskModeAdd = 0, @@ -87,7 +85,7 @@ typedef enum MaskModeDifference } LOTMaskMode; -typedef struct _LOTMask { +typedef struct LOTMask { struct { const float *ptPtr; int ptCount; @@ -106,28 +104,6 @@ typedef enum MatteLumaInv } LOTMatteType; -typedef struct LOTLayerNode { - - struct { - LOTMask *ptr; - unsigned int size; - }mMaskList; - - struct { - LOTLayerNode **ptr; - unsigned int size; - }mLayerList; - - struct { - LOTNode **ptr; - unsigned int size; - }mNodeList; - - LOTMatteType mMatte; - int mVisible; - -}LOTLayerNode; - typedef struct LOTNode { #define ChangeFlagNone 0x0000 @@ -173,4 +149,28 @@ typedef struct LOTNode { } LOTNode; + +typedef struct LOTLayerNode { + + struct { + LOTMask *ptr; + unsigned int size; + } mMaskList; + + struct { + struct LOTLayerNode **ptr; + unsigned int size; + } mLayerList; + + struct { + LOTNode **ptr; + unsigned int size; + } mNodeList; + + LOTMatteType mMatte; + int mVisible; + +} LOTLayerNode; + + #endif // _LOTTIE_COMMON_H_ -- 2.34.1