0
@@ -171,7 +171,6 @@ VALUE
0
shoes_safe_block(VALUE self, VALUE block, VALUE args)
0
sb.canvas = shoes_find_canvas(self);
0
@@ -343,7 +342,7 @@ shoes_place_decide(shoes_place *place, VALUE c, VALUE attr, int dw, int dh, unsi
0
- int cx, cy, ox, oy, tw
, th;
0
+ int cx, cy, ox, oy, tw
= dw, th = dh;
0
@@ -367,7 +366,6 @@ shoes_place_decide(shoes_place *place, VALUE c, VALUE attr, int dw, int dh, unsi
0
testw = dw = CPW(canvas);
0
dh = max(canvas->height, CPH(canvas));
0
@@ -499,7 +497,6 @@ shoes_control_show_ref(SHOES_CONTROL_REF ref)
0
shoes_canvas *canvas; \
0
- VALUE ck = rb_obj_class(c); \
0
Data_Get_Struct(self, self_type, self_t); \
0
Data_Get_Struct(c, shoes_canvas, canvas); \
0
if (ATTR(self_t->attr, hidden) == Qtrue) return self; \
0
@@ -576,7 +573,6 @@ shoes_control_show_ref(SHOES_CONTROL_REF ref)
0
if (!rb_obj_is_kind_of(p, cPattern)) \
0
ATTRSET(attr, pen, p = rb_funcall(p, s_to_pattern, 0)); \
0
cairo_matrix_t matrix1, matrix2; \
0
shoes_pattern *pattern; \
0
Data_Get_Struct(p, shoes_pattern, pattern); \
0
@@ -611,7 +607,7 @@ shoes_shape_attr(int argc, VALUE *argv, int syms, ...)
0
if (argc < 1) hsh = rb_hash_new();
0
else if (rb_obj_is_kind_of(argv[argc - 1], rb_cHash)) hsh = argv[argc - 1];
0
@@ -810,7 +806,6 @@ shoes_shape_motion(VALUE self, int x, int y, char *touch)
0
if (IS_INSIDE(self_t, x, y))
0
- double x1, y1, x2, y2;
0
cairo_t *cr = cairo_create(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 1, 1));
0
// if (self_t->line != NULL)
0
@@ -897,7 +892,6 @@ shoes_image_free(shoes_image *image)
0
shoes_image_new(VALUE klass, VALUE path, VALUE attr, VALUE parent, shoes_transform *st)
0
@@ -991,10 +985,8 @@ shoes_image_surface_get_pixel(shoes_cached_image *cached, int x, int y)
0
if (x >= 0 && y >= 0 && x < cached->width && y < cached->height)
0
unsigned char* pixels = cairo_image_surface_get_data(cached->surface);
0
- switch (cairo_image_surface_get_format(cached->surface))
0
- case CAIRO_FORMAT_ARGB32: return pixels + (y * (4 * cached->width)) + (4 * x);
0
+ if (cairo_image_surface_get_format(cached->surface) == CAIRO_FORMAT_ARGB32)
0
+ return pixels + (y * (4 * cached->width)) + (4 * x);
0
@@ -1068,6 +1060,7 @@ shoes_image_draw_surface(cairo_t *cr, shoes_image *self_t, shoes_place *place, c
0
#define SHOES_IMAGE_PLACE(type, imw, imh, surf) \
0
SETUP(shoes_##type, REL_CANVAS, imw, imh); \
0
+ VALUE ck = rb_obj_class(c); \
0
shoes_image_draw_surface(CCR(canvas), self_t, &place, surf, imw, imh); \
0
@@ -1735,7 +1728,6 @@ shoes_color_gradient(int argc, VALUE *argv, VALUE self)
0
shoes_color_gray(int argc, VALUE *argv, VALUE self)
0
rb_scan_args(argc, argv, "02", &_g, &_a);
0
@@ -2359,7 +2351,6 @@ shoes_app_style_for(shoes_textblock *block, shoes_app *app, VALUE klass, VALUE o
0
VALUE hsh = rb_hash_aref(app->styles, klass);
0
if (NIL_P(hsh) && NIL_P(oattr)) return;
0
- PangoAttrList *list = pango_attr_list_new();
0
PangoAttribute *attr = NULL;
0
APPLY_STYLE_COLOR(stroke, foreground);
0
@@ -2651,9 +2642,7 @@ shoes_textblock_on_layout(shoes_app *app, VALUE klass, shoes_textblock *block)
0
shoes_textblock_draw(VALUE self, VALUE c, VALUE actual)
0
- int px, py, pd, li, m, ld;
0
+ int px, py, pd, li, ld;
0
@@ -3047,7 +3036,6 @@ VALUE
0
shoes_list_box_choose(VALUE self, VALUE item)
0
GET_STRUCT(control, self_t);
0
ATTRSET(self_t->attr, choose, item);
0
if (self_t->ref == NULL) return self;
0
@@ -3765,7 +3753,7 @@ shoes_download_non_threaded(VALUE self, VALUE url)
0
shoes_download_request req;
0
SHOE_MEMZERO(&req, shoes_download_request, 1);
0
req.host = RSTRING_PTR(host);
0
+ req.port =
NUM2INT(port);
0
req.path = RSTRING_PTR(path);
0
req.mem = SHOE_ALLOC_N(char, SHOES_BUFSIZE);
0
req.memlen = SHOES_BUFSIZE;
0
@@ -3779,7 +3767,7 @@ shoes_download_non_threaded(VALUE self, VALUE url)
0
shoes_message_download(VALUE self, void *data)
0
shoes_download_event *de = (shoes_download_event *)data;
0
GET_STRUCT(download_klass, dl);
0
INFO("EVENT: %d, %lu, %llu, %llu\n", (int)de->stage, de->percent,
0
@@ -3851,7 +3839,7 @@ shoes_download_threaded(VALUE self, VALUE url, VALUE attr)
0
shoes_download_request *req = SHOE_ALLOC(shoes_download_request);
0
SHOE_MEMZERO(req, shoes_download_request, 1);
0
req->host = RSTRING_PTR(host);
0
+ req->port =
NUM2INT(port);
0
req->path = RSTRING_PTR(path);
0
req->handler = shoes_doth_handler;
0
req->flags = SHOES_DL_DEFAULTS;
0
@@ -4064,7 +4052,6 @@ VALUE progname;
0
- char proc[SHOES_BUFSIZE];
0
progname = rb_str_new2("(eval)");
0
rb_define_variable("$0", &progname);
0
rb_define_variable("$PROGRAM_NAME", &progname);
Comments
No one has commented yet.