pike.git/ src/ modules/ Image/ layers.c

2014-05-26

2014-05-26 15:31:21 by Per Hedbor <ph@opera.com>

• 13b5ed48802d23941e575558d09bcd3eb61bee2a (19 lines) (+9/-10) ^{[ Show | Annotate ]}
  Branch: 8.0

Removed a few casts

734:    SIMPLE_BAD_ARG_ERROR("Image.Layer->set_image",1,    "object(Image)|int(0)");    } -  else if ((img=(struct image*) -  get_storage(Pike_sp[-args].u.object,image_program))) +  else if ((img=get_storage(Pike_sp[-args].u.object,image_program)))    {    THIS->image=Pike_sp[-args].u.object;    add_ref(THIS->image);
756:    SIMPLE_BAD_ARG_ERROR("Image.Layer->set_image",2,    "object(Image)|int(0)");    } -  else if ((img=(struct image*) -  get_storage(Pike_sp[1-args].u.object,image_program))) +  else if ((img=get_storage(Pike_sp[1-args].u.object,image_program)))    {    if (THIS->img &&    (img->xsize!=THIS->xsize ||
2939:    {    if (TYPEOF(a->item[i]) == T_OBJECT)    { -  if (!(l[j]=(struct layer*)get_storage(a->item[i].u.object, +  if (!(l[j]=get_storage(a->item[i].u.object,    image_layer_program)))    SIMPLE_BAD_ARG_ERROR("Image.lay",1,    "array(Image.Layer|mapping)");
2949:    push_svalue(a->item+i);    push_object(o=clone_object(image_layer_program,1));    args++; -  l[j]=(struct layer*)get_storage(o,image_layer_program); +  l[j]=get_storage(o,image_layer_program);    }    else    SIMPLE_BAD_ARG_ERROR("Image.lay",1,
3005:    push_int(ysize);    push_object(o=clone_object(image_layer_program,2));    -  dest=(struct layer*)get_storage(o,image_layer_program); +  dest=get_storage(o,image_layer_program);    dest->xoffs=xoffset;    dest->yoffs=yoffset;   
3024:   static INLINE struct layer *push_new_layer(void)   {    push_object(clone_object(image_layer_program,0)); -  return (struct layer*)get_storage(Pike_sp[-1].u.object,image_layer_program); +  return get_storage(Pike_sp[-1].u.object,image_layer_program);   }      static INLINE struct layer *clone_this_layer(void)
3118:    push_int(THIS->fill.b);    f_call_function(8);    if (TYPEOF(Pike_sp[-1]) != T_OBJECT || -  !(img=(struct image*)get_storage(Pike_sp[-1].u.object,image_program))) +  !(img=get_storage(Pike_sp[-1].u.object,image_program)))    Pike_error("No image returned from image->copy\n");    if (img->xsize!=xz || img->ysize!=yz)    Pike_error("Image returned from image->copy had "
3147:    push_int(THIS->fill_alpha.b);    f_call_function(8);    if (TYPEOF(Pike_sp[-1]) != T_OBJECT || -  !(img=(struct image*)get_storage(Pike_sp[-1].u.object,image_program))) +  !(img=get_storage(Pike_sp[-1].u.object,image_program)))    Pike_error("No image returned from alpha->copy\n");    if (img->xsize!=xz || img->ysize!=yz)    Pike_error("Image returned from alpha->copy had "