Section: libs
Priority: optional
Maintainer: Maemo-EFL Team <maemo-efl-devel@garage.maemo.org>
-Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.3-1.1), quilt, automake1.7 | automaken, libtool, libeet0-dev (>= 0.9.10.042-maemo2), libfreetype6-dev, libpng12-dev | libpng-dev, libx11-dev | xlibs-dev, zlib1g, libjpeg62-dev, autotools-dev
+Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.3-1.1), quilt, automake1.7 | automaken, libtool, libeet1-dev (>= 1.0.0), libfreetype6-dev, libpng12-dev | libpng-dev, libx11-dev | xlibs-dev, zlib1g, libjpeg62-dev, autotools-dev
Standards-Version: 3.7.2
+#Homepage: http://www.enlightenment.org
Package: libevas0
-Section: libs
Architecture: any
Depends: ${shlibs:Depends}
Suggests: libevas0-engines-all
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
- .
- This new version of evas is much more cleaner, compact and portable; and has
- Ipaq support. The Ipaq version of the library is just 191Kb in size!
- .
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
+ .
+ This package contains the core library.
+
+#Package: libevas-doc
+#Architecture: all
+#Section: doc
+#Enhances: libevas0-dev
+#Description: Evas API Documentation
+# Evas is an advanced canvas library, providing six engines for rendering: X11,
+# OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
+# and Qtopia.
+# Due to its simple API, evas can be developed with rapidly, and cleanly.
+# .
+# This package provides development documentation (html and manpages) for the
+# Evas library.
Package: libevas0-dev
Section: libdevel
Architecture: any
-Depends: libevas0 (= ${Source-Version}), libfreetype6-dev, zlib1g-dev, libjpeg-dev, libeet0-dev (>= 0.9.10.042-maemo2)
+Depends: libevas0 (= ${Source-Version}), libfreetype6-dev, zlib1g-dev, libjpeg-dev, libeet1-dev (>= 1.0.0)
Provides: libevas-dev
-Description: enlightenment advanced canvas library development files
- This package provides headers and static libraries required to develop against
- evas.
- .
+Description: Enlightenment DR17 advanced canvas library development files
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
- .
- This new version of evas is much more cleaner, compact and portable; and has
- Ipaq support. The Ipaq version of the library is just 191Kb in size!
- .
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
+ .
+ This package provides headers and static libraries required to develop against
+ evas.
+
+#Package: libevas0-dbg
+#Architecture: any
+#Section: libdevel
+#Depends: libevas0 (= ${Source-Version})
+#Priority: extra
+#Provides: libevas-dbg
+#Description: enlightenment advanced canvas library
+# Evas is an advanced canvas library, providing six engines for rendering: X11,
+# OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
+# and Qtopia.
+# .
+# This package contains unstripped shared libraries. It is provided primarily
+# to provide a backtrace with names in a debugger, this makes it somewhat
+# easier to interpret core dumps. The libraries are installed in
+# /usr/lib/debug and are automatically used by gdb.
+
+#Package: libevas0-engine-fb
+#Section: libs
+#Architecture: any
+#Depends: ${shlibs:Depends}, libevas0-engine-software-generic (= ${Source-Version})
+#Provides: libevas-engine-fb
+#Description: Evas module providing a framebuffer render engine
+# Evas is an advanced canvas library, providing six engines for rendering: X11,
+# OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
+# and Qtopia.
+# Due to its simple API, evas can be developed with rapidly, and cleanly.
+# .
+# This package contains an Evas engine module for framebuffer rendering.
Package: libevas0-engine-software-x11
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libevas0-engine-software-generic (= ${Source-Version})
Provides: libevas-engine-software-x11
-Description: Evas module providing the software X11 render engine
+Description: Evas module providing a software X11 render engine
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
- This package contains the Evas engine module for software X11 rendering.
+ .
+ This package contains an Evas engine module for software X11 rendering.
Package: libevas0-engine-software-x11-16
Section: libs
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
+ .
This package contains the Evas engine module for software X11 rendering optimized
for 16 bits.
Architecture: any
Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version})
Provides: libevas-engine-software-generic
-Description: Evas module providing the generic software render engine
+Description: Evas module providing a generic software render engine
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
- This package contains the Evas engine module for generic software
+ .
+ This package contains an Evas engine module for generic software
rendering.
Package: libevas0-engine-buffer
Architecture: any
Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libevas0-engine-software-generic (= ${Source-Version})
Provides: libevas-engine-buffer
-Description: Evas module providing the buffer render engine
+Description: Evas module providing a buffer render engine
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
- This package contains the Evas engine module for buffer rendering.
+ .
+ This package contains an Evas engine module for buffer rendering.
+
+#Package: libevas0-engine-xrender
+#Section: libs
+#Architecture: any
+#Depends: ${shlibs:Depends}, libevas0-engine-software-generic (= ${Source-Version})
+#Provides: libevas-engine-xrender
+#Description: Evas module providing a Xrender engine
+# Evas is an advanced canvas library, providing six engines for rendering: X11,
+# OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
+# and Qtopia.
+# Due to its simple API, evas can be developed with rapidly, and cleanly.
+# .
+# This package contains an Evas engine module for Xrender.
+
+#Package: libevas0-engine-gl-x11
+#Section: libs
+#Architecture: any
+#Depends: ${shlibs:Depends}, libevas0-engine-software-generic (= ${Source-Version})
+#Provides: libevas-engine-gl-x11
+#Description: Evas module providing an OpenGL engine
+# Evas is an advanced canvas library, providing six engines for rendering: X11,
+# OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
+# and Qtopia.
+# Due to its simple API, evas can be developed with rapidly, and cleanly.
+# .
+# This package contains an Evas engine module for OpenGl.
Package: libevas0-loader-eet
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libeet0 (>= 0.9.10.042-maemo2)
+Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libeet1 (>= 1.0.0)
Provides: libevas-loader-eet
-Description: Evas module providing the Eet loader
+Description: Evas module providing an Eet loader
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
- This package contains the Evas loader module for Eet.
+ .
+ This package contains an Evas loader module for Eet.
Package: libevas0-loader-png
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libpng12-0
Provides: libevas-loader-png
-Description: Evas module providing the PNG loader
+Description: Evas module providing a PNG loader
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
- This package contains the Evas loader module for PNG.
+ .
+ This package contains an Evas loader module for PNG.
Package: libevas0-loader-jpeg
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libjpeg62
Provides: libevas-loader-jpeg
-Description: Evas module providing the JPEG loader
+Description: Evas module providing a JPEG loader
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
- This package contains the Evas loader module for JPEG.
+ .
+ This package contains an Evas loader module for JPEG.
+
+#Package: libevas0-loader-gif
+#Section: libs
+#Architecture: any
+#Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libungif4g
+#Provides: libevas-loader-gif
+#Description: Evas module providing a GIF loader
+# Evas is an advanced canvas library, providing six engines for rendering: X11,
+# OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
+# and Qtopia.
+# Due to its simple API, evas can be developed with rapidly, and cleanly.
+# .
+# This package contains an Evas loader module for GIF.
+
+#Package: libevas0-loader-tiff
+#Section: libs
+#Architecture: any
+#Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libtiff4
+#Provides: libevas-loader-tiff
+#Description: Evas module providing a TIFF loader
+# Evas is an advanced canvas library, providing six engines for rendering: X11,
+# OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
+# and Qtopia.
+# Due to its simple API, evas can be developed with rapidly, and cleanly.
+# .
+# This package contains an Evas loader module for TIFF.
+
+#Package: libevas0-loader-xpm
+#Section: libs
+#Architecture: any
+#Provides: libevas-loader-xpm
+#Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libxpm4
+#Description: Evas module providing a X11 pixmap loader
+# Evas is an advanced canvas library, providing six engines for rendering: X11,
+# OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
+# and Qtopia.
+# Due to its simple API, evas can be developed with rapidly, and cleanly.
+# .
+# This package contains an Evas loader module for XPM.
+
+#Package: libevas0-loader-svg
+#Section: libs
+#Architecture: any
+#Provides: libevas-loader-svg
+#Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), librsvg2-2
+#Description: Evas module providing a SVG loader
+# Evas is an advanced canvas library, providing six engines for rendering: X11,
+# OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
+# and Qtopia.
+# Due to its simple API, evas can be developed with rapidly, and cleanly.
+# .
+# This package contains an Evas loader module for SVG.
Package: libevas0-saver-eet
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libeet0 (>= 0.9.10.042-maemo2)
+Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libeet1 (>= 1.0.0)
Provides: libevas-saver-eet
-Description: Evas module providing the Eet saver
+Description: Evas module providing an Eet saver
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
- This package contains the Evas saver module for Eet.
+ .
+ This package contains an Evas saver module for Eet.
Package: libevas0-saver-png
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libpng12-0
Provides: libevas-saver-png
-Description: Evas module providing the PNG saver
+Description: Evas module providing a PNG saver
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
- This package contains the Evas saver module for PNG.
+ .
+ This package contains an Evas saver module for PNG.
Package: libevas0-saver-jpeg
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libjpeg62
Provides: libevas-saver-jpeg
-Description: Evas module providing the JPEG saver
+Description: Evas module providing a JPEG saver
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
- This package contains the Evas saver module for JPEG.
+ .
+ This package contains an Evas saver module for JPEG.
+
+#Package: libevas0-saver-tiff
+#Section: libs
+#Architecture: any
+#Depends: ${shlibs:Depends}, libevas0 (= ${Source-Version}), libtiff4
+#Provides: libevas-saver-tiff
+#Description: Evas module providing a TIFF saver
+# Evas is an advanced canvas library, providing six engines for rendering: X11,
+# OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
+# and Qtopia.
+# Due to its simple API, evas can be developed with rapidly, and cleanly.
+# .
+# This package contains an Evas saver module for TIFF.
Package: libevas0-engines-all
Section: graphics
Architecture: any
Depends: libevas0-engine-buffer (= ${Source-Version}), libevas0-engine-software-generic (= ${Source-Version}), libevas0-engine-software-x11 (= ${Source-Version}), libevas0-engine-software-x11-16 (= ${Source-Version})
Provides: libevas-engines-all
-Description: virtual package providing all available Evas engines
- This is a virtual package providing all available Evas engine modules.
- .
+Description: virtual package providing important Evas engine modules
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
- .
- This new version of evas is much more cleaner, compact and portable; and has
- Ipaq support. The Ipaq version of the library is just 191Kb in size!
- .
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
+ .
+ This package will install the following Evas engine modules:
+ - buffer
+ - software/genenric
+ - software/X11
+ - software/X11-16
-Package: libevas0-loaders-all
+#Package: libevas0-engines-extra
+#Architecture: any
+#Depends: libevas-engine-fb (= ${Source-Version}), libevas-engine-gl-x11 (= ${Source-Version})
+#Provides: libevas-engines-extra
+#Description: virtual package providing optional Evas engine modules
+# Evas is an advanced canvas library, providing six engines for rendering: X11,
+# OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
+# and Qtopia.
+# Due to its simple API, evas can be developed with rapidly, and cleanly.
+# .
+# This package will install the following Evas engine modules:
+# - GL/X11
+# - Framebuffer
+
+Package: libevas0-savers-all
Section: graphics
Architecture: any
-Depends: libevas0-loader-eet (= ${Source-Version}), libevas0-loader-jpeg (= ${Source-Version}), libevas0-loader-png (= ${Source-Version})
-Provides: libevas-loaders-all
-Description: virtual package providing all available Evas loaders
- This is a virtual package providing all available Evas loader modules.
- .
+Depends: libevas0-saver-eet (= ${Source-Version}), libevas0-saver-jpeg (= ${Source-Version}), libevas0-saver-png (= ${Source-Version})
+Provides: libevas-savers-all
+Description: virtual package providing all available Evas savers
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
- .
- This new version of evas is much more cleaner, compact and portable; and has
- Ipaq support. The Ipaq version of the library is just 191Kb in size!
- .
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
+ .
+ This is a virtual package providing all available Evas saver modules.
-Package: libevas0-savers-all
+Package: libevas0-loaders-all
Section: graphics
Architecture: any
-Depends: libevas0-saver-eet (= ${Source-Version}), libevas0-saver-jpeg (= ${Source-Version}), libevas0-saver-png (= ${Source-Version})
-Provides: libevas-savers-all
-Description: virtual package providing all available Evas savers
- This is a virtual package providing all available Evas saver modules.
- .
+Depends: libevas0-loader-eet (= ${Source-Version}), libevas0-loader-jpeg (= ${Source-Version}), libevas0-loader-png (= ${Source-Version})
+Provides: libevas-loaders-all
+Description: virtual package providing all available Evas loaders
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
- .
- This new version of evas is much more cleaner, compact and portable; and has
- Ipaq support. The Ipaq version of the library is just 191Kb in size!
- .
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
+ .
+ This is a virtual package providing all available Evas loader modules.
Package: libevas0-all
Section: graphics
Depends: libevas0-loaders-all (= ${Source-Version}), libevas0-savers-all (= ${Source-Version}), libevas0-engines-all (= ${Source-Version})
Provides: libevas-all
Description: virtual package providing all available Evas modules
- This is a virtual package providing all available Evas modules.
- .
Evas is an advanced canvas library, providing six engines for rendering: X11,
OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
and Qtopia.
.
- This new version of evas is much more cleaner, compact and portable; and has
- Ipaq support. The Ipaq version of the library is just 191Kb in size!
- .
Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
-
+ .
+ This is a virtual package providing all available Evas modules.
-Files evas/.git/index and /tmp/evas/.git/index differ
-diff -upNr evas/src/lib/Evas.h /tmp/evas/src/lib/Evas.h
---- evas/src/lib/Evas.h 2008-02-18 17:42:01.000000000 -0200
-+++ /tmp/evas/src/lib/Evas.h 2008-02-18 17:41:49.000000000 -0200
-@@ -492,6 +492,7 @@ extern "C" {
- EAPI void evas_object_image_size_get (const Evas_Object *obj, int *w, int *h);
+diff -upNr evas/src/lib/Evas.h evas.new/src/lib/Evas.h
+--- evas/src/lib/Evas.h 2008-05-07 15:06:26.000000000 -0300
++++ evas.new/src/lib/Evas.h 2008-05-07 15:07:35.000000000 -0300
+@@ -532,6 +532,7 @@ extern "C" {
EAPI int evas_object_image_stride_get (const Evas_Object *obj);
EAPI int evas_object_image_load_error_get (const Evas_Object *obj);
-+ EAPI void *evas_object_image_data_convert (Evas_Object *obj, Evas_Colorspace to_cspace);
EAPI void evas_object_image_data_set (Evas_Object *obj, void *data);
++ EAPI void *evas_object_image_data_convert (Evas_Object *obj, Evas_Colorspace to_cspace);
EAPI void *evas_object_image_data_get (const Evas_Object *obj, Evas_Bool for_writing);
EAPI void evas_object_image_data_copy_set (Evas_Object *obj, void *data);
-diff -upNr evas/src/lib/canvas/evas_object_image.c /tmp/evas/src/lib/canvas/evas_object_image.c
---- evas/src/lib/canvas/evas_object_image.c 2008-02-18 17:42:01.000000000 -0200
-+++ /tmp/evas/src/lib/canvas/evas_object_image.c 2008-02-18 17:41:49.000000000 -0200
-@@ -69,6 +69,8 @@ static int evas_object_image_is_opaque(E
+ EAPI void evas_object_image_data_update_add (Evas_Object *obj, int x, int y, int w, int h);
+diff -upNr evas/src/lib/canvas/evas_object_image.c evas.new/src/lib/canvas/evas_object_image.c
+--- evas/src/lib/canvas/evas_object_image.c 2008-05-07 15:06:26.000000000 -0300
++++ evas.new/src/lib/canvas/evas_object_image.c 2008-05-07 15:07:35.000000000 -0300
+@@ -67,6 +67,8 @@ static int evas_object_image_is_opaque(E
static int evas_object_image_was_opaque(Evas_Object *obj);
static int evas_object_image_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
static const Evas_Object_Func object_func =
{
/* methods (compulsory) */
-@@ -701,6 +703,46 @@ evas_object_image_load_error_get(const E
- }
+@@ -706,6 +708,46 @@ evas_object_image_load_error_get(const E
+ */
/**
+ * Converts the raw image data of the given image object to the
+}
+
+/**
- * @defgroup Evas_Object_Image_Data Image Object Image Data Functions
+ * Sets the raw image data of the given image object.
*
- * Functions that allow you to access or modify the image pixel data of an
-@@ -1126,11 +1168,22 @@ evas_object_image_save(const Evas_Object
+ * Note that the raw data must be of the same size and colorspace
+@@ -1127,7 +1169,19 @@ evas_object_image_save(const Evas_Object
+ EVAS_COLORSPACE_ARGB8888);
+ if (im)
{
- if (o->cur.has_alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA;
-
-- im->image->data = data;
-- im->image->w = o->cur.image.w;
-- im->image->h = o->cur.image.h;
-- im->image->no_free = 1;
- ok = evas_common_save_image_to_file(im, file, key, quality, compress);
+ if (o->cur.cspace == EVAS_COLORSPACE_ARGB8888)
-+ im->image->data = data;
++ im->image.data = data;
+ else
-+ im->image->data = evas_object_image_data_convert_internal(o,
-+ data,
-+ EVAS_COLORSPACE_ARGB8888);
-+ if (im->image->data)
++ im->image.data = evas_object_image_data_convert_internal(o,
++ data,
++ EVAS_COLORSPACE_ARGB8888);
++ if (im->image.data)
+ {
-+ im->image->w = o->cur.image.w;
-+ im->image->h = o->cur.image.h;
-+ im->image->no_free = 1;
+ ok = evas_common_save_image_to_file(im, file, key, quality, compress);
+
+ if (o->cur.cspace != EVAS_COLORSPACE_ARGB8888)
-+ free(im->image->data);
++ free(im->image.data);
+ }
- evas_cache_image_drop(im);
+ evas_cache_image_drop(&im->cache_entry);
}
-@@ -2376,3 +2429,36 @@ evas_object_image_is_inside(Evas_Object
+@@ -2373,3 +2427,36 @@ evas_object_image_is_inside(Evas_Object
return (a != 0);
}
+
+ return out;
+}
-diff -upNr evas/src/lib/engines/common/Makefile.am /tmp/evas/src/lib/engines/common/Makefile.am
---- evas/src/lib/engines/common/Makefile.am 2008-02-18 17:42:01.000000000 -0200
-+++ /tmp/evas/src/lib/engines/common/Makefile.am 2008-02-18 17:41:49.000000000 -0200
-@@ -23,6 +23,7 @@ evas_op_mul_main_.c \
+diff -upNr evas/src/lib/engines/common/Makefile.am evas.new/src/lib/engines/common/Makefile.am
+--- evas/src/lib/engines/common/Makefile.am 2008-05-07 15:06:27.000000000 -0300
++++ evas.new/src/lib/engines/common/Makefile.am 2008-05-07 15:07:35.000000000 -0300
+@@ -24,6 +24,7 @@ evas_op_mul_main_.c \
evas_blend_main.c \
evas_blit_main.c \
evas_convert_color.c \
evas_convert_gry_1.c \
evas_convert_gry_4.c \
evas_convert_gry_8.c \
-diff -upNr evas/src/lib/engines/common/Makefile.in /tmp/evas/src/lib/engines/common/Makefile.in
---- evas/src/lib/engines/common/Makefile.in 2008-02-18 17:42:30.000000000 -0200
-+++ /tmp/evas/src/lib/engines/common/Makefile.in 2008-02-18 17:42:49.000000000 -0200
+diff -upNr evas/src/lib/engines/common/Makefile.in evas.new/src/lib/engines/common/Makefile.in
+--- evas/src/lib/engines/common/Makefile.in 2008-05-07 15:08:04.000000000 -0300
++++ evas.new/src/lib/engines/common/Makefile.in 2008-05-07 15:08:32.000000000 -0300
@@ -48,13 +48,14 @@ am_libevas_engine_common_la_OBJECTS = ev
evas_op_blend_main_.lo evas_op_add_main_.lo \
evas_op_sub_main_.lo evas_op_mask_main_.lo \
evas_gradient_linear.lo evas_gradient_radial.lo \
evas_gradient_angular.lo evas_gradient_rectangular.lo \
evas_gradient_sinusoidal.lo evas_image_load.lo \
-@@ -286,6 +287,7 @@ evas_op_mul_main_.c \
+@@ -293,6 +294,7 @@ evas_op_mul_main_.c \
evas_blend_main.c \
evas_blit_main.c \
evas_convert_color.c \
evas_convert_gry_1.c \
evas_convert_gry_4.c \
evas_convert_gry_8.c \
-@@ -390,6 +392,7 @@ distclean-compile:
+@@ -397,6 +399,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_blend_main.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_blit_main.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_convert_color.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_convert_gry_1.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_convert_gry_4.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evas_convert_gry_8.Plo@am__quote@
-diff -upNr evas/src/lib/engines/common/evas_convert_colorspace.c /tmp/evas/src/lib/engines/common/evas_convert_colorspace.c
+diff -upNr evas/src/lib/engines/common/evas_convert_colorspace.c evas.new/src/lib/engines/common/evas_convert_colorspace.c
--- evas/src/lib/engines/common/evas_convert_colorspace.c 1969-12-31 21:00:00.000000000 -0300
-+++ /tmp/evas/src/lib/engines/common/evas_convert_colorspace.c 2008-02-18 17:41:49.000000000 -0200
-@@ -0,0 +1,70 @@
++++ evas.new/src/lib/engines/common/evas_convert_colorspace.c 2008-05-07 15:07:35.000000000 -0300
+@@ -0,0 +1,69 @@
+#include "evas_common.h"
+
+#define CONVERT_RGB_565_TO_RGB_888(s) \
+ }
+ return NULL;
+}
-+
-diff -upNr evas/src/lib/include/evas_common.h /tmp/evas/src/lib/include/evas_common.h
---- evas/src/lib/include/evas_common.h 2008-02-18 17:42:01.000000000 -0200
-+++ /tmp/evas/src/lib/include/evas_common.h 2008-02-18 17:41:49.000000000 -0200
-@@ -999,6 +999,9 @@ EAPI void evas_common_convert_color_rgb_
+diff -upNr evas/src/lib/include/evas_common.h evas.new/src/lib/include/evas_common.h
+--- evas/src/lib/include/evas_common.h 2008-05-07 15:06:27.000000000 -0300
++++ evas.new/src/lib/include/evas_common.h 2008-05-07 15:07:35.000000000 -0300
+@@ -1039,6 +1039,9 @@ EAPI void evas_common_convert_color_rgb_
EAPI void evas_common_convert_color_hsv_to_rgb_int (int h, int s, int v, int *r, int *g, int *b);
EAPI void evas_common_convert_color_rgb_to_hsv_int (int r, int g, int b, int *h, int *s, int *v);
projects / maemo-efl / commitdiff