diff options
author | Eugene Sandulenko | 2010-09-08 14:34:36 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-10-12 23:44:14 +0000 |
commit | e5ac21dcac9a4c18dd5934b4db19b02db06163ca (patch) | |
tree | 7dd783a6001b7f325ac728eb74428d8c1eef4967 /engines/sword25/gfx/image | |
parent | 30f199a5a449d612e026b3d3a0ccace3a870c40e (diff) | |
download | scummvm-rg350-e5ac21dcac9a4c18dd5934b4db19b02db06163ca.tar.gz scummvm-rg350-e5ac21dcac9a4c18dd5934b4db19b02db06163ca.tar.bz2 scummvm-rg350-e5ac21dcac9a4c18dd5934b4db19b02db06163ca.zip |
SWORD25: Fix some warnings
svn-id: r53338
Diffstat (limited to 'engines/sword25/gfx/image')
-rwxr-xr-x | engines/sword25/gfx/image/art.cpp | 4 | ||||
-rwxr-xr-x | engines/sword25/gfx/image/art_svp_render_aa.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/sword25/gfx/image/art.cpp b/engines/sword25/gfx/image/art.cpp index 9471153a78..e88d6e55c4 100755 --- a/engines/sword25/gfx/image/art.cpp +++ b/engines/sword25/gfx/image/art.cpp @@ -90,8 +90,8 @@ art_svp_free(ArtSVP *svp) { **/ int art_svp_seg_compare(const void *s1, const void *s2) { - const ArtSVPSeg *seg1 = (ArtSVPSeg *)s1; - const ArtSVPSeg *seg2 = (ArtSVPSeg *)s2; + const ArtSVPSeg *seg1 = (const ArtSVPSeg *)s1; + const ArtSVPSeg *seg2 = (const ArtSVPSeg *)s2; if (seg1->points[0].y - EPSILON > seg2->points[0].y) return 1; else if (seg1->points[0].y + EPSILON < seg2->points[0].y) return -1; diff --git a/engines/sword25/gfx/image/art_svp_render_aa.cpp b/engines/sword25/gfx/image/art_svp_render_aa.cpp index d0342c28d7..616977fb5e 100755 --- a/engines/sword25/gfx/image/art_svp_render_aa.cpp +++ b/engines/sword25/gfx/image/art_svp_render_aa.cpp @@ -259,13 +259,13 @@ art_svp_render_aa_iter_step(ArtSVPRenderAAIter *iter, int *p_start, x_min = x_bot; x_max = x_top; } - ix_min = floor(x_min); - ix_max = floor(x_max); + ix_min = (int)floor(x_min); + ix_max = (int)floor(x_max); if (ix_min >= x1) { /* skip; it starts to the right of the render region */ } else if (ix_max < x0) /* it ends to the left of the render region */ - start += delta; + start += (int)delta; else if (ix_min == ix_max) { /* case 1, antialias a single pixel */ xdelta = (ix_min + 1 - (x_min + x_max) * 0.5) * delta; |