[Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/27 18:27:40

Modified files:
        .              : ChangeLog 
        backend        : render_handler_ogl.cpp 

Log message:
        Changed name on quad to iquad to avoid CVS:
        ----------------------------------------------------------------------
        backend/render_handler_ogl.cpp CVS:
        ----------------------------------------------------------------------
                  "cc-1101 CC: ERROR File = render_handler_ogl.cpp, Line = 150
                  "quad" has already been declared in the current scope."

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1426&r2=1.1427
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.37&r2=1.38

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1426
retrieving revision 1.1427
diff -u -b -r1.1426 -r1.1427
--- ChangeLog   27 Oct 2006 18:20:19 -0000      1.1426
+++ ChangeLog   27 Oct 2006 18:27:40 -0000      1.1427
@@ -10,7 +10,9 @@
          Sleep -> sleep. #ifndef __GNUC__ fmod = std::fmod.
        * backend/render_handler_ogl.cpp: Don't use GLew since it useless...
          TODO: rewrite NV-ext to generic OGL so it works. Removed ';' to
-         conform to -pedantic -Werror.
+         conform to -pedantic -Werror. Changed name on quad to iquad to avoid
+         "cc-1101 CC: ERROR File = render_handler_ogl.cpp, Line = 150
+         "quad" has already been declared in the current scope."
 
 2006-10-27 Vitaly Alexeev <address@hidden>
 

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- backend/render_handler_ogl.cpp      27 Oct 2006 18:20:19 -0000      1.37
+++ backend/render_handler_ogl.cpp      27 Oct 2006 18:27:40 -0000      1.38
@@ -6,7 +6,7 @@
 // A render_handler that uses SDL & OpenGL
 
 
-/* $Id: render_handler_ogl.cpp,v 1.37 2006/10/27 18:20:19 nihilus Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.38 2006/10/27 18:27:40 nihilus Exp $ */
 
 //#include "gnash.h"
 #include "render_handler.h"
@@ -147,7 +147,7 @@
 
 
 static GLfloat yuv2rgb[2][4] = {{0.500000f, 0.413650f, 0.944700f, 0.f},        
{0.851850f, 0.320550f, 0.500000f, 1.f}};
-static GLint quad[] = {-1, 1, 1, 1, 1, -1, -1, -1};
+static GLint iquad[] = {-1, 1, 1, 1, 1, -1, -1, -1};
 
 class YUV_video_ogl : public gnash::YUV_video
 {
@@ -310,7 +310,7 @@
                                {
                                        glMultiTexCoord2fvARB (planes[U].unit, 
planes[1].coords[i]);
                                        glMultiTexCoord2fvARB (planes[V].unit, 
planes[2].coords[i]);
-                                       glVertex2iv (quad + i * 2);
+                                       glVertex2iv (iquad + i * 2);
                                }
                        }
                        glEnd ();