Would be nice to add the cserve2 loader as well, otherwise when we change to it will have less loaders than in the default in-proc loaders
--Gustavo Sent from my iPhone On 03/09/2012, at 03:23, "Enlightenment SVN" <no-re...@enlightenment.org> wrote: > Log: > From: Igor Murzov <e-m...@date.by> > Subject: [E-devel] [PATCH][RESEND][Evas] WebP image loader > > This patch adds a WebP image loader to Evas. No saver, > no animation support for now, just loader. Tested with > the libwebp-0.2.0 only, but should work fine with older > versions. > > > > Author: raster > Date: 2012-09-02 23:22:59 -0700 (Sun, 02 Sep 2012) > New Revision: 75951 > Trac: http://trac.enlightenment.org/e/changeset/75951 > > Added: > trunk/evas/src/bin/loaders/webp/ trunk/evas/src/bin/loaders/webp/Makefile.am > trunk/evas/src/bin/loaders/webp/evas_image_load_webp.c > trunk/evas/src/modules/loaders/webp/ > trunk/evas/src/modules/loaders/webp/Makefile.am > trunk/evas/src/modules/loaders/webp/evas_image_load_webp.c > Modified: > trunk/evas/AUTHORS trunk/evas/ChangeLog trunk/evas/NEWS trunk/evas/README > trunk/evas/configure.ac trunk/evas/m4/evas_check_loader.m4 > trunk/evas/src/bin/evas_cserve2_slave.c > trunk/evas/src/bin/loaders/Makefile.am > trunk/evas/src/lib/engines/common/evas_image_load.c > trunk/evas/src/lib/file/evas_module.c > trunk/evas/src/modules/loaders/Makefile.am > > Modified: trunk/evas/AUTHORS > =================================================================== > --- trunk/evas/AUTHORS 2012-09-03 06:20:47 UTC (rev 75950) > +++ trunk/evas/AUTHORS 2012-09-03 06:22:59 UTC (rev 75951) > @@ -37,3 +37,4 @@ > Rafael Antognolli <antogno...@profusion.mobi> > Daniel Zaoui <daniel.za...@samsung.com> > Christophe Sadoine <ch...@indefini.org> > +Igor Murzov <e-m...@date.by> > > Modified: trunk/evas/ChangeLog > =================================================================== > --- trunk/evas/ChangeLog 2012-09-03 06:20:47 UTC (rev 75950) > +++ trunk/evas/ChangeLog 2012-09-03 06:22:59 UTC (rev 75951) > @@ -1008,3 +1008,7 @@ > > * Fix seg fault in the esvg loader, latest code is required, and > enable it on Windows. > + > +2012-09-03 Igor Murzov > + > + * Add WEBP loader module and cserve2 binary loader patch. > > Modified: trunk/evas/NEWS > =================================================================== > --- trunk/evas/NEWS 2012-09-03 06:20:47 UTC (rev 75950) > +++ trunk/evas/NEWS 2012-09-03 06:22:59 UTC (rev 75951) > @@ -3,6 +3,10 @@ > Changes since Evas 1.7.0: > ------------------------- > > +Additions: > + > + * WEBP image loader support. > + > Improvements: > > * Function to rotate an evas map with a quaternion: > evas_map_util_quat_rotate(). > > Modified: trunk/evas/README > =================================================================== > --- trunk/evas/README 2012-09-03 06:20:47 UTC (rev 75950) > +++ trunk/evas/README 2012-09-03 06:22:59 UTC (rev 75951) > @@ -527,7 +527,10 @@ > > this loader uses libtiff to load tiff image files > > +--enable-image-loader-webp[=static] > > +this loader uses libwebp to load webp image files > + > --enable-image-loader-xpm[=static] > > this is an xpm format image loader. xpm format images are ascii files > > Modified: trunk/evas/configure.ac > =================================================================== > --- trunk/evas/configure.ac 2012-09-03 06:20:47 UTC (rev 75950) > +++ trunk/evas/configure.ac 2012-09-03 06:22:59 UTC (rev 75951) > @@ -126,6 +126,7 @@ > want_evas_image_loader_bmp="yes" > want_evas_image_loader_tga="yes" > want_evas_image_loader_wbmp="yes" > +want_evas_image_loader_webp="yes" > want_evas_image_loader_ico="yes" > want_evas_image_loader_psd="yes" > want_evas_image_loader_generic="yes" > @@ -1058,6 +1059,8 @@ > > EVAS_CHECK_IMAGE_LOADER([WBMP], [${want_evas_image_loader_wbmp}]) > > +EVAS_CHECK_IMAGE_LOADER([WEBP], [${want_evas_image_loader_webp}]) > + > EVAS_CHECK_IMAGE_LOADER([ICO], [${want_evas_image_loader_ico}]) > > EVAS_CHECK_IMAGE_LOADER([PSD], [${want_evas_image_loader_psd}]) > @@ -1845,6 +1848,7 @@ > src/bin/loaders/tga/Makefile > src/bin/loaders/pmaps/Makefile > src/bin/loaders/wbmp/Makefile > +src/bin/loaders/webp/Makefile > src/bin/loaders/psd/Makefile > src/lib/Makefile > src/lib/canvas/Makefile > @@ -1900,6 +1904,7 @@ > src/modules/loaders/svg/Makefile > src/modules/loaders/pmaps/Makefile > src/modules/loaders/wbmp/Makefile > +src/modules/loaders/webp/Makefile > src/modules/loaders/psd/Makefile > src/modules/loaders/generic/Makefile > src/modules/savers/Makefile > @@ -1994,6 +1999,7 @@ > echo " TGA.....................: $have_evas_image_loader_tga" > echo " TIFF....................: $have_evas_image_loader_tiff" > echo " WBMP....................: $have_evas_image_loader_wbmp" > +echo " WEBP....................: $have_evas_image_loader_webp" > echo " XPM.....................: $have_evas_image_loader_xpm" > echo > echo "Font Sourcing Systems:" > > Modified: trunk/evas/m4/evas_check_loader.m4 > =================================================================== > --- trunk/evas/m4/evas_check_loader.m4 2012-09-03 06:20:47 UTC (rev 75950) > +++ trunk/evas/m4/evas_check_loader.m4 2012-09-03 06:22:59 UTC (rev 75951) > @@ -429,6 +429,38 @@ > > ]) > > +dnl use: EVAS_CHECK_LOADER_DEP_WEBP(loader, want_static[, ACTION-IF-FOUND[, > ACTION-IF-NOT-FOUND]]) > + > +AC_DEFUN([EVAS_CHECK_LOADER_DEP_WEBP], > +[ > + > +have_dep="no" > +evas_image_loader_[]$1[]_cflags="" > +evas_image_loader_[]$1[]_libs="" > + > +AC_CHECK_HEADER([webp/decode.h], [have_dep="yes"]) > + > +if test "x${have_dep}" = "xyes" ; then > + AC_CHECK_LIB([webp], > + [WebPDecodeRGBA], > + [ > + evas_image_loader_[]$1[]_libs="-lwebp" > + ], > + [have_dep="no"] > + ) > +fi > + > +AC_SUBST([evas_image_loader_$1_cflags]) > +AC_SUBST([evas_image_loader_$1_libs]) > + > +if test "x${have_dep}" = "xyes" ; then > + m4_default([$3], [:]) > +else > + m4_default([$4], [:]) > +fi > + > +]) > + > dnl use: EVAS_CHECK_LOADER_DEP_GENERIC(loader, want_static[, > ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) > > AC_DEFUN([EVAS_CHECK_LOADER_DEP_GENERIC], > > Modified: trunk/evas/src/bin/evas_cserve2_slave.c > =================================================================== > --- trunk/evas/src/bin/evas_cserve2_slave.c 2012-09-03 06:20:47 UTC (rev > 75950) > +++ trunk/evas/src/bin/evas_cserve2_slave.c 2012-09-03 06:22:59 UTC (rev > 75951) > @@ -50,6 +50,7 @@ > MATCHING(".bmp", "bmp"), > MATCHING(".tga", "tga"), > MATCHING(".wbmp", "wbmp"), > + MATCHING(".webp", "webp"), > MATCHING(".ico", "ico"), > MATCHING(".cur", "ico"), > MATCHING(".psd", "psd") > @@ -57,7 +58,7 @@ > > static const char *loaders_name[] = > { /* in order of most likely needed */ > - "png", "jpeg", "eet", "xpm", "tiff", "gif", "svg", "pmaps", "bmp", "tga", > "wbmp", "ico", "psd", "edb" > + "png", "jpeg", "eet", "xpm", "tiff", "gif", "svg", "webp", "pmaps", "bmp", > "tga", "wbmp", "ico", "psd", "edb" > }; > > Eina_Bool > > Modified: trunk/evas/src/bin/loaders/Makefile.am > =================================================================== > --- trunk/evas/src/bin/loaders/Makefile.am 2012-09-03 06:20:47 UTC (rev > 75950) > +++ trunk/evas/src/bin/loaders/Makefile.am 2012-09-03 06:22:59 UTC (rev > 75951) > @@ -42,6 +42,10 @@ > SUBDIRS += wbmp > endif > > +if BUILD_LOADER_WEBP > +SUBDIRS += webp > +endif > + > if BUILD_LOADER_XPM > SUBDIRS += xpm > endif > > Modified: trunk/evas/src/lib/engines/common/evas_image_load.c > =================================================================== > --- trunk/evas/src/lib/engines/common/evas_image_load.c 2012-09-03 > 06:20:47 UTC (rev 75950) > +++ trunk/evas/src/lib/engines/common/evas_image_load.c 2012-09-03 > 06:22:59 UTC (rev 75951) > @@ -47,6 +47,7 @@ > MATCHING(".bmp", "bmp"), > MATCHING(".tga", "tga"), > MATCHING(".wbmp", "wbmp"), > + MATCHING(".webp", "webp"), > MATCHING(".ico", "ico"), > MATCHING(".cur", "ico"), > MATCHING(".psd", "psd"), > @@ -127,7 +128,7 @@ > > static const char *loaders_name[] = > { /* in order of most likely needed */ > - "png", "jpeg", "eet", "xpm", "tiff", "gif", "svg", "pmaps", "bmp", "tga", > "wbmp", "ico", "psd", "edb", "generic" > + "png", "jpeg", "eet", "xpm", "tiff", "gif", "svg", "webp", "pmaps", "bmp", > "tga", "wbmp", "ico", "psd", "edb", "generic" > }; > > struct evas_image_foreach_loader_data > > Modified: trunk/evas/src/lib/file/evas_module.c > =================================================================== > --- trunk/evas/src/lib/file/evas_module.c 2012-09-03 06:20:47 UTC (rev > 75950) > +++ trunk/evas/src/lib/file/evas_module.c 2012-09-03 06:22:59 UTC (rev > 75951) > @@ -123,6 +123,7 @@ > EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, tga); > EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, tiff); > EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, wbmp); > +EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, webp); > EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, xpm); > EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, edb); > EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, eet); > @@ -233,6 +234,9 @@ > #ifdef EVAS_STATIC_BUILD_WBMP > EVAS_EINA_STATIC_MODULE_USE(image_loader, wbmp), > #endif > +#ifdef EVAS_STATIC_BUILD_WEBP > + EVAS_EINA_STATIC_MODULE_USE(image_loader, webp), > +#endif > #ifdef EVAS_STATIC_BUILD_XPM > EVAS_EINA_STATIC_MODULE_USE(image_loader, xpm), > #endif > > Modified: trunk/evas/src/modules/loaders/Makefile.am > =================================================================== > --- trunk/evas/src/modules/loaders/Makefile.am 2012-09-03 06:20:47 UTC > (rev 75950) > +++ trunk/evas/src/modules/loaders/Makefile.am 2012-09-03 06:22:59 UTC > (rev 75951) > @@ -86,6 +86,12 @@ > endif > endif > > +if BUILD_LOADER_WEBP > +if !EVAS_STATIC_BUILD_WEBP > +SUBDIRS += webp > +endif > +endif > + > if BUILD_LOADER_XPM > if !EVAS_STATIC_BUILD_XPM > SUBDIRS += xpm > > > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
