diff options
author | NAMJEONGYOON <just.nam@samsung.com> | 2016-12-14 14:55:17 +0900 |
---|---|---|
committer | NAMJEONGYOON <just.nam@samsung.com> | 2016-12-14 14:55:30 +0900 |
commit | bdac8b8ca6064afeda46c03551af1a87e00240b9 (patch) | |
tree | f73d278b6606ce48c08325b6291c51ba6c83f1bf | |
parent | b2792926233f7e492b073c20a35f2b1ac619187f (diff) | |
parent | e1d4936be49d4a84434f1fe4fd4f20232909bfe2 (diff) | |
download | libmm-evas-renderer-accepted/tizen_3.0.m2_tv.tar.gz libmm-evas-renderer-accepted/tizen_3.0.m2_tv.tar.bz2 libmm-evas-renderer-accepted/tizen_3.0.m2_tv.zip |
Merge branch 'tizen' into tizen_3.0submit/tizen_3.0/20161220.100802submit/tizen_3.0.m2/20170104.093750accepted/tizen/3.0/wearable/20161221.011131accepted/tizen/3.0/tv/20161221.010759accepted/tizen/3.0/mobile/20161221.011625accepted/tizen/3.0/ivi/20161221.011013accepted/tizen/3.0/common/20161221.181320accepted/tizen/3.0.m2/wearable/20170104.125916accepted/tizen/3.0.m2/tv/20170104.125611accepted/tizen/3.0.m2/mobile/20170104.125454tizen_3.0.m2accepted/tizen_3.0.m2_wearableaccepted/tizen_3.0.m2_tvaccepted/tizen_3.0.m2_mobile
Change-Id: I75590173298736dc234d2c58dc5468341574e8b3
-rw-r--r-- | packaging/libmm-evas-renderer.spec | 2 | ||||
-rwxr-xr-x | src/mm_evas_renderer.c | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/packaging/libmm-evas-renderer.spec b/packaging/libmm-evas-renderer.spec index 6b65391..a9b1486 100644 --- a/packaging/libmm-evas-renderer.spec +++ b/packaging/libmm-evas-renderer.spec @@ -1,6 +1,6 @@ Name: libmm-evas-renderer Summary: Multimedia Framework Evas Renderer Library -Version: 0.0.8 +Version: 0.0.9 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/mm_evas_renderer.c b/src/mm_evas_renderer.c index c8fec0d..5d5c0b6 100755 --- a/src/mm_evas_renderer.c +++ b/src/mm_evas_renderer.c @@ -35,6 +35,7 @@ #endif #define LOG_TAG "MM_EVAS_RENDER" //#define _INTERNAL_DEBUG_ /* debug only */ +#define SWAP(a, b) ({int t; t = a; a = b; b = t; }) #if 0 #define MMER_FENTER(); LOGD("<ENTER>"); @@ -842,6 +843,13 @@ static void _mm_evas_renderer_update_geometry(mm_evas_info *evas_info, rect_info result->x = 0; result->y = 0; + if (evas_info->rotate_angle == DEGREE_90 || evas_info->rotate_angle == DEGREE_270) { + SWAP(evas_info->w, evas_info->h); +#ifdef _INTERNAL_DEBUG_ + LOGD("swapped width %d, height %d", evas_info->w, evas_info->h); +#endif + } + switch (evas_info->display_geometry_method) { case DISP_GEO_METHOD_LETTER_BOX: /* set black padding for letter box mode */ @@ -911,6 +919,10 @@ static void _mm_evas_renderer_update_geometry(mm_evas_info *evas_info, rect_info LOGW("unsupported mode."); break; } + + if (evas_info->rotate_angle == DEGREE_90 || evas_info->rotate_angle == DEGREE_270) + SWAP(evas_info->w, evas_info->h); + LOGD("geometry result [%d, %d, %d, %d]", result->x, result->y, result->w, result->h); MMER_FLEAVE(); |