[libcvd-members] libcvd build/vc2005/libcvd.vcproj cvd/gl_helpers.h

[Gerhard Reitmayr]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Gerhard Reitmayr <gerhard>      08/12/18 16:35:53

Modified files:
        build/vc2005   : libcvd.vcproj 
        cvd            : gl_helpers.h 

Log message:
        small fix for Win32, also disabled one very annoying warning

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2005/libcvd.vcproj?cvsroot=libcvd&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/gl_helpers.h?cvsroot=libcvd&r1=1.40&r2=1.41

Patches:
Index: build/vc2005/libcvd.vcproj
===================================================================
RCS file: /cvsroot/libcvd/libcvd/build/vc2005/libcvd.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- build/vc2005/libcvd.vcproj  12 Jun 2008 16:45:39 -0000      1.2
+++ build/vc2005/libcvd.vcproj  18 Dec 2008 16:35:53 -0000      1.3
@@ -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"

Index: cvd/gl_helpers.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/gl_helpers.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- cvd/gl_helpers.h    4 Nov 2008 12:52:15 -0000       1.40
+++ cvd/gl_helpers.h    18 Dec 2008 16:35:53 -0000      1.41
@@ -326,9 +326,9 @@
         /// 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>