Fixed warning C4267.

smistad · Mar 13, 2014 · 8ac62ad · 8ac62ad
1 parent 8dc27b2
commit 8ac62ad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/histogram-pyramids.cpp b/histogram-pyramids.cpp
@@ -1,5 +1,6 @@
 #include "histogram-pyramids.hpp"
 #include <cmath>
+#include <algorithm>
 #include <iostream>
 using namespace cl;
 
@@ -319,8 +320,8 @@ void HistogramPyramid2D::create(Image2D &baseLevel, int sizeX, int sizeY) {
 }
 
 void HistogramPyramid2D::traverse(Kernel &kernel, int arguments) {
-    for(int i = 0; i < 14; i++) {
-        int l = i;
+    for (cl_uint i = 0; i < 14; i++) {
+        cl_uint l = i;
         if(i >= HPlevels.size())
             // if not using all levels, just add the last levels as dummy arguments
             l = HPlevels.size()-1;
@@ -334,8 +335,8 @@ void HistogramPyramid2D::traverse(Kernel &kernel, int arguments) {
 void HistogramPyramid3D::traverse(Kernel &kernel, int arguments) {
     kernel.setArg(arguments, this->size);
     kernel.setArg(arguments+1, this->sum);
-    for(int i = 0; i < 10; i++) {
-        int l = i;
+    for (cl_uint i = 0; i < 10; i++) {
+        cl_uint l = i;
         if(i >= HPlevels.size())
             // if not using all levels, just add the last levels as dummy arguments
             l = HPlevels.size()-1;
@@ -349,8 +350,8 @@ void HistogramPyramid3D::traverse(Kernel &kernel, int arguments) {
 void HistogramPyramid3DBuffer::traverse(Kernel &kernel, int arguments) {
     kernel.setArg(arguments, this->size);
     kernel.setArg(arguments+1, this->sum);
-    for(int i = 0; i < 10; i++) {
-        int l = i;
+    for(cl_uint i = 0; i < 10; i++) {
+        cl_uint l = i;
         if(i >= HPlevels.size())
             // if not using all levels, just add the last levels as dummy arguments
             l = HPlevels.size()-1;

diff --git a/openCLUtilities.cpp b/openCLUtilities.cpp
@@ -188,7 +188,7 @@ cl::Program buildProgramFromBinary(cl::Context context, std::string filename, st
 
         bool outOfDate = true;
         bool wrongDeviceID = true;
-        int pos = cache.find("-");
+        const size_t pos = cache.find("-");
         if(pos > -1) {
             #ifdef WIN32
             std::cout << "reading file modified date on windows not implemented yet" << std::endl;