On Fri, 11 Mar 2011, Enlightenment SVN wrote:
> Log: > Evas: add ico loader! does it support the Windows ico forat (that is, the one which can have more han 1 image in it) ? Vincent > > > > Author: raster > Date: 2011-03-11 07:07:25 -0800 (Fri, 11 Mar 2011) > New Revision: 57693 > Trac: http://trac.enlightenment.org/e/changeset/57693 > > Added: > trunk/evas/src/modules/loaders/ico/ > trunk/evas/src/modules/loaders/ico/Makefile.am > trunk/evas/src/modules/loaders/ico/evas_image_load_ico.c > Modified: > trunk/evas/ChangeLog trunk/evas/configure.ac > trunk/evas/m4/evas_check_loader.m4 > trunk/evas/src/lib/engines/common/evas_image_load.c > trunk/evas/src/lib/file/evas_module.c > > Modified: trunk/evas/ChangeLog > =================================================================== > --- trunk/evas/ChangeLog 2011-03-11 14:16:01 UTC (rev 57692) > +++ trunk/evas/ChangeLog 2011-03-11 15:07:25 UTC (rev 57693) > @@ -162,3 +162,7 @@ > are 0 or not and then force alpha off if all are 0". This > means you can never have a 100% empty/transparent BMP though > in 32bpp mode. > + > +2011-03-11 Carsten Haitzler (The Rasterman) > + > + * Add ICO loader to evas (also can load CUR cursor files in theory) > > Modified: trunk/evas/configure.ac > =================================================================== > --- trunk/evas/configure.ac 2011-03-11 14:16:01 UTC (rev 57692) > +++ trunk/evas/configure.ac 2011-03-11 15:07:25 UTC (rev 57693) > @@ -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_ico="yes" > > want_evas_font_loader_eet="yes" > > @@ -820,6 +821,7 @@ > > EVAS_CHECK_IMAGE_LOADER([WBMP], [${want_evas_image_loader_wbmp}]) > > +EVAS_CHECK_IMAGE_LOADER([ICO], [${want_evas_image_loader_ico}]) > > ##################################################################### > ## Cpu based optimizations > @@ -1595,6 +1597,7 @@ > src/modules/loaders/tiff/Makefile > src/modules/loaders/xpm/Makefile > src/modules/loaders/bmp/Makefile > +src/modules/loaders/ico/Makefile > src/modules/loaders/tga/Makefile > src/modules/loaders/svg/Makefile > src/modules/loaders/pmaps/Makefile > @@ -1702,6 +1705,7 @@ > echo " BMP.....................: $have_evas_image_loader_bmp" > echo " TGA.....................: $have_evas_image_loader_tga" > echo " WBMP....................: $have_evas_image_loader_wbmp" > +echo " ICO.....................: $have_evas_image_loader_ico" > echo > echo "Font Sourcing Systems:" > echo " EET.....................: $have_evas_font_loader_eet" > > Modified: trunk/evas/m4/evas_check_loader.m4 > =================================================================== > --- trunk/evas/m4/evas_check_loader.m4 2011-03-11 14:16:01 UTC (rev > 57692) > +++ trunk/evas/m4/evas_check_loader.m4 2011-03-11 15:07:25 UTC (rev > 57693) > @@ -328,6 +328,26 @@ > > ]) > > +dnl use: EVAS_CHECK_LOADER_DEP_ICO(loader, want_static[, ACTION-IF-FOUND[, > ACTION-IF-NOT-FOUND]]) > + > +AC_DEFUN([EVAS_CHECK_LOADER_DEP_ICO], > +[ > + > +have_dep="yes" > +evas_image_loader_[]$1[]_cflags="" > +evas_image_loader_[]$1[]_libs="" > + > +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_TGA(loader, want_static[, ACTION-IF-FOUND[, > ACTION-IF-NOT-FOUND]]) > > AC_DEFUN([EVAS_CHECK_LOADER_DEP_TGA], > > Modified: trunk/evas/src/lib/engines/common/evas_image_load.c > =================================================================== > --- trunk/evas/src/lib/engines/common/evas_image_load.c 2011-03-11 > 14:16:01 UTC (rev 57692) > +++ trunk/evas/src/lib/engines/common/evas_image_load.c 2011-03-11 > 15:07:25 UTC (rev 57693) > @@ -30,12 +30,14 @@ > { "pnm", "pmaps" }, > { "bmp", "bmp" }, > { "tga", "tga" }, > - { "wbmp", "wbmp" } > + { "wbmp", "wbmp" }, > + { "ico", "ico" }, > + { "cur", "ico" } > }; > > static const char *loaders_name[] = > { > - "png", "jpeg", "eet", "xpm", "tiff", "gif", "svg", "pmaps", "edb", "bmp", > "tga", "wbmp" > + "png", "jpeg", "eet", "xpm", "tiff", "gif", "svg", "pmaps", "edb", "bmp", > "tga", "wbmp", "ico" > }; > > struct evas_image_foreach_loader_data > > Modified: trunk/evas/src/lib/file/evas_module.c > =================================================================== > --- trunk/evas/src/lib/file/evas_module.c 2011-03-11 14:16:01 UTC (rev > 57692) > +++ trunk/evas/src/lib/file/evas_module.c 2011-03-11 15:07:25 UTC (rev > 57693) > @@ -125,6 +125,7 @@ > EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, edb); > EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, tga); > EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, wbmp); > +EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, ico); > EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, edb); > EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, eet); > EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, jpeg); > @@ -240,6 +241,9 @@ > #ifdef EVAS_STATIC_BUILD_WBMP > EVAS_EINA_STATIC_MODULE_USE(image_loader, wbmp), > #endif > +#ifdef EVAS_STATIC_BUILD_ICO > + EVAS_EINA_STATIC_MODULE_USE(image_loader, ico), > +#endif > #ifdef EVAS_STATIC_BUILD_EDB > EVAS_EINA_STATIC_MODULE_USE(image_saver, edb), > #endif > > > ------------------------------------------------------------------------------ > Colocation vs. Managed Hosting > A question and answer guide to determining the best fit > for your organization - today and in the future. > http://p.sf.net/sfu/internap-sfd2d > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > > ------------------------------------------------------------------------------ Colocation vs. Managed Hosting A question and answer guide to determining the best fit for your organization - today and in the future. http://p.sf.net/sfu/internap-sfd2d _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel