import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch

From 377f6aada3b7569e3d662fc830e01b8c5ba8a15d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 18 Feb 2016 09:04:46 +0000
Subject: [PATCH 10/13] Fix enum conversion warnings

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 interface/mmal/openmaxil/mmalomx_core.c              | 4 ++--
 interface/mmal/openmaxil/mmalomx_parameters.c        | 6 +++---
 interface/mmal/openmaxil/mmalomx_util_params_video.c | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/interface/mmal/openmaxil/mmalomx_core.c b/interface/mmal/openmaxil/mmalomx_core.c
index 9bc632b..20d4fc7 100644
--- a/interface/mmal/openmaxil/mmalomx_core.c
+++ b/interface/mmal/openmaxil/mmalomx_core.c
@@ -281,7 +281,7 @@ static OMX_ERRORTYPE mmalomx_ComponentGetParameter(
       {
          OMX_PARAM_PORTDEFINITIONTYPE *param = (OMX_PARAM_PORTDEFINITIONTYPE *)pParam;
          PARAM_GET_PORT(port, component, param->nPortIndex);
-         return mmalil_error_to_mmal(mmalomx_get_port_settings(port, param));
+         return mmalil_error_to_omx(mmalomx_get_port_settings(port, param));
       }
       return OMX_ErrorNone;
       break;
@@ -475,7 +475,7 @@ static OMX_ERRORTYPE mmalomx_ComponentSetParameter(
       {
          OMX_PARAM_PORTDEFINITIONTYPE *param = (OMX_PARAM_PORTDEFINITIONTYPE *)pParam;
          PARAM_GET_PORT(port, component, param->nPortIndex);
-         return mmalil_error_to_mmal(mmalomx_set_port_settings(port, param));
+         return mmalil_error_to_omx(mmalomx_set_port_settings(port, param));
       }
       return OMX_ErrorNone;
       break;
diff --git a/interface/mmal/openmaxil/mmalomx_parameters.c b/interface/mmal/openmaxil/mmalomx_parameters.c
index a20a5bd..c4f97d4 100644
--- a/interface/mmal/openmaxil/mmalomx_parameters.c
+++ b/interface/mmal/openmaxil/mmalomx_parameters.c
@@ -170,7 +170,7 @@ static OMX_ERRORTYPE mmalomx_parameter_get_xlat(MMALOMX_COMPONENT_T *component,
 
    if (xlat->fn.custom)
    {
-      return mmalil_error_to_mmal(xlat->fn.custom(MMALOMX_PARAM_MAPPING_TO_OMX, xlat, mmal_header,
+      return mmalil_error_to_omx(xlat->fn.custom(MMALOMX_PARAM_MAPPING_TO_OMX, xlat, mmal_header,
          pParam, mmal_port));
    }
 
@@ -554,14 +554,14 @@ OMX_ERRORTYPE mmalomx_parameter_set(MMALOMX_COMPONENT_T *component,
          port->mmal->format->es->video.par.num = param->nX;
          port->mmal->format->es->video.par.den = param->nY;
          mmal_rational_simplify(&port->mmal->format->es->video.par);
-         return mmalil_error_to_mmal(mmal_port_format_commit(port->mmal));
+         return mmalil_error_to_omx(mmal_port_format_commit(port->mmal));
       }
    case OMX_IndexParamColorSpace:
       {
          OMX_PARAM_COLORSPACETYPE *param = (OMX_PARAM_COLORSPACETYPE *)pParam;
          PARAM_GET_PORT(port, component, param->nPortIndex);
          port->mmal->format->es->video.color_space = mmalil_omx_color_space_to_mmal(param->eColorSpace);
-         return mmalil_error_to_mmal(mmal_port_format_commit(port->mmal));
+         return mmalil_error_to_omx(mmal_port_format_commit(port->mmal));
       }
    case OMX_IndexParamBrcmVideoCroppingDisable:
       {
diff --git a/interface/mmal/openmaxil/mmalomx_util_params_video.c b/interface/mmal/openmaxil/mmalomx_util_params_video.c
index f088296..83e3724 100644
--- a/interface/mmal/openmaxil/mmalomx_util_params_video.c
+++ b/interface/mmal/openmaxil/mmalomx_util_params_video.c
@@ -56,11 +56,11 @@ static MMAL_STATUS_T mmalomx_param_mapping_displayregion(MMALOMX_PARAM_MAPPING_D
       mmal->set = omx->set;
       mmal->display_num = omx->num;
       mmal->fullscreen = omx->fullscreen;
-      mmal->transform = omx->transform;
+      mmal->transform = (MMAL_DISPLAYTRANSFORM_T)omx->transform;
       rect_to_mmal(&mmal->dest_rect, &omx->dest_rect);
       rect_to_mmal(&mmal->src_rect, &omx->src_rect);
       mmal->noaspect = omx->noaspect;
-      mmal->mode = omx->mode;
+      mmal->mode = (MMAL_DISPLAYMODE_T)omx->mode;
       mmal->pixel_x = omx->pixel_x;
       mmal->pixel_y = omx->pixel_y;
       mmal->layer = omx->layer;
@@ -72,11 +72,11 @@ static MMAL_STATUS_T mmalomx_param_mapping_displayregion(MMALOMX_PARAM_MAPPING_D
       omx->set        = mmal->set;
       omx->num        = mmal->display_num;
       omx->fullscreen = mmal->fullscreen;
-      omx->transform  = mmal->transform;
+      omx->transform  = (OMX_DISPLAYTRANSFORMTYPE)mmal->transform;
       rect_to_omx(&omx->dest_rect, &mmal->dest_rect);
       rect_to_omx(&omx->src_rect, &mmal->src_rect);
       omx->noaspect   = mmal->noaspect;
-      omx->mode       = mmal->mode;
+      omx->mode       = (OMX_DISPLAYMODETYPE)mmal->mode;
       omx->pixel_x    = mmal->pixel_x;
       omx->pixel_y    = mmal->pixel_y;
       omx->layer      = mmal->layer;
-- 
2.9.0