summaryrefslogtreecommitdiffstats
path: root/recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch')
-rw-r--r--recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch99
1 files changed, 99 insertions, 0 deletions
diff --git a/recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch b/recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch
new file mode 100644
index 0000000..d4e8825
--- /dev/null
+++ b/recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch
@@ -0,0 +1,99 @@
1From 377f6aada3b7569e3d662fc830e01b8c5ba8a15d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 18 Feb 2016 09:04:46 +0000
4Subject: [PATCH 10/13] Fix enum conversion warnings
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 interface/mmal/openmaxil/mmalomx_core.c | 4 ++--
9 interface/mmal/openmaxil/mmalomx_parameters.c | 6 +++---
10 interface/mmal/openmaxil/mmalomx_util_params_video.c | 8 ++++----
11 3 files changed, 9 insertions(+), 9 deletions(-)
12
13diff --git a/interface/mmal/openmaxil/mmalomx_core.c b/interface/mmal/openmaxil/mmalomx_core.c
14index 9bc632b..20d4fc7 100644
15--- a/interface/mmal/openmaxil/mmalomx_core.c
16+++ b/interface/mmal/openmaxil/mmalomx_core.c
17@@ -281,7 +281,7 @@ static OMX_ERRORTYPE mmalomx_ComponentGetParameter(
18 {
19 OMX_PARAM_PORTDEFINITIONTYPE *param = (OMX_PARAM_PORTDEFINITIONTYPE *)pParam;
20 PARAM_GET_PORT(port, component, param->nPortIndex);
21- return mmalil_error_to_mmal(mmalomx_get_port_settings(port, param));
22+ return mmalil_error_to_omx(mmalomx_get_port_settings(port, param));
23 }
24 return OMX_ErrorNone;
25 break;
26@@ -475,7 +475,7 @@ static OMX_ERRORTYPE mmalomx_ComponentSetParameter(
27 {
28 OMX_PARAM_PORTDEFINITIONTYPE *param = (OMX_PARAM_PORTDEFINITIONTYPE *)pParam;
29 PARAM_GET_PORT(port, component, param->nPortIndex);
30- return mmalil_error_to_mmal(mmalomx_set_port_settings(port, param));
31+ return mmalil_error_to_omx(mmalomx_set_port_settings(port, param));
32 }
33 return OMX_ErrorNone;
34 break;
35diff --git a/interface/mmal/openmaxil/mmalomx_parameters.c b/interface/mmal/openmaxil/mmalomx_parameters.c
36index a20a5bd..c4f97d4 100644
37--- a/interface/mmal/openmaxil/mmalomx_parameters.c
38+++ b/interface/mmal/openmaxil/mmalomx_parameters.c
39@@ -170,7 +170,7 @@ static OMX_ERRORTYPE mmalomx_parameter_get_xlat(MMALOMX_COMPONENT_T *component,
40
41 if (xlat->fn.custom)
42 {
43- return mmalil_error_to_mmal(xlat->fn.custom(MMALOMX_PARAM_MAPPING_TO_OMX, xlat, mmal_header,
44+ return mmalil_error_to_omx(xlat->fn.custom(MMALOMX_PARAM_MAPPING_TO_OMX, xlat, mmal_header,
45 pParam, mmal_port));
46 }
47
48@@ -554,14 +554,14 @@ OMX_ERRORTYPE mmalomx_parameter_set(MMALOMX_COMPONENT_T *component,
49 port->mmal->format->es->video.par.num = param->nX;
50 port->mmal->format->es->video.par.den = param->nY;
51 mmal_rational_simplify(&port->mmal->format->es->video.par);
52- return mmalil_error_to_mmal(mmal_port_format_commit(port->mmal));
53+ return mmalil_error_to_omx(mmal_port_format_commit(port->mmal));
54 }
55 case OMX_IndexParamColorSpace:
56 {
57 OMX_PARAM_COLORSPACETYPE *param = (OMX_PARAM_COLORSPACETYPE *)pParam;
58 PARAM_GET_PORT(port, component, param->nPortIndex);
59 port->mmal->format->es->video.color_space = mmalil_omx_color_space_to_mmal(param->eColorSpace);
60- return mmalil_error_to_mmal(mmal_port_format_commit(port->mmal));
61+ return mmalil_error_to_omx(mmal_port_format_commit(port->mmal));
62 }
63 case OMX_IndexParamBrcmVideoCroppingDisable:
64 {
65diff --git a/interface/mmal/openmaxil/mmalomx_util_params_video.c b/interface/mmal/openmaxil/mmalomx_util_params_video.c
66index f088296..83e3724 100644
67--- a/interface/mmal/openmaxil/mmalomx_util_params_video.c
68+++ b/interface/mmal/openmaxil/mmalomx_util_params_video.c
69@@ -56,11 +56,11 @@ static MMAL_STATUS_T mmalomx_param_mapping_displayregion(MMALOMX_PARAM_MAPPING_D
70 mmal->set = omx->set;
71 mmal->display_num = omx->num;
72 mmal->fullscreen = omx->fullscreen;
73- mmal->transform = omx->transform;
74+ mmal->transform = (MMAL_DISPLAYTRANSFORM_T)omx->transform;
75 rect_to_mmal(&mmal->dest_rect, &omx->dest_rect);
76 rect_to_mmal(&mmal->src_rect, &omx->src_rect);
77 mmal->noaspect = omx->noaspect;
78- mmal->mode = omx->mode;
79+ mmal->mode = (MMAL_DISPLAYMODE_T)omx->mode;
80 mmal->pixel_x = omx->pixel_x;
81 mmal->pixel_y = omx->pixel_y;
82 mmal->layer = omx->layer;
83@@ -72,11 +72,11 @@ static MMAL_STATUS_T mmalomx_param_mapping_displayregion(MMALOMX_PARAM_MAPPING_D
84 omx->set = mmal->set;
85 omx->num = mmal->display_num;
86 omx->fullscreen = mmal->fullscreen;
87- omx->transform = mmal->transform;
88+ omx->transform = (OMX_DISPLAYTRANSFORMTYPE)mmal->transform;
89 rect_to_omx(&omx->dest_rect, &mmal->dest_rect);
90 rect_to_omx(&omx->src_rect, &mmal->src_rect);
91 omx->noaspect = mmal->noaspect;
92- omx->mode = mmal->mode;
93+ omx->mode = (OMX_DISPLAYMODETYPE)mmal->mode;
94 omx->pixel_x = mmal->pixel_x;
95 omx->pixel_y = mmal->pixel_y;
96 omx->layer = mmal->layer;
97--
982.9.0
99
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-01 19:31:34 +0000