From 10eac072c226d2e346e7d2627f654d5265ba9f03 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 6 Oct 2010 15:14:01 +0000 Subject: [PATCH] Removed usage gluos.h and redundent gluint.h --- src/osg/CMakeLists.txt | 1 - src/osg/glu/libtess/geom.cpp | 2 +- src/osg/glu/libtess/gluos.h | 72 ------------------------ src/osg/glu/libtess/mesh.cpp | 2 +- src/osg/glu/libtess/normal.cpp | 2 +- src/osg/glu/libtess/priorityq.cpp | 2 +- src/osg/glu/libtess/render.cpp | 2 +- src/osg/glu/libtess/sweep.cpp | 2 +- src/osg/glu/libtess/tess.cpp | 2 +- src/osg/glu/libtess/tessmono.cpp | 2 +- src/osg/glu/libutil/error.cpp | 2 +- src/osg/glu/libutil/glue.cpp | 92 ------------------------------- src/osg/glu/libutil/gluint.h | 48 ---------------- src/osg/glu/libutil/gluos.h | 72 ------------------------ src/osg/glu/libutil/mipmap.cpp | 5 +- 15 files changed, 12 insertions(+), 296 deletions(-) delete mode 100644 src/osg/glu/libtess/gluos.h delete mode 100644 src/osg/glu/libutil/glue.cpp delete mode 100644 src/osg/glu/libutil/gluint.h delete mode 100644 src/osg/glu/libutil/gluos.h diff --git a/src/osg/CMakeLists.txt b/src/osg/CMakeLists.txt index aeb81f128..6d7dd8e9e 100644 --- a/src/osg/CMakeLists.txt +++ b/src/osg/CMakeLists.txt @@ -338,7 +338,6 @@ ADD_LIBRARY(${LIB_NAME} View.cpp Viewport.cpp - glu/libutil/gluos.h glu/libutil/error.cpp glu/libutil/mipmap.cpp diff --git a/src/osg/glu/libtess/geom.cpp b/src/osg/glu/libtess/geom.cpp index 35b36a394..a4a97f579 100644 --- a/src/osg/glu/libtess/geom.cpp +++ b/src/osg/glu/libtess/geom.cpp @@ -32,7 +32,7 @@ ** */ -#include "gluos.h" +// #include "gluos.h" #include #include "mesh.h" #include "geom.h" diff --git a/src/osg/glu/libtess/gluos.h b/src/osg/glu/libtess/gluos.h deleted file mode 100644 index 8eaa7a153..000000000 --- a/src/osg/glu/libtess/gluos.h +++ /dev/null @@ -1,72 +0,0 @@ -/* -** gluos.h - operating system dependencies for GLU -** -*/ -#ifdef __VMS -#ifdef __cplusplus -#pragma message disable nocordel -#pragma message disable codeunreachable -#pragma message disable codcauunr -#endif -#endif - -#ifdef __WATCOMC__ -/* Disable *lots* of warnings to get a clean build. I can't be bothered fixing the - * code at the moment, as it is pretty ugly. - */ -#pragma warning 7 10 -#pragma warning 13 10 -#pragma warning 14 10 -#pragma warning 367 10 -#pragma warning 379 10 -#pragma warning 726 10 -#pragma warning 836 10 -#endif - -#ifdef BUILD_FOR_SNAP - -#include -#include -#include - -#elif defined(_WIN32) - -#include /* For _MAX_PATH definition */ -#include -#include - -#define WIN32_LEAN_AND_MEAN -#define NOGDI -#define NOIME -#define NOMINMAX - -#define _WIN32_WINNT 0x0400 -#ifndef STRICT - #define STRICT 1 -#endif - -#include - -/* Disable warnings */ -#pragma warning(disable : 4101) -#pragma warning(disable : 4244) -#pragma warning(disable : 4761) - -#if defined(_MSC_VER) && _MSC_VER >= 1200 && _MSC_VER < 1300 -#pragma comment(linker, "/OPT:NOWIN98") -#endif - -#elif defined(__OS2__) - -#include -#include -#include -#define WINGDIAPI - -#else - -/* Disable Microsoft-specific keywords */ -#define GLAPIENTRY -#define WINGDIAPI - -#endif diff --git a/src/osg/glu/libtess/mesh.cpp b/src/osg/glu/libtess/mesh.cpp index 36cb3a7be..4ad7a4950 100644 --- a/src/osg/glu/libtess/mesh.cpp +++ b/src/osg/glu/libtess/mesh.cpp @@ -32,7 +32,7 @@ ** */ -#include "gluos.h" +// #include "gluos.h" #include #include #include "mesh.h" diff --git a/src/osg/glu/libtess/normal.cpp b/src/osg/glu/libtess/normal.cpp index 9a3bd43d3..f7407dba1 100644 --- a/src/osg/glu/libtess/normal.cpp +++ b/src/osg/glu/libtess/normal.cpp @@ -32,7 +32,7 @@ ** */ -#include "gluos.h" +// #include "gluos.h" #include "mesh.h" #include "tess.h" #include "normal.h" diff --git a/src/osg/glu/libtess/priorityq.cpp b/src/osg/glu/libtess/priorityq.cpp index 614229f31..0079b86e4 100644 --- a/src/osg/glu/libtess/priorityq.cpp +++ b/src/osg/glu/libtess/priorityq.cpp @@ -32,7 +32,7 @@ ** */ -#include "gluos.h" +// #include "gluos.h" #include #include #include /* LONG_MAX */ diff --git a/src/osg/glu/libtess/render.cpp b/src/osg/glu/libtess/render.cpp index bca836f04..cf29be7ed 100644 --- a/src/osg/glu/libtess/render.cpp +++ b/src/osg/glu/libtess/render.cpp @@ -32,7 +32,7 @@ ** */ -#include "gluos.h" +// #include "gluos.h" #include #include #include "mesh.h" diff --git a/src/osg/glu/libtess/sweep.cpp b/src/osg/glu/libtess/sweep.cpp index eca828ff6..c79e3eb2b 100644 --- a/src/osg/glu/libtess/sweep.cpp +++ b/src/osg/glu/libtess/sweep.cpp @@ -32,7 +32,7 @@ ** */ -#include "gluos.h" +// #include "gluos.h" #include #include #include /* longjmp */ diff --git a/src/osg/glu/libtess/tess.cpp b/src/osg/glu/libtess/tess.cpp index 4a0e8dea7..c7a68aacb 100644 --- a/src/osg/glu/libtess/tess.cpp +++ b/src/osg/glu/libtess/tess.cpp @@ -32,7 +32,7 @@ ** */ -#include "gluos.h" +// #include "gluos.h" #include #include #include diff --git a/src/osg/glu/libtess/tessmono.cpp b/src/osg/glu/libtess/tessmono.cpp index 4d0844005..6c2474b61 100644 --- a/src/osg/glu/libtess/tessmono.cpp +++ b/src/osg/glu/libtess/tessmono.cpp @@ -32,7 +32,7 @@ ** */ -#include "gluos.h" +// #include "gluos.h" #include #include "geom.h" #include "mesh.h" diff --git a/src/osg/glu/libutil/error.cpp b/src/osg/glu/libutil/error.cpp index cdd029b8c..90b474489 100644 --- a/src/osg/glu/libutil/error.cpp +++ b/src/osg/glu/libutil/error.cpp @@ -30,7 +30,7 @@ #include -#include "gluos.h" +// #include "gluos.h" static unsigned char *__gluNurbsErrors[] = { (unsigned char*) " ", diff --git a/src/osg/glu/libutil/glue.cpp b/src/osg/glu/libutil/glue.cpp deleted file mode 100644 index 13b82f9d2..000000000 --- a/src/osg/glu/libutil/glue.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* - * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) - * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice including the dates of first publication and - * either this permission notice or a reference to - * http://oss.sgi.com/projects/FreeB/ - * shall be included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF - * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * Except as contained in this notice, the name of Silicon Graphics, Inc. - * shall not be used in advertising or otherwise to promote the sale, use or - * other dealings in this Software without prior written authorization from - * Silicon Graphics, Inc. - */ - -#include - -static unsigned char *__gluNurbsErrors[] = { - (unsigned char*) " ", - (unsigned char*) "spline order un-supported", - (unsigned char*) "too few knots", - (unsigned char*) "valid knot range is empty", - (unsigned char*) "decreasing knot sequence knot", - (unsigned char*) "knot multiplicity greater than order of spline", - (unsigned char*) "gluEndCurve() must follow gluBeginCurve()", - (unsigned char*) "gluBeginCurve() must precede gluEndCurve()", - (unsigned char*) "missing or extra geometric data", - (unsigned char*) "can't draw piecewise linear trimming curves", - (unsigned char*) "missing or extra domain data", - (unsigned char*) "missing or extra domain data", - (unsigned char*) "gluEndTrim() must precede gluEndSurface()", - (unsigned char*) "gluBeginSurface() must precede gluEndSurface()", - (unsigned char*) "curve of improper type passed as trim curve", - (unsigned char*) "gluBeginSurface() must precede gluBeginTrim()", - (unsigned char*) "gluEndTrim() must follow gluBeginTrim()", - (unsigned char*) "gluBeginTrim() must precede gluEndTrim()", - (unsigned char*) "invalid or missing trim curve", - (unsigned char*) "gluBeginTrim() must precede gluPwlCurve()", - (unsigned char*) "piecewise linear trimming curve referenced twice", - (unsigned char*) "piecewise linear trimming curve and nurbs curve mixed", - (unsigned char*) "improper usage of trim data type", - (unsigned char*) "nurbs curve referenced twice", - (unsigned char*) "nurbs curve and piecewise linear trimming curve mixed", - (unsigned char*) "nurbs surface referenced twice", - (unsigned char*) "invalid property", - (unsigned char*) "gluEndSurface() must follow gluBeginSurface()", - (unsigned char*) "intersecting or misoriented trim curves", - (unsigned char*) "intersecting trim curves", - (unsigned char*) "UNUSED", - (unsigned char*) "unconnected trim curves", - (unsigned char*) "unknown knot error", - (unsigned char*) "negative vertex count encountered", - (unsigned char*) "negative byte-stride encounteed", - (unsigned char*) "unknown type descriptor", - (unsigned char*) "null control point reference", - (unsigned char*) "duplicate point on piecewise linear trimming curve", -}; - -const unsigned char *__gluNURBSErrorString( int errnum ) -{ - return __gluNurbsErrors[errnum]; -} - -static unsigned char *__gluTessErrors[] = { - (unsigned char*) " ", - (unsigned char*) "gluTessBeginPolygon() must precede a gluTessEndPolygon()", - (unsigned char*) "gluTessBeginContour() must precede a gluTessEndContour()", - (unsigned char*) "gluTessEndPolygon() must follow a gluTessBeginPolygon()", - (unsigned char*) "gluTessEndContour() must follow a gluTessBeginContour()", - (unsigned char*) "a coordinate is too large", - (unsigned char*) "need combine callback", -}; - -const unsigned char *__gluTessErrorString( int errnum ) -{ - return __gluTessErrors[errnum]; -} /* __glTessErrorString() */ diff --git a/src/osg/glu/libutil/gluint.h b/src/osg/glu/libutil/gluint.h deleted file mode 100644 index fd513caa6..000000000 --- a/src/osg/glu/libutil/gluint.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) - * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice including the dates of first publication and - * either this permission notice or a reference to - * http://oss.sgi.com/projects/FreeB/ - * shall be included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF - * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * Except as contained in this notice, the name of Silicon Graphics, Inc. - * shall not be used in advertising or otherwise to promote the sale, use or - * other dealings in this Software without prior written authorization from - * Silicon Graphics, Inc. - */ - -#ifndef __gluint_h__ -#define __gluint_h__ - -extern const unsigned char *__gluNURBSErrorString( int errnum ); - -extern const unsigned char *__gluTessErrorString( int errnum ); - -#ifdef _EXTENSIONS_ -#define COS cosf -#define SIN sinf -#define SQRT sqrtf -#else -#define COS cos -#define SIN sin -#define SQRT sqrt -#endif - -#endif /* __gluint_h__ */ diff --git a/src/osg/glu/libutil/gluos.h b/src/osg/glu/libutil/gluos.h deleted file mode 100644 index 8eaa7a153..000000000 --- a/src/osg/glu/libutil/gluos.h +++ /dev/null @@ -1,72 +0,0 @@ -/* -** gluos.h - operating system dependencies for GLU -** -*/ -#ifdef __VMS -#ifdef __cplusplus -#pragma message disable nocordel -#pragma message disable codeunreachable -#pragma message disable codcauunr -#endif -#endif - -#ifdef __WATCOMC__ -/* Disable *lots* of warnings to get a clean build. I can't be bothered fixing the - * code at the moment, as it is pretty ugly. - */ -#pragma warning 7 10 -#pragma warning 13 10 -#pragma warning 14 10 -#pragma warning 367 10 -#pragma warning 379 10 -#pragma warning 726 10 -#pragma warning 836 10 -#endif - -#ifdef BUILD_FOR_SNAP - -#include -#include -#include - -#elif defined(_WIN32) - -#include /* For _MAX_PATH definition */ -#include -#include - -#define WIN32_LEAN_AND_MEAN -#define NOGDI -#define NOIME -#define NOMINMAX - -#define _WIN32_WINNT 0x0400 -#ifndef STRICT - #define STRICT 1 -#endif - -#include - -/* Disable warnings */ -#pragma warning(disable : 4101) -#pragma warning(disable : 4244) -#pragma warning(disable : 4761) - -#if defined(_MSC_VER) && _MSC_VER >= 1200 && _MSC_VER < 1300 -#pragma comment(linker, "/OPT:NOWIN98") -#endif - -#elif defined(__OS2__) - -#include -#include -#include -#define WINGDIAPI - -#else - -/* Disable Microsoft-specific keywords */ -#define GLAPIENTRY -#define WINGDIAPI - -#endif diff --git a/src/osg/glu/libutil/mipmap.cpp b/src/osg/glu/libutil/mipmap.cpp index a13616a6c..da84a1451 100644 --- a/src/osg/glu/libutil/mipmap.cpp +++ b/src/osg/glu/libutil/mipmap.cpp @@ -30,9 +30,10 @@ #include -#include "gluos.h" -#include +// #include "gluos.h" // #include + +#include #include #include #include