From 2d63e26b55f6a9ab356f82fc7b96dc341d220788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Sun, 1 May 2011 01:04:37 +0000 Subject: [PATCH] [GB.IMAGE.IMLIB] * BUG: Image.PaintImage() got back the scaling feature. git-svn-id: svn://localhost/gambas/trunk@3821 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- gb.image.imlib/src/c_image.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gb.image.imlib/src/c_image.c b/gb.image.imlib/src/c_image.c index 900fa8300..1bb2423c6 100644 --- a/gb.image.imlib/src/c_image.c +++ b/gb.image.imlib/src/c_image.c @@ -211,7 +211,7 @@ BEGIN_METHOD(Image_Sharpen, GB_INTEGER radius) END_METHOD -BEGIN_METHOD(Image_PaintImage, GB_OBJECT img; GB_INTEGER x; GB_INTEGER y; GB_INTEGER sx; GB_INTEGER sy; GB_INTEGER sw; GB_INTEGER sh) +BEGIN_METHOD(Image_PaintImage, GB_OBJECT img; GB_INTEGER x; GB_INTEGER y; GB_INTEGER w; GB_INTEGER h; GB_INTEGER sx; GB_INTEGER sy; GB_INTEGER sw; GB_INTEGER sh) int x, y, w, h, sx, sy, sw, sh, src_w, src_h; CIMAGE *image = (CIMAGE *)VARG(img); @@ -227,8 +227,8 @@ BEGIN_METHOD(Image_PaintImage, GB_OBJECT img; GB_INTEGER x; GB_INTEGER y; GB_INT x = VARGOPT(x, 0); y = VARGOPT(y, 0); - w = -1; //VARGOPT(w, -1); - h = -1; //VARGOPT(h, -1); + w = VARGOPT(w, -1); + h = VARGOPT(h, -1); sx = VARGOPT(sx, 0); sy = VARGOPT(sy, 0); @@ -270,7 +270,7 @@ GB_DESC ImageDesc[] = GB_METHOD("Sharpen", "Image", Image_Sharpen, "[(Radius)i]"), GB_METHOD("Tile", "Image", Image_Tile, NULL), - GB_METHOD("PaintImage", NULL, Image_PaintImage, "(Image)Image;[(X)i(Y)i(SrcX)i(SrcY)i(SrcWidth)i(SrcHeight)i]"), + GB_METHOD("PaintImage", NULL, Image_PaintImage, "(Image)Image;[(X)i(Y)i(Width)i(Height)i(SrcX)i(SrcY)i(SrcWidth)i(SrcHeight)i]"), GB_METHOD("Scroll", NULL, Image_Scroll, "(DX)i(DY)i[(X)i(Y)i(Width)i(Height)i]"), //Gb_INTERFACE("Draw", &DRAW_Interface),