X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_surface.h;h=58a3efa5d2a0b72982084520f477894179682c6f;hb=fd222cba40386a58851762b134311502744ad8db;hp=39c1141576e365e25d1fa0fb11476283d9f5191e;hpb=6745c42729827bad64a429fb48bee1007ca60528;p=synfig.git diff --git a/ETL/trunk/ETL/_surface.h b/ETL/trunk/ETL/_surface.h index 39c1141..58a3efa 100644 --- a/ETL/trunk/ETL/_surface.h +++ b/ETL/trunk/ETL/_surface.h @@ -274,8 +274,8 @@ public: } //clip width against dest width - w = std::min(w,DEST_PEN.end_x()-DEST_PEN.x()); - h = std::min(h,DEST_PEN.end_y()-DEST_PEN.y()); + w = std::min((long)w,(long)(DEST_PEN.end_x()-DEST_PEN.x())); + h = std::min((long)h,(long)(DEST_PEN.end_y()-DEST_PEN.y())); //clip width against src width w = std::min(w,w_-x);