From: <enl...@li...> - 2002-08-18 03:29:12
|
Enlightenment CVS committal Author : monkeyiq Project : misc Module : gevas2 Dir : misc/gevas2/src Modified Files: gevasimage.c Log Message: add back some stuff that doesn't need edb but was #ifdefed out wrongly =================================================================== RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasimage.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- gevasimage.c 17 Aug 2002 15:26:38 -0000 1.2 +++ gevasimage.c 18 Aug 2002 03:29:10 -0000 1.3 @@ -305,10 +305,11 @@ eo = evas_object_image_add( EVAS(ev) ); _gevas_set_obj( GTK_OBJECT(ev), eo); +// evas_object_resize( eo, w, h ); evas_object_image_size_set( eo, w, h ); // evas_object_resize( eo, w, h ); - evas_object_image_fill_set( eo, 0, 0, w, h ); evas_object_image_data_set( eo, (int*)(rgbadata) ); + evas_object_image_fill_set( eo, 0, 0, w, h ); } @@ -384,7 +385,6 @@ -#ifdef BUILD_EDB_CODE static void load_from_metadata( gpointer data, @@ -398,7 +398,7 @@ char* edb_prefix = 0; char* p = 0; GHashTable* hash_args = 0; - E_DB_File* edb = 0; +/* E_DB_File* edb = 0; */ gboolean failed=1; g_return_if_fail(ev != NULL); @@ -465,6 +465,7 @@ ev->metadata_load_hash = 0; +#ifdef BUILD_EDB_CODE if( strstr( loc, "#edb" )) { const char* p = 0; @@ -483,7 +484,8 @@ printf("gevasimage_load_from_metadata() edb in URL... NEW loc:%s\n",loc); } - +#endif + ev->metadata_load_loaded = 0; ev->metadata_load_postfix = loc; @@ -517,7 +519,6 @@ } return o; } -#endif void gevasimage_ensure_smallerthan_with_ratio( GtkgEvasImage* gi, int desiredWidth ) { |