|
From: <mk...@us...> - 2003-07-15 18:53:43
|
Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv15968
Modified Files:
CHANGES.current Makefile.in Terrain.cpp
Log Message:
see CHANGES.current
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/CHANGES.current,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CHANGES.current 10 Jun 2003 22:48:37 -0000 1.7
--- CHANGES.current 15 Jul 2003 18:53:40 -0000 1.8
***************
*** 2,5 ****
--- 2,9 ----
===========================
+ 2003-07-15: onsight
+ Disabled GDAL support by default.
+ Moved LoadRawImage into an #ifdef _USE_GDAL_ block.
+
2003-05-XX: onsight
Minor optimizations in texture generation. Still needs
Index: Makefile.in
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.in 14 Mar 2003 22:02:18 -0000 1.4
--- Makefile.in 15 Jul 2003 18:53:40 -0000 1.5
***************
*** 38,42 ****
CXXFLAGS+=-Wall
CXXFLAGS+=@sdl_FLAGS@
! CXXFLAGS+=-D_USE_GDAL_
CXXFLAGS+=-w
--- 38,42 ----
CXXFLAGS+=-Wall
CXXFLAGS+=@sdl_FLAGS@
! #CXXFLAGS+=-D_USE_GDAL_
CXXFLAGS+=-w
Index: Terrain.cpp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/Terrain.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Terrain.cpp 10 Jun 2003 22:43:21 -0000 1.8
--- Terrain.cpp 15 Jul 2003 18:53:40 -0000 1.9
***************
*** 118,122 ****
--- 118,124 ----
GLuint CreateTexture(const Uint8* pTexels,int width,int height,int rowLength,int border,int internalFormat,bool bClamp,bool bAlpha = false);
void LoadImage(const char* szFilename,int& pWidth,int& pHeight,Uint8** pBuffer,bool bAlpha = false);
+ #ifdef _USE_GDAL_
void LoadRawImage(const char* szFilename,int& pWidth,int& pHeight,Uint8** pBuffer,bool bAlpha = false);
+ #endif // _USE_GDAL_
int RayPlaneIntersect(const Ray *ray,const Plane *plane,Vector* point,float *distance);
int RayBoxIntersect(const Ray *ray,const Box *box,Vector *point,float *distance);
***************
*** 2551,2554 ****
--- 2553,2557 ----
+ #ifdef _USE_GDAL_
void LoadRawImage(const char* szShortFilename,int& width,int &height,Uint8** ppBuffer,bool bAlpha)
{
***************
*** 2636,2639 ****
--- 2639,2643 ----
}
+ #endif // _USE_GDAL_
|