Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1

1 files changed, 42 insertions, 42 deletions

diff --git a/src/glut/os2/glut_stroke.cpp b/src/glut/os2/glut_stroke.cpp
index 4823283c8c..ac231e4973 100644
--- a/src/glut/os2/glut_stroke.cpp
+++ b/src/glut/os2/glut_stroke.cpp
@@ -1,42 +1,42 @@
-

-/* Copyright (c) Mark J. Kilgard, 1994. */

-

-/* This program is freely distributable without licensing fees

-   and is provided without guarantee or warrantee expressed or

-   implied. This program is -not- in the public domain. */

-

-#include "glutint.h"

-#include "glutstroke.h"

-

-void GLUTAPIENTRY

-glutStrokeCharacter(GLUTstrokeFont font, int c)

-{

-  const StrokeCharRec *ch;

-  const StrokeRec *stroke;

-  const CoordRec *coord;

-  StrokeFontPtr fontinfo;

-  int i, j;

-

-

-#if defined(_WIN32)

-  fontinfo = (StrokeFontPtr) __glutFont(font);

-#else

-  fontinfo = (StrokeFontPtr) font;

-#endif

-

-  if (c < 0 || c >= fontinfo->num_chars)

-    return;

-  ch = &(fontinfo->ch[c]);

-  if (ch) {

-    for (i = ch->num_strokes, stroke = ch->stroke;

-      i > 0; i--, stroke++) {

-      glBegin(GL_LINE_STRIP);

-      for (j = stroke->num_coords, coord = stroke->coord;

-        j > 0; j--, coord++) {

-        glVertex2f(coord->x, coord->y);

-      }

-      glEnd();

-    }

-    glTranslatef(ch->right, 0.0, 0.0);

-  }

-}

+
+/* Copyright (c) Mark J. Kilgard, 1994. */
+
+/* This program is freely distributable without licensing fees
+   and is provided without guarantee or warrantee expressed or
+   implied. This program is -not- in the public domain. */
+
+#include "glutint.h"
+#include "glutstroke.h"
+
+void GLUTAPIENTRY
+glutStrokeCharacter(GLUTstrokeFont font, int c)
+{
+  const StrokeCharRec *ch;
+  const StrokeRec *stroke;
+  const CoordRec *coord;
+  StrokeFontPtr fontinfo;
+  int i, j;
+
+
+#if defined(_WIN32)
+  fontinfo = (StrokeFontPtr) __glutFont(font);
+#else
+  fontinfo = (StrokeFontPtr) font;
+#endif
+
+  if (c < 0 || c >= fontinfo->num_chars)
+    return;
+  ch = &(fontinfo->ch[c]);
+  if (ch) {
+    for (i = ch->num_strokes, stroke = ch->stroke;
+      i > 0; i--, stroke++) {
+      glBegin(GL_LINE_STRIP);
+      for (j = stroke->num_coords, coord = stroke->coord;
+        j > 0; j--, coord++) {
+        glVertex2f(coord->x, coord->y);
+      }
+      glEnd();
+    }
+    glTranslatef(ch->right, 0.0, 0.0);
+  }
+}