diff options
Diffstat (limited to 'libraries/ecore/src/lib/ecore_fb')
-rw-r--r-- | libraries/ecore/src/lib/ecore_fb/Makefile.in | 20 | ||||
-rw-r--r-- | libraries/ecore/src/lib/ecore_fb/ecore_fb.c | 23 |
2 files changed, 22 insertions, 21 deletions
diff --git a/libraries/ecore/src/lib/ecore_fb/Makefile.in b/libraries/ecore/src/lib/ecore_fb/Makefile.in index c0c30a5..e8030b1 100644 --- a/libraries/ecore/src/lib/ecore_fb/Makefile.in +++ b/libraries/ecore/src/lib/ecore_fb/Makefile.in | |||
@@ -50,16 +50,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \ | |||
50 | $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \ | 50 | $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \ |
51 | $(top_srcdir)/m4/efl_threads.m4 $(top_srcdir)/m4/gettext.m4 \ | 51 | $(top_srcdir)/m4/efl_threads.m4 $(top_srcdir)/m4/gettext.m4 \ |
52 | $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ | 52 | $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ |
53 | $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \ | 53 | $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ |
54 | $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ | 54 | $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ |
55 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 55 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
56 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 56 | $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
57 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ | 57 | $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ |
58 | $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ | 58 | $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac |
59 | $(top_srcdir)/configure.ac | ||
60 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 59 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
61 | $(ACLOCAL_M4) | 60 | $(ACLOCAL_M4) |
62 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 61 | mkinstalldirs = $(install_sh) -d |
63 | CONFIG_HEADER = $(top_builddir)/config.h | 62 | CONFIG_HEADER = $(top_builddir)/config.h |
64 | CONFIG_CLEAN_FILES = | 63 | CONFIG_CLEAN_FILES = |
65 | CONFIG_CLEAN_VPATH_FILES = | 64 | CONFIG_CLEAN_VPATH_FILES = |
@@ -194,6 +193,8 @@ EVAS_LIBS = @EVAS_LIBS@ | |||
194 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 193 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
195 | EVIL_LIBS = @EVIL_LIBS@ | 194 | EVIL_LIBS = @EVIL_LIBS@ |
196 | EXEEXT = @EXEEXT@ | 195 | EXEEXT = @EXEEXT@ |
196 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
197 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
197 | FGREP = @FGREP@ | 198 | FGREP = @FGREP@ |
198 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ | 199 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
199 | GLIB_CFLAGS = @GLIB_CFLAGS@ | 200 | GLIB_CFLAGS = @GLIB_CFLAGS@ |
@@ -249,6 +250,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
249 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 250 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
250 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 251 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
251 | PKG_CONFIG = @PKG_CONFIG@ | 252 | PKG_CONFIG = @PKG_CONFIG@ |
253 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
254 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
252 | POSUB = @POSUB@ | 255 | POSUB = @POSUB@ |
253 | RANLIB = @RANLIB@ | 256 | RANLIB = @RANLIB@ |
254 | SCIM_CFLAGS = @SCIM_CFLAGS@ | 257 | SCIM_CFLAGS = @SCIM_CFLAGS@ |
@@ -259,6 +262,7 @@ SDL_LIBS = @SDL_LIBS@ | |||
259 | SED = @SED@ | 262 | SED = @SED@ |
260 | SET_MAKE = @SET_MAKE@ | 263 | SET_MAKE = @SET_MAKE@ |
261 | SHELL = @SHELL@ | 264 | SHELL = @SHELL@ |
265 | SHM_OPEN_LIBS = @SHM_OPEN_LIBS@ | ||
262 | SSL_CFLAGS = @SSL_CFLAGS@ | 266 | SSL_CFLAGS = @SSL_CFLAGS@ |
263 | SSL_LIBS = @SSL_LIBS@ | 267 | SSL_LIBS = @SSL_LIBS@ |
264 | STRIP = @STRIP@ | 268 | STRIP = @STRIP@ |
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 | /** |