Clean type sharing between ilm types & internal types

diff --git a/LayerManagerService/include/LayerType.h b/LayerManagerService/include/LayerType.h
index 648bd6c..f51b392 100644 (file)
--- a/LayerManagerService/include/LayerType.h
+++ b/LayerManagerService/include/LayerType.h
@@ -20,15 +20,17 @@
 #ifndef _LAYERTYPE_H_
 #define _LAYERTYPE_H_
 
+#include "ilm_types.h"
+
 /**
  * Enumeration of possible LayerTypes
  */
 enum LayerType
 {
-    Unknown = 0,
-    Hardware = 1,
-    Software_2D = 2,
-    Software_2_5D = 3
+    Unknown = ILM_LAYERTYPE_UNKNOWN,
+    Hardware = ILM_LAYERTYPE_HARDWARE,
+    Software_2D = ILM_LAYERTYPE_SOFTWARE2D,
+    Software_2_5D = ILM_LAYERTYPE_SOFTWARE2_5D
 };
 
 #endif /* _LAYERTYPE_H_ */

diff --git a/LayerManagerService/include/ObjectType.h b/LayerManagerService/include/ObjectType.h
index 7d8eec1..58b3f97 100644 (file)
--- a/LayerManagerService/include/ObjectType.h
+++ b/LayerManagerService/include/ObjectType.h
@@ -20,16 +20,18 @@
 #ifndef _GRAPHICALOBJECTTYPE_H_
 #define _GRAPHICALOBJECTTYPE_H_
 
+#include "ilm_types.h"
+
 /**
  * Enumeration of possible graphicalObjectTypes
  */
 enum ObjectType
 {
-    TypeSurface = 0,
-    TypeLayer = 1,
-    TypeSurfaceGroup = 2,
-    TypeLayerGroup =3,
-    TypeMax = 4
+    TypeSurface = ILM_SURFACE,
+    TypeLayer = ILM_LAYER,
+    TypeSurfaceGroup = ILM_SURFACEGROUP,
+    TypeLayerGroup = ILM_LAYERGROUP,
+    TypeMax
 };
 
 #endif /* _GRAPHICALOBJECTTYPE_H_ */

diff --git a/LayerManagerService/include/OrientationType.h b/LayerManagerService/include/OrientationType.h
index 2e47482..8a1d98a 100644 (file)
--- a/LayerManagerService/include/OrientationType.h
+++ b/LayerManagerService/include/OrientationType.h
@@ -20,16 +20,18 @@
 #ifndef _ORIENTATION_H
 #define _ORIENTATION_H
 
+#include "ilm_types.h"
+
 /**
  * Enumeration of possible orientations. Orientation in this context means Rotation.
  * Surfaces and Layers can be rotated for composition. Values mean clockwise rotation.
  */
 enum OrientationType
 {
-    Zero = 0,
-    Ninety = 1,
-    OneEighty = 2,
-    TwoSeventy = 3
+    Zero = ILM_ZERO,
+    Ninety = ILM_NINETY,
+    OneEighty = ILM_ONEHUNDREDEIGHTY,
+    TwoSeventy = ILM_TWOHUNDREDSEVENTY
 };
 
 #endif /* _ORIENTATION_H */

diff --git a/LayerManagerService/include/PixelFormat.h b/LayerManagerService/include/PixelFormat.h
index d29ddc3..6bacbde 100644 (file)
--- a/LayerManagerService/include/PixelFormat.h
+++ b/LayerManagerService/include/PixelFormat.h
@@ -20,19 +20,21 @@
 #ifndef _PIXELFORMAT_H_
 #define _PIXELFORMAT_H_
 
+#include "ilm_types.h"
+
 /**
  * Enumeration of possible PixelFormats
  */
 enum PixelFormat
 {
-    PIXELFORMAT_R8 = 0,
-    PIXELFORMAT_RGB888 = 1,
-    PIXELFORMAT_RGBA8888 = 2,
-    PIXELFORMAT_RGB565 = 3,
-    PIXELFORMAT_RGBA5551 = 4,
-    PIXELFORMAT_RGBA6661 = 5,
-    PIXELFORMAT_RGBA4444 = 6,
-    PIXELFORMAT_UNKNOWN = 7
+    PIXELFORMAT_R8 = ILM_PIXELFORMAT_R_8,
+    PIXELFORMAT_RGB888 = ILM_PIXELFORMAT_RGB_888,
+    PIXELFORMAT_RGBA8888 = ILM_PIXELFORMAT_RGBA_8888,
+    PIXELFORMAT_RGB565 = ILM_PIXELFORMAT_RGB_565,
+    PIXELFORMAT_RGBA5551 = ILM_PIXELFORMAT_RGBA_5551,
+    PIXELFORMAT_RGBA6661 = ILM_PIXELFORMAT_RGBA_6661,
+    PIXELFORMAT_RGBA4444 = ILM_PIXELFORMAT_RGBA_4444,
+    PIXELFORMAT_UNKNOWN = ILM_PIXEL_FORMAT_UNKNOWN
 };
 
 #define PixelFormatHasAlpha(pf) ((pf == PIXELFORMAT_RGBA8888) || (pf == PIXELFORMAT_RGBA5551) || (pf == PIXELFORMAT_RGBA6661) || (pf == PIXELFORMAT_RGBA4444))