new scaling based on the Bresenham algorithm

diff --git a/render/image.h b/render/image.h
index 5bf6ea550e70da31800be94bc7066763ae052b2e..639168d2212167c86296818355dfb26808f35bb4 100644 (file)
--- a/render/image.h
+++ b/render/image.h
@@ -4,6 +4,8 @@
 #include "render.h"
 #include "geom.h"
 
-void RrImageDraw(RrPixel32 *target, RrTextureRGBA *rgba, RrRect *area);
+void RrImageDraw(RrPixel32 *target, RrTextureRGBA *rgba,
+                 gint target_w, gint target_h,
+                 RrRect *area);
 
 #endif

diff --git a/render/render.c b/render/render.c
index 2cfb70c766a2082f0e1fa2ebe7488782a30fb2e6..95c5095b48647e1f7b3f622bdcf784186635a9ac 100644 (file)
--- a/render/render.c
+++ b/render/render.c
@@ -109,7 +109,9 @@ void RrPaint(RrAppearance *a, Window win, gint w, gint h)
         case RR_TEXTURE_RGBA:
             g_assert(!transferred);
             RrImageDraw(a->surface.pixel_data,
-                        &a->texture[i].data.rgba, &tarea);
+                        &a->texture[i].data.rgba,
+                        a->w, a->h,
+                        &tarea);
         break;
         }
     }
@@ -203,7 +205,6 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig)
                              orig->textures * sizeof(RrTexture));
     for (i = 0; i < copy->textures; ++i)
         if (copy->texture[i].type == RR_TEXTURE_RGBA) {
-            g_free(copy->texture[i].data.rgba.cache);
             copy->texture[i].data.rgba.cache = NULL;
         }
     copy->pixmap = None;