diff options
| author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
| commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
| tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/ecore/src/lib/ecore_fb/ecore_fb.c | |
| parent | Adding the new extantz viewer and grid manager. (diff) | |
| download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz | |
Update EFL to latest beta.
Diffstat (limited to 'libraries/ecore/src/lib/ecore_fb/ecore_fb.c')
| -rw-r--r-- | libraries/ecore/src/lib/ecore_fb/ecore_fb.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/libraries/ecore/src/lib/ecore_fb/ecore_fb.c b/libraries/ecore/src/lib/ecore_fb/ecore_fb.c index ca7d73d..daeea0f 100644 --- a/libraries/ecore/src/lib/ecore_fb/ecore_fb.c +++ b/libraries/ecore/src/lib/ecore_fb/ecore_fb.c | |||
| @@ -92,21 +92,18 @@ _ecore_fb_size_get(int *w, int *h) | |||
| 92 | 92 | ||
| 93 | fb = open("/dev/fb0", O_RDWR); | 93 | fb = open("/dev/fb0", O_RDWR); |
| 94 | if (fb < 0) | 94 | if (fb < 0) |
| 95 | { | 95 | goto exit; |
| 96 | if (w) *w = 0; | 96 | |
| 97 | if (h) *h = 0; | ||
| 98 | return; | ||
| 99 | } | ||
| 100 | if (ioctl(fb, FBIOGET_VSCREENINFO, &fb_var) == -1) | 97 | if (ioctl(fb, FBIOGET_VSCREENINFO, &fb_var) == -1) |
| 101 | { | 98 | goto err_ioctl; |
| 102 | if (w) *w = 0; | 99 | |
| 103 | if (h) *h = 0; | 100 | *w = fb_var.xres; |
| 104 | close(fb); | 101 | *h = fb_var.yres; |
| 105 | return; | 102 | |
| 106 | } | 103 | err_ioctl: |
| 107 | close(fb); | 104 | close(fb); |
| 108 | if (w) *w = fb_var.xres; | 105 | exit: |
| 109 | if (h) *h = fb_var.yres; | 106 | return; |
| 110 | } | 107 | } |
| 111 | 108 | ||
| 112 | /** | 109 | /** |