small fix for Win32, also disabled one very annoying warning

edrosten · Dec 18, 2008 · 556e263 · 556e263
1 parent 61a5507
commit 556e263
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build/vc2005/libcvd.vcproj b/build/vc2005/libcvd.vcproj
@@ -49,6 +49,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
+				DisableSpecificWarnings="4244"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -113,6 +114,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4244"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

diff --git a/cvd/gl_helpers.h b/cvd/gl_helpers.h
@@ -326,9 +326,9 @@ namespace CVD
         /// n.b. You first need to set up the matrix environment yourself,
 	/// e.g. glMatrixMode(GL_PROJECTION); glLoadIdentity();
 	/// @param size ImageRef containing the size of the GL window.
-	inline void glOrtho( const CVD::ImageRef & size, const double near = -1.0, const double far = 1.0)
+	inline void glOrtho( const CVD::ImageRef & size, const double nearPlane = -1.0, const double farPlane = 1.0)
 	{
-	         ::glOrtho(-0.375, size.x - 0.375, size.y - 0.375, -0.375, near, far);
+	    ::glOrtho( -0.375, size.x - 0.375, size.y - 0.375, -0.375, nearPlane, farPlane );
 	}
 
 	/// Sets up an ortho projection from a simple Vector<6>