From: giwoong.kim Date: Thu, 6 Sep 2012 07:12:58 +0000 (+0900) Subject: [Title] rollback blank X-Git-Tag: TizenStudio_2.0_p2.3~1340 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f99dbea6c4d8cda3eb91870b4b24f34870798c62;p=sdk%2Femulator%2Fqemu.git [Title] rollback blank [Type] [Module] [Priority] [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] Conflicts: package/pkginfo.manifest --- diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index b3c0d1d..70751f4 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version: 1.3.27 +Version: 1.3.45 Maintainer: Yeong-Kyoon Lee Source: emulator diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c old mode 100644 new mode 100755 index 7dbbb60..1747bc0 --- a/tizen/src/emulator.c +++ b/tizen/src/emulator.c @@ -269,6 +269,7 @@ static void parse_options(int argc, char *argv[], int *skin_argc, *skin_argv = &(argv[i + 1]); +#if 0 /* find out the size of lcd */ for(q = 0; q < (argc - i - 7); ++q) { if (strncmp(**skin_argv + q, "width=", 6) == 0) { @@ -304,6 +305,7 @@ static void parse_options(int argc, char *argv[], int *skin_argc, break; } } +#endif break; } diff --git a/tizen/src/maru_sdl.c b/tizen/src/maru_sdl.c old mode 100644 new mode 100755 index 9f61b85..a8857ba --- a/tizen/src/maru_sdl.c +++ b/tizen/src/maru_sdl.c @@ -108,7 +108,7 @@ void qemu_ds_sdl_resize(DisplayState *ds) } /* create surface_qemu */ - if (w == get_emul_lcd_width() && h == get_emul_lcd_height()) { + //if (w == get_emul_lcd_width() && h == get_emul_lcd_height()) { surface_qemu = SDL_CreateRGBSurfaceFrom(ds_get_data(ds), w, h, ds_get_bits_per_pixel(ds), ds_get_linesize(ds), @@ -116,11 +116,13 @@ void qemu_ds_sdl_resize(DisplayState *ds) ds->surface->pf.gmask, ds->surface->pf.bmask, ds->surface->pf.amask); +#if 0 } else { INFO("create blank screen = (%d, %d)\n", get_emul_lcd_width(), get_emul_lcd_height()); surface_qemu = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, ds_get_bits_per_pixel(ds), 0, 0, 0, 0); } +#endif #ifdef SDL_THREAD pthread_mutex_unlock(&sdl_mutex);