From 8a4ac9ebc4b86e6a62abf6b9ca6084bab4c97411 Mon Sep 17 00:00:00 2001 From: LaShonda Hopper Date: Mon, 11 Sep 2017 15:10:56 -0400 Subject: [PATCH] [WL21389] Resolves size_t vs int warnings in GeometryCache. Reviewed-by: Kris Pivin Changes Committed: modified: libraries/render-utils/src/GeometryCache.cpp --- libraries/render-utils/src/GeometryCache.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp index 492a492bf9..004f33cd1c 100644 --- a/libraries/render-utils/src/GeometryCache.cpp +++ b/libraries/render-utils/src/GeometryCache.cpp @@ -113,7 +113,7 @@ void GeometryCache::computeSimpleHullPointListForShape(const ShapeEntityItem * c qCDebug(entities) << "------------------ Begin Vert Info( ComputeShapeInfo )[FlatShapes] -----------------------------"; qCDebug(entities) << " name:" << shapePtr->getName() << ": has " << numItems << " vert info pairs."; #endif - outPointList.reserve(numItems); + outPointList.reserve((int)numItems); for (gpu::BufferView::Index i = 0; i < (gpu::BufferView::Index)numItems; ++i) { const geometry::Vec &curNorm = shapeNorms.get(i); #if DEBUG_SIMPLE_HULL_POINT_GENERATION @@ -514,7 +514,7 @@ void GeometryCache::buildShapes() { } const GeometryCache::ShapeData * GeometryCache::getShapeData(const Shape shape) const { - if (((int)shape < 0) || ((int)shape >= _shapes.size())){ + if (((int)shape < 0) || ((int)shape >= (int)_shapes.size())){ return nullptr; } @@ -522,7 +522,7 @@ const GeometryCache::ShapeData * GeometryCache::getShapeData(const Shape shape) } GeometryCache::Shape GeometryCache::getShapeForEntityShape(int entityShape) { - if ((entityShape < 0) || (entityShape >= MAPPING.size())){ + if ((entityShape < 0) || (entityShape >= (int)MAPPING.size())){ return GeometryCache::Sphere; }