summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-09-08 03:13:36 (GMT)
committerMarius Kintel <marius@kintel.net>2011-09-08 03:13:36 (GMT)
commit00695ba68a45702c9b2a3ecde1f0c88478e6e4aa (patch)
tree752432316acbbd41abf517f85a5d4f7b75f131e1
parent4396f9c80e7e4291f794f5a4095cef42cb70ad35 (diff)
Killed some warnings
-rw-r--r--src/OpenCSGRenderer.cc4
-rw-r--r--src/ThrownTogetherRenderer.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/OpenCSGRenderer.cc b/src/OpenCSGRenderer.cc
index f07b900..a16d920 100644
--- a/src/OpenCSGRenderer.cc
+++ b/src/OpenCSGRenderer.cc
@@ -74,8 +74,8 @@ void OpenCSGRenderer::renderCSGChain(CSGChain *chain, GLint *shaderinfo,
bool highlight, bool background) const
{
std::vector<OpenCSG::Primitive*> primitives;
- int j = 0;
- for (int i = 0;; i++) {
+ size_t j = 0;
+ for (size_t i = 0;; i++) {
bool last = i == chain->polysets.size();
if (last || chain->types[i] == CSGTerm::TYPE_UNION) {
if (j+1 != i) {
diff --git a/src/ThrownTogetherRenderer.cc b/src/ThrownTogetherRenderer.cc
index 598d542..c3ba2a6 100644
--- a/src/ThrownTogetherRenderer.cc
+++ b/src/ThrownTogetherRenderer.cc
@@ -62,7 +62,7 @@ void ThrownTogetherRenderer::renderCSGChain(CSGChain *chain, bool highlight,
{
glDepthFunc(GL_LEQUAL);
QHash<QPair<PolySet*,double*>,int> polySetVisitMark;
- for (int i = 0; i < chain->polysets.size(); i++) {
+ for (size_t i = 0; i < chain->polysets.size(); i++) {
if (polySetVisitMark[QPair<PolySet*,double*>(chain->polysets[i], chain->matrices[i])]++ > 0)
continue;
double *m = chain->matrices[i];
contact: Jan Huwald // Impressum