Work around apparent OSG 3.2.0 normal binding bug.

[simgear.git] / simgear / scene / material / mipmap.hxx

diff --git a/simgear/scene/material/mipmap.hxx b/simgear/scene/material/mipmap.hxx
index d0fdcbb5244698f4f2fd41226452c8c5fd3eec17..0a908c5975ac39e2a631e7104b47f292dcd2b9d5 100644 (file)
--- a/simgear/scene/material/mipmap.hxx
+++ b/simgear/scene/material/mipmap.hxx
@@ -1,50 +1,50 @@
-// Copyright (C) 2010  Frederic Bouvier\r
-//\r
-// This library is free software; you can redistribute it and/or\r
-// modify it under the terms of the GNU Library General Public\r
-// License as published by the Free Software Foundation; either\r
-// version 2 of the License, or (at your option) any later version.\r
-//\r
-// This library is distributed in the hope that it will be useful,\r
-// but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
-// Library General Public License for more details.\r
-//\r
-// You should have received a copy of the GNU General Public License\r
-// along with this program; if not, write to the Free Software\r
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\r
-\r
-#ifndef SIMGEAR_MIPMAP_HXX\r
-#define SIMGEAR_MIPMAP_HXX 1\r
-\r
-#include <boost/tuple/tuple.hpp>\r
-\r
-class SGPropertyNode;\r
-\r
-namespace osg {\r
-    class Image;\r
-}\r
-\r
-namespace simgear\r
-{\r
-class Effect;\r
-class SGReaderWriterXMLOptions;\r
-\r
-namespace effect {\r
-enum MipMapFunction {\r
-    AUTOMATIC,\r
-    AVERAGE,\r
-    SUM,\r
-    PRODUCT,\r
-    MIN,\r
-    MAX\r
-};\r
-\r
-typedef boost::tuple<MipMapFunction, MipMapFunction, MipMapFunction, MipMapFunction> MipMapTuple;\r
-\r
-MipMapTuple makeMipMapTuple(Effect* effect, const SGPropertyNode* props,\r
-                      const SGReaderWriterXMLOptions* options);\r
-osg::Image* computeMipmap( osg::Image* image, MipMapTuple attrs );\r
-} }\r
-\r
-#endif\r
+// Copyright (C) 2010  Frederic Bouvier
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+#ifndef SIMGEAR_MIPMAP_HXX
+#define SIMGEAR_MIPMAP_HXX 1
+
+#include <boost/tuple/tuple.hpp>
+
+class SGPropertyNode;
+
+namespace osg {
+    class Image;
+}
+
+namespace simgear
+{
+class Effect;
+class SGReaderWriterOptions;
+
+namespace effect {
+enum MipMapFunction {
+    AUTOMATIC,
+    AVERAGE,
+    SUM,
+    PRODUCT,
+    MIN,
+    MAX
+};
+
+typedef boost::tuple<MipMapFunction, MipMapFunction, MipMapFunction, MipMapFunction> MipMapTuple;
+
+MipMapTuple makeMipMapTuple(Effect* effect, const SGPropertyNode* props,
+                      const SGReaderWriterOptions* options);
+osg::Image* computeMipmap( osg::Image* image, MipMapTuple attrs );
+} }
+
+#endif