From c934b1c73330e6e10b7100bae7c198d3c7a5688c Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 3 Oct 2005 13:14:07 +0000 Subject: [PATCH] fix gradients on scale SVN revision: 17131 --- legacy/evas/src/bin/evas_xrender_x11_test | 2 +- legacy/evas/src/lib/canvas/evas_object_image.c | 3 ++- .../src/lib/engines/xrender_x11/evas_engine_gradient.c | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/legacy/evas/src/bin/evas_xrender_x11_test b/legacy/evas/src/bin/evas_xrender_x11_test index efc9b6776a..ee2a607047 100644 --- a/legacy/evas/src/bin/evas_xrender_x11_test +++ b/legacy/evas/src/bin/evas_xrender_x11_test @@ -18,7 +18,7 @@ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' # if CDPATH is set. if test "${CDPATH+set}" = set; then CDPATH=:; export CDPATH; fi -relink_command="(cd /home/raster/C/evas/src/bin; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; PATH=\"/home/raster/bin:/home/raster/s:/usr/local/bin:/usr/local/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/games:/sbin:/usr/sbin:/usr/X11R6/lib/xscreensaver:/opt/arm/3.3.2-vfp/bin:/opt/bitkeeper:/opt/java.sun/java.current/bin:.:\"; export PATH; ccache gcc -O2 -march=pentium4 -g -msse -mmmx -pipe -o \$progdir/\$file evas_xrender_x11_test-evas_test_main.o evas_xrender_x11_test-evas_xrender_x11_main.o ../../src/lib/.libs/libevas.so -lm -L/usr/X11R6/lib -lX11 -lXext /usr/lib/libXrender.so -Wl,--rpath -Wl,/home/raster/C/evas/src/lib/.libs)" +relink_command="(cd /home/raster/C/evas/src/bin; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; PATH=\"/home/raster/bin:/home/raster/s:/usr/local/bin:/usr/local/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/games:/sbin:/usr/sbin:/usr/X11R6/lib/xscreensaver:/opt/arm/3.3.2-vfp/bin:/opt/bitkeeper:/opt/java.sun/java.current/bin:.:\"; export PATH; ccache gcc -O2 -march=pentium4 -g -msse -mmmx -pipe -o \$progdir/\$file evas_test_main.o evas_xrender_x11_main.o ../../src/lib/.libs/libevas.so -lm -L/usr/X11R6/lib -lX11 -lXext /usr/lib/libXrender.so -Wl,--rpath -Wl,/home/raster/C/evas/src/lib/.libs)" # This environment variable determines our operation mode. if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c index 6cc78c7a27..28cbcfdaac 100644 --- a/legacy/evas/src/lib/canvas/evas_object_image.c +++ b/legacy/evas/src/lib/canvas/evas_object_image.c @@ -786,7 +786,7 @@ evas_object_image_smooth_scale_set(Evas_Object *obj, Evas_Bool smooth_scale) ((!smooth_scale) && (!o->cur.smooth_scale))) return; o->cur.smooth_scale = smooth_scale; - evas_object_image_data_update_add(obj, 0, 0, o->cur.image.w, o->cur.image.h); +// evas_object_image_data_update_add(obj, 0, 0, o->cur.image.w, o->cur.image.h); } /** @@ -1269,6 +1269,7 @@ evas_object_image_free(Evas_Object *obj) if (o->engine_data) obj->layer->evas->engine.func->image_free(obj->layer->evas->engine.data.output, o->engine_data); + o->engine_data = NULL; o->magic = 0; while (o->pixel_updates) { diff --git a/legacy/evas/src/lib/engines/xrender_x11/evas_engine_gradient.c b/legacy/evas/src/lib/engines/xrender_x11/evas_engine_gradient.c index 03eae01ea2..8ab962b306 100644 --- a/legacy/evas/src/lib/engines/xrender_x11/evas_engine_gradient.c +++ b/legacy/evas/src/lib/engines/xrender_x11/evas_engine_gradient.c @@ -73,7 +73,7 @@ _xre_gradient_draw(Xrender_Surface *rs, RGBA_Draw_Context *dc, XR_Gradient *gr, } if (!gr->surface) { - im = evas_common_image_create(w, h); + im = evas_common_image_create(256, 256); if (im) { RGBA_Draw_Context *dc2; @@ -83,10 +83,10 @@ _xre_gradient_draw(Xrender_Surface *rs, RGBA_Draw_Context *dc, XR_Gradient *gr, { im->flags |= RGBA_IMAGE_HAS_ALPHA; memset(im->image->data, 0, im->image->w * im->image->h * sizeof(DATA32)); - evas_common_gradient_draw(im, dc2, 0, 0, w, h, gr->grad, angle); - gr->surface = _xr_render_surface_new(gr->xinf, w, h, gr->xinf->fmt32, 1); + evas_common_gradient_draw(im, dc2, 0, 0, 256, 256, gr->grad, angle); + gr->surface = _xr_render_surface_new(gr->xinf, 256, 256, gr->xinf->fmt32, 1); if (gr->surface) - _xr_render_surface_argb_pixels_fill(gr->surface, w, h, im->image->data, 0, 0, w, h); + _xr_render_surface_argb_pixels_fill(gr->surface, 256, 256, im->image->data, 0, 0, 256, 256); evas_common_draw_context_free(dc2); gr->angle = angle; }