luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.GTK]

Browse source 
* NEW: Remove useless gb.gtk exported functions.
* OPT: Prevent an unneeded image conversion in Paint.DrawImage().

[GB.GTK3]
* NEW: Remove useless gb.gtk3 exported functions.
* OPT: Prevent an unneeded image conversion in Paint.DrawImage().


git-svn-id: svn://localhost/gambas/trunk@6431 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2014-08-27 11:53:37 +00:00
parent a6840047db
commit f0c1464ff2
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gb.gtk/src/cpaint_impl.cpp
View file

@ -1278,7 +1278,6 @@ static void TransformMap(GB_TRANSFORM matrix, double *x, double *y)
static void DrawImage(GB_PAINT *d, GB_IMAGE image, float x, float y, float w, float h, float opacity, GB_RECT *source) static void DrawImage(GB_PAINT *d, GB_IMAGE image, float x, float y, float w, float h, float opacity, GB_RECT *source)
{ {
cairo_t *cr = CONTEXT(d); cairo_t *cr = CONTEXT(d);
gPicture *picture = CIMAGE_get((CIMAGE *)image);
cairo_surface_t *surface; cairo_surface_t *surface;
cairo_pattern_t *pattern = NULL; cairo_pattern_t *pattern = NULL;
cairo_pattern_t *save; cairo_pattern_t *save;
@ -1295,7 +1294,7 @@ static void DrawImage(GB_PAINT *d, GB_IMAGE image, float x, float y, float w, fl
//if (source) //if (source)
// pixbuf = gdk_pixbuf_new_subpixbuf(pixbuf, source->x, source->y, source->w, source->h); // pixbuf = gdk_pixbuf_new_subpixbuf(pixbuf, source->x, source->y, source->w, source->h);
surface = picture->getSurface(); surface = check_image(image); //picture->getSurface();
pattern = cairo_pattern_create_for_surface(surface); pattern = cairo_pattern_create_for_surface(surface);

2
gb.gtk/src/gb.gtk.h
View file

@ -38,8 +38,6 @@ typedef
struct struct
{ {
intptr_t version; intptr_t version;
void *(*GetPicture)(GdkPixbuf *buf);
void *(*GetImage)(GdkPixbuf *buf);
GtkWidget *(*CreateGLArea)(void *control, void *parent, void (*init)(GtkWidget *)); GtkWidget *(*CreateGLArea)(void *control, void *parent, void (*init)(GtkWidget *));
void *_null; void *_null;
} }

2
gb.gtk/src/main.cpp
View file

@ -187,8 +187,6 @@ extern "C"
void *GB_GTK_1[] EXPORT = void *GB_GTK_1[] EXPORT =
{ {
(void *)GTK_INTERFACE_VERSION, (void *)GTK_INTERFACE_VERSION,
(void *)GTK_GetPicture,
(void *)GTK_GetImage,
(void *)GTK_CreateGLArea, (void *)GTK_CreateGLArea,
NULL NULL
}; };