merge with master

[framework/osp/image-core.git] / inc / FMediaImageTypes.h

diff --git a/inc/FMediaImageTypes.h b/inc/FMediaImageTypes.h
index ad9ad38..7ea9ea8 100644 (file)
--- a/inc/FMediaImageTypes.h
+++ b/inc/FMediaImageTypes.h
@@ -16,7 +16,7 @@
 //
 
 /**
- * @file                       FMediaImageTypes.h
+ * @file               FMediaImageTypes.h
  * @brief              This is the header file for the common types of the Image class.
  *
  * This header file contains the declarations of the enumerations for the Image class.
@@ -59,7 +59,7 @@ enum ImageRotationType
        IMAGE_ROTATION_90,                  /**< The 90 degree rotation in clockwise direction */
        IMAGE_ROTATION_180,                 /**< The 180 degree rotation in clockwise direction */
        IMAGE_ROTATION_270,                 /**< The 270 degree rotation in clockwise direction */
-} ;
+};
 
 /**
  * @enum ImageFlipType
@@ -73,7 +73,7 @@ enum ImageFlipType
        IMAGE_FLIP_NONE = 0x00,             /**< The no-flip type */
        IMAGE_FLIP_HORIZONTAL,              /**< The horizontal flip */
        IMAGE_FLIP_VERTICAL,                /**< The vertical flip */
-} ;
+};
 
 /**
  * @enum       MediaPixelFormat
@@ -94,11 +94,44 @@ enum MediaPixelFormat
        MEDIA_PIXEL_FORMAT_YUV420P = 0x0200,        /**< The YUV420 Planar format */
        MEDIA_PIXEL_FORMAT_NV12,            /**< The NV12 format */
        MEDIA_PIXEL_FORMAT_NV12_TILE,           /**< The NV12 tiled format */
-       MEDIA_PIXEL_FORMAT_NV21,               /**< @if OSPCOMPAT @since 2.0 @endif The NV21 format */
-       MEDIA_PIXEL_FORMAT_YUV444P,         /**< @if OSPCOMPAT @since 2.0 @endif The YUV444 Planar format  */
-       MEDIA_PIXEL_FORMAT_YUYV422,         /**< @if OSPCOMPAT @since 2.0 @endif The YUYV422 format */
-       MEDIA_PIXEL_FORMAT_UYVY422,         /**< @if OSPCOMPAT @since 2.0 @endif The UYVY422 format */
-       MEDIA_PIXEL_FORMAT_GRAY,             /**< @if OSPCOMPAT @since 2.0 @endif The gray pixel format */
+       MEDIA_PIXEL_FORMAT_NV21,               /**< @since 2.0 The NV21 format */
+       MEDIA_PIXEL_FORMAT_YUV444P,         /**< @since 2.0 The YUV444 Planar format  */
+       MEDIA_PIXEL_FORMAT_YUYV422,         /**< @since 2.0 The YUYV422 format */
+       MEDIA_PIXEL_FORMAT_UYVY422,         /**< @since 2.0 The UYVY422 format */
+       MEDIA_PIXEL_FORMAT_GRAY,             /**< @since 2.0 The gray pixel format */
+};
+
+/**
+ * @enum ImageScalingMethod
+ *
+ * Defines the image sacling method.
+ *
+ * @since  2.1
+ */
+enum ImageScalingMethod
+{
+       IMAGE_SCALING_METHOD_FAST_BILINEAR, /** fast bilinear interpolation method */
+       IMAGE_SCALING_METHOD_BILINEAR,            /** bilinear interpolation method */
+       IMAGE_SCALING_METHOD_BICUBIC,              /** bicubic interpolation method */
+};
+
+/**
+ * @enum ExifOrientation
+ *
+ * Defines the image's EXIF orientation flags.
+ *
+ * @since       2.1
+ */
+enum ExifOrientation
+{
+       EXIF_ORIENTATION_TOP_LEFT = 0x01,        /**< The row #0 is top, column #0 is left     */
+       EXIF_ORIENTATION_TOP_RIGHT,       /**< The row #0 is top, column #0 is right    */
+       EXIF_ORIENTATION_BOTTOM_RIGHT,    /**< The row #0 is bottom, column #0 is right */
+       EXIF_ORIENTATION_BOTTOM_LEFT,     /**< The row #0 is bottom, column #0 is left  */
+       EXIF_ORIENTATION_LEFT_TOP,        /**< The row #0 is left, column #0 is top     */
+       EXIF_ORIENTATION_RIGHT_TOP,       /**< The row #0 is right, column #0 is top    */
+       EXIF_ORIENTATION_RIGHT_BOTTOM,    /**< The row #0 is right, column #0 is bottom */
+       EXIF_ORIENTATION_LEFT_BOTTOM,     /**< The row #0 is left, column #0 is bottom  */
 };
 
 };