X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Fgraphic.cpp;fp=source%2Fgraphic.cpp;h=fb3f8893d2460112b88d0b71a6ce6c9790c92b61;hp=095e19441be082aed682be2f4b6a928229cbe7fb;hb=aa9b8db38efb9e97460c76e27cecc4d1591b23e5;hpb=762a689d799075c0a10e1633bf95d53de80b4572 diff --git a/source/graphic.cpp b/source/graphic.cpp index 095e194..fb3f889 100644 --- a/source/graphic.cpp +++ b/source/graphic.cpp @@ -16,18 +16,18 @@ void Graphic::build(unsigned wd, unsigned ht, GL::PrimitiveBuilder &bld) const create_texcoords(slice.x, slice.x+slice.w, border.left, border.right, texture->get_width(), u); create_texcoords(slice.y, slice.y+slice.h, border.bottom, border.top, texture->get_height(), v); - unsigned xmin = border.left ? 0 : 1; - unsigned xmax = x.size()-(border.right ? 2 : 3); - unsigned ymin = border.bottom ? 0 : 1; - unsigned ymax = y.size()-(border.top ? 2 : 3); + size_t xmin = border.left ? 0 : 1; + size_t xmax = x.size()-(border.right ? 2 : 3); + size_t ymin = border.bottom ? 0 : 1; + size_t ymax = y.size()-(border.top ? 2 : 3); bld.color(1.0f, 1.0f, 1.0f); - for(unsigned i=ymin; i<=ymax; ++i) + for(size_t i=ymin; i<=ymax; ++i) { - unsigned i2 = (i==0 ? 0 : i==y.size()-2 ? 2 : 1); - for(unsigned j=xmin; j<=xmax; ++j) + size_t i2 = (i==0 ? 0 : i==y.size()-2 ? 2 : 1); + for(size_t j=xmin; j<=xmax; ++j) { - unsigned j2 = (j==0 ? 0 : j==x.size()-2 ? 2 : 1); + size_t j2 = (j==0 ? 0 : j==x.size()-2 ? 2 : 1); if(j==xmin || (j>1 && jxmin)