From e14aa620c2c288a9e61c3f9306369bbd8b091594 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 29 Nov 2000 04:49:22 +0000 Subject: [PATCH] dont return null fi images doesnt exist.. obejct creation shoudl ALWAYs succeed! SVN revision: 3934 --- legacy/evas/README | 2 +- legacy/evas/configure.in | 2 +- legacy/evas/evas.spec | 4 ++-- legacy/evas/src/Makefile.am | 2 +- legacy/evas/src/evas_image.c | 4 +--- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/legacy/evas/README b/legacy/evas/README index d63aae007f..13ed366d0a 100644 --- a/legacy/evas/README +++ b/legacy/evas/README @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- - E V A S - 0.0.1 + E V A S - 0.0.2 ------------------------------------------------------------------------------- This is the ``E Canvas'' - a rip off of some of the other canvas's floating diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in index 1c494bfa1e..7b3f2b69ea 100644 --- a/legacy/evas/configure.in +++ b/legacy/evas/configure.in @@ -1,6 +1,6 @@ AC_INIT(src/Evas.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(evas, 0.0.1) +AM_INIT_AUTOMAKE(evas, 0.0.2) AC_C_BIGENDIAN AC_PROG_CC AM_PROG_CC_STDC diff --git a/legacy/evas/evas.spec b/legacy/evas/evas.spec index a5256a713c..d24436220c 100644 --- a/legacy/evas/evas.spec +++ b/legacy/evas/evas.spec @@ -1,6 +1,6 @@ # this is NOT relocatable, unless you alter the patch! %define name evas -%define ver 0.0.1 +%define ver 0.0.2 %define rel 1 %define prefix /usr @@ -14,7 +14,7 @@ Version: %{ver} Release: %{rel} Copyright: BSD Group: User Interface/X -URL: http://www.enlightenment.org/efm.html +URL: http://www.enlightenment.org/ Packager: Term Vendor: The Enlightenment Development Team Source: ftp://ftp.enlightenment.org/enlightenment/%{name}-%{ver}.tar.gz diff --git a/legacy/evas/src/Makefile.am b/legacy/evas/src/Makefile.am index 5c467a0f5c..245a66ec05 100644 --- a/legacy/evas/src/Makefile.am +++ b/legacy/evas/src/Makefile.am @@ -59,4 +59,4 @@ Evas_private.h libevas_la_LIBADD = $(LIBS_ALL) libevas_la_DEPENDENCIES = $(top_builddir)/config.h -libevas_la_LDFLAGS = -version-info 0:1:0 +libevas_la_LDFLAGS = -version-info 0:2:0 diff --git a/legacy/evas/src/evas_image.c b/legacy/evas/src/evas_image.c index 36e0fe64ea..d9f68c3299 100644 --- a/legacy/evas/src/evas_image.c +++ b/legacy/evas/src/evas_image.c @@ -65,9 +65,7 @@ evas_add_image_from_file(Evas e, char *file) oo->current.image.w = imlib_image_get_width(); oo->current.image.h = imlib_image_get_height(); imlib_free_image(); - } else if(!im){ - return NULL; - } + } } } oo->current.fill.x = 0;