[mapserver-commits] r8923 - sandbox/graphics

[svn at osgeo.org]

Author: tamas
Date: 2009-04-18 19:02:25 -0400 (Sat, 18 Apr 2009)
New Revision: 8923

Modified:
   sandbox/graphics/mapoglcontext.cpp
   sandbox/graphics/mapoutput.c
   sandbox/graphics/nmake.opt
Log:
Trying to fix the build problems with opengl

Modified: sandbox/graphics/mapoglcontext.cpp
===================================================================
--- sandbox/graphics/mapoglcontext.cpp	2009-04-18 21:13:43 UTC (rev 8922)
+++ sandbox/graphics/mapoglcontext.cpp	2009-04-18 23:02:25 UTC (rev 8923)
@@ -11,6 +11,8 @@
 #include "maperror.h"
 #include "mapoglcontext.h"
 
+#define _T(x) __TEXT(x)
+
 ms_uint32 OglContext::MAX_MULTISAMPLE_SAMPLES = 16;
 ms_uint32 OglContext::MAX_ANISOTROPY = 0;
 ms_uint32 OglContext::MAX_TEXTURE_SIZE = 0;
@@ -80,7 +82,7 @@
 	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
 	wc.hbrBackground = NULL;
 	wc.lpszMenuName = NULL;
-	wc.lpszClassName = L"OpenGL";
+	wc.lpszClassName = _T("OpenGL");
 
 	if (!RegisterClass(&wc))
 	{
@@ -93,8 +95,8 @@
 	AdjustWindowRectEx(&WindowRect, dwStyle, FALSE, dwExStyle);
 
 	if (!(hWnd=CreateWindowEx( dwExStyle,
-							L"OpenGL",
-							L"temp",
+							_T("OpenGL"),
+							_T("temp"),
 							dwStyle |
 							WS_CLIPSIBLINGS |
 							WS_CLIPCHILDREN,
@@ -200,8 +202,8 @@
 
 bool OglContext::createPBuffer(ms_uint32 width, ms_uint32 height)
 {
-	HPBUFFERARB hPBuffer = NULL;
-	hPBufferDC = NULL;
+	HPBUFFERARB hPBuffer = NULL;
+	hPBufferDC = NULL;
 	hPBufferRC = NULL;
 
 	int pixelFormat;

Modified: sandbox/graphics/mapoutput.c
===================================================================
--- sandbox/graphics/mapoutput.c	2009-04-18 21:13:43 UTC (rev 8922)
+++ sandbox/graphics/mapoutput.c	2009-04-18 23:02:25 UTC (rev 8923)
@@ -1023,7 +1023,7 @@
 #endif
 #ifdef USE_OGL
     case MS_RENDER_WITH_OGL:
-    	r->use_imagecache = 1;
+    	r->use_imagecache_for_rotation = 1;
     	r->supports_transparent_layers = 1;
     	r->startNewLayer = msStartNewLayerOgl;
     	r->closeNewLayer = msCloseNewLayerOgl;
@@ -1033,15 +1033,15 @@
         r->transformShape=&msTransformShapeAGG;
         r->renderPolygon=&msDrawPolygonOgl;
         r->renderGlyphs=&msRenderGlyphsOgl;
-        r->renderEllipse = &msRenderEllipseOgl;
+        r->renderEllipseSymbol = &msRenderEllipseOgl;
         r->renderVectorSymbol = &msRenderVectorSymbolOgl;
-        r->renderPixmap = &msRenderPixmapOgl;
-        r->mergeImages = &msMergeImagesOgl;
+        r->renderPixmapSymbol = &msRenderPixmapOgl;
+        r->mergeRasterBuffer = &msMergeImagesOgl;
         r->getTruetypeTextBBox = &msGetTruetypeTextBBoxOgl;
-        r->createTilePixmap = &msCreateTilePixmapOgl;
-        r->createTileVector = &msCreateTileVectorOgl;
-        r->createTileEllipse = &msCreateTileEllipseOgl;
-        r->createTileTruetype = &msCreateTileTruetypeOgl;
+        r->createPixmapSymbolTile = &msCreateTilePixmapOgl;
+        r->createVectorSymbolTile = &msCreateTileVectorOgl;
+        r->createEllipseSymbolTile = &msCreateTileEllipseOgl;
+        r->createTruetypeSymbolTile = &msCreateTileTruetypeOgl;
         r->renderTile = &msRenderTileOgl;
         r->renderPolygonTiled = &msDrawPolygonTiledOgl;
         r->renderLineTiled = &msDrawLineTiledOgl;

Modified: sandbox/graphics/nmake.opt
===================================================================
--- sandbox/graphics/nmake.opt	2009-04-18 21:13:43 UTC (rev 8922)
+++ sandbox/graphics/nmake.opt	2009-04-18 23:02:25 UTC (rev 8923)
@@ -748,7 +748,7 @@
 # Setup OGL
 !IFDEF OGL
 OGL_INC= -I$(FTGL_DIR)\src
-OGL_LIB= $(FTGL_DIR)\msvc\build\ftgl_static.lib opengl32.lib glu32.lib
+OGL_LIB= $(FTGL_DIR)\msvc\build\ftgl_static.lib opengl32.lib glu32.lib user32.lib gdi32.lib
 !ENDIF
 
 # Setup CAIRO