diff options
Diffstat (limited to 'tests/glean/dsconfig.cpp')
| -rw-r--r-- | tests/glean/dsconfig.cpp | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/tests/glean/dsconfig.cpp b/tests/glean/dsconfig.cpp index 861c0c831..cf2f769c9 100644 --- a/tests/glean/dsconfig.cpp +++ b/tests/glean/dsconfig.cpp @@ -32,7 +32,7 @@ // dsconfig.cpp: Implementation of drawing surface configuration utilities #include "dsconfig.h" #include <iostream> -#include <strstream> +#include <sstream> #include <string.h> #include <map> #include <limits.h> @@ -121,7 +121,7 @@ typedef enum { // These variable tags are used as array indices, V_LAST } CanonVar; -struct {CanonVar var; char* name;} varNames[] = { +static struct {CanonVar var; const char* name;} varNames[] = { {VID, "id"}, {VFBCID, "fbcID"}, {VCANRGBA, "canRGBA"}, @@ -159,7 +159,7 @@ struct {CanonVar var; char* name;} varNames[] = { {VTRANSI, "transI"} }; -char* mapVarToName[V_LAST]; +const char* mapVarToName[V_LAST]; map<string, CanonVar> mapNameToVar; bool mapsInitialized = false; @@ -416,7 +416,7 @@ DrawingSurfaceConfig::DrawingSurfaceConfig() { DrawingSurfaceConfig::DrawingSurfaceConfig(int id, ::AGLPixelFormat pfd) { - long i; + int i; if (!mapsInitialized) initializeMaps(); @@ -440,10 +440,10 @@ DrawingSurfaceConfig::DrawingSurfaceConfig(int id, ::AGLPixelFormat pfd) aux = i; if (canRGBA) { - aglDescribePixelFormat( pf, AGL_RED_SIZE, (long *)&r); - aglDescribePixelFormat( pf, AGL_GREEN_SIZE, (long *)&g); - aglDescribePixelFormat( pf, AGL_BLUE_SIZE, (long *)&b); - aglDescribePixelFormat( pf, AGL_ALPHA_SIZE, (long *)&a); + aglDescribePixelFormat( pf, AGL_RED_SIZE, &r); + aglDescribePixelFormat( pf, AGL_GREEN_SIZE, &g); + aglDescribePixelFormat( pf, AGL_BLUE_SIZE, &b); + aglDescribePixelFormat( pf, AGL_ALPHA_SIZE, &a); //this is a workaround for some versions of AGL if (r == 10) @@ -457,13 +457,13 @@ DrawingSurfaceConfig::DrawingSurfaceConfig(int id, ::AGLPixelFormat pfd) samples = 0; // XXX implement properly for AGL - aglDescribePixelFormat( pf, AGL_DEPTH_SIZE, (long *)& z); - aglDescribePixelFormat( pf, AGL_STENCIL_SIZE, (long *)& s); + aglDescribePixelFormat( pf, AGL_DEPTH_SIZE, & z); + aglDescribePixelFormat( pf, AGL_STENCIL_SIZE, & s); - aglDescribePixelFormat( pf, AGL_ACCUM_RED_SIZE, (long *)& accR); - aglDescribePixelFormat( pf, AGL_ACCUM_GREEN_SIZE, (long *)& accG); - aglDescribePixelFormat( pf, AGL_ACCUM_BLUE_SIZE, (long *)& accB); - aglDescribePixelFormat( pf, AGL_ACCUM_ALPHA_SIZE, (long *)& accA); + aglDescribePixelFormat( pf, AGL_ACCUM_RED_SIZE, & accR); + aglDescribePixelFormat( pf, AGL_ACCUM_GREEN_SIZE, & accG); + aglDescribePixelFormat( pf, AGL_ACCUM_BLUE_SIZE, & accB); + aglDescribePixelFormat( pf, AGL_ACCUM_ALPHA_SIZE, & accA); aglDescribePixelFormat( pf, AGL_WINDOW, &i); canWindow = i; @@ -650,11 +650,7 @@ DrawingSurfaceConfig::DrawingSurfaceConfig(string& str) { /////////////////////////////////////////////////////////////////////////////// string DrawingSurfaceConfig::canonicalDescription() { - - // Would rather use ostringstream, but it's not available in - // egcs 1.1.2. - char buf[1024]; - ostrstream s(buf, sizeof(buf)); + ostringstream s; # if defined(__X11__) s << mapVarToName[VID] << ' ' << visID; @@ -721,7 +717,6 @@ DrawingSurfaceConfig::canonicalDescription() { << ' ' << mapVarToName[VTRANSA] << ' ' << transA << ' ' << mapVarToName[VTRANSI] << ' ' << transI; - s << '\0'; return s.str(); } // DrawingSurfaceConfig::canonicalDescription @@ -731,8 +726,7 @@ DrawingSurfaceConfig::canonicalDescription() { /////////////////////////////////////////////////////////////////////////////// string DrawingSurfaceConfig::conciseDescription() { - char buf[1024]; - ostrstream s(buf, sizeof(buf)); + ostringstream s; if (canRGBA && canCI) s << "dual "; @@ -848,7 +842,6 @@ DrawingSurfaceConfig::conciseDescription() { s << ", id " << pfdID; # endif - s << '\0'; return s.str(); } // DrawingSurfaceConfig::conciseDescription |