Merge pull request #2 from signmotion/x64

Prepared to VS2013 x64.
smistad · Mar 13, 2014 · 5d50f5a · 5d50f5a
2 parents 8dc27b2 + 86acecd
commit 5d50f5a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 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;
 
@@ -31,7 +32,7 @@ void HistogramPyramid3D::create(Image3D &baseLevel, int sizeX, int sizeY, int si
         int i = 1;
         while(pow(2.0, i) < largestSize)
             i++;
-        size = pow(2.0, i);
+        size = static_cast< int >( pow(2.0, i) );
     }
     std::cout << "3D HP size: " << size << std::endl;
 
@@ -123,7 +124,7 @@ void HistogramPyramid3DBuffer::create(Buffer &baseLevel, int sizeX, int sizeY, i
         int i = 1;
         while(pow(2.0, i) < largestSize)
             i++;
-        size = pow(2.0, i);
+        size = static_cast< int >( pow( 2.0, i ) );
     }
     std::cout << "3D HP size: " << size << std::endl;
 
@@ -241,7 +242,7 @@ void HistogramPyramid2D::create(Image2D &baseLevel, int sizeX, int sizeY) {
         int i = 1;
         while(pow(2.0, i) < largestSize)
             i++;
-        size = pow(2.0, i);
+        size = static_cast< int >( pow( 2.0, i ) );
     }
     std::cout << "2D HP size: " << size << std::endl;
 
@@ -319,11 +320,11 @@ 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;
+            l = static_cast< cl_uint >( HPlevels.size() - 1 );
         kernel.setArg(i+arguments, HPlevels[l]);
     }
 
@@ -334,11 +335,11 @@ 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;
+            l = static_cast< cl_uint >( HPlevels.size() - 1 );
         kernel.setArg(i+arguments+2, HPlevels[l]);
     }
 
@@ -349,11 +350,11 @@ 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;
+            l = static_cast< cl_uint >( HPlevels.size() - 1 );
         kernel.setArg(i+arguments+2, HPlevels[l]);
     }
 

diff --git a/openCLGLUtilities.cpp b/openCLGLUtilities.cpp
@@ -50,7 +50,7 @@ cl::Context createCLGLContext(cl_device_type type, cl_vendor vendor) {
 
 		// If more than one CL device find out which one is associated with GL context
 		if(devices.size() > 1) {
-#if not (defined(__APPLE__) || !defined(__MACOSX))
+#if !(defined(__APPLE__) || !defined(__MACOSX))
 			cl::Device interopDevice = getValidGLCLInteropDevice(platform, cps);
 			singleDevice.push_back(interopDevice);
 			context = cl::Context(singleDevice, cps);
@@ -67,7 +67,7 @@ cl::Context createCLGLContext(cl_device_type type, cl_vendor vendor) {
     }
 }
 
-#if not (defined(__APPLE__) || defined(__MACOSX))
+#if !(defined(__APPLE__) || defined(__MACOSX))
 cl::Device getValidGLCLInteropDevice(cl::Platform platform, cl_context_properties* properties) {
     // Function for finding a valid device for CL-GL context. 
     // Thanks to Jim Vaughn for this contribution

diff --git a/openCLGLUtilities.hpp b/openCLGLUtilities.hpp
@@ -21,7 +21,7 @@
 #endif
 
 cl::Context createCLGLContext(cl_device_type type = CL_DEVICE_TYPE_ALL, cl_vendor vendor = VENDOR_ANY);
-#if not (defined(__APPLE__) || !defined(__MACOSX))
+#if !(defined(__APPLE__) || !defined(__MACOSX))
 cl::Device getValidGLCLInteropDevice(cl::Platform platform, cl_context_properties* properties);
 #endif
 

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;