[mapserver-commits] r8415 - in sandbox: MapServer opengl
svn at osgeo.org
svn at osgeo.org
Thu Jan 8 22:27:00 EST 2009
Author: jbourke
Date: 2009-01-08 22:27:00 -0500 (Thu, 08 Jan 2009)
New Revision: 8415
Added:
sandbox/MapServer/maperror.h
Removed:
sandbox/opengl/maperror.h
Log:
Moved remotely
Copied: sandbox/MapServer/maperror.h (from rev 8414, sandbox/opengl/maperror.h)
===================================================================
--- sandbox/MapServer/maperror.h (rev 0)
+++ sandbox/MapServer/maperror.h 2009-01-09 03:27:00 UTC (rev 8415)
@@ -0,0 +1,173 @@
+/******************************************************************************
+ * $Id: maperror.h 6749 2007-08-30 18:39:42Z dmorissette $
+ *
+ * Project: MapServer
+ * Purpose: Declarations for Error and Debug functions.
+ * Author: Steve Lime and the MapServer team.
+ *
+ ******************************************************************************
+ * Copyright (c) 1996-2005 Regents of the University of Minnesota.
+ *
+ * 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 and this permission notice shall be included in
+ * all copies of this Software or works derived from this 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
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ ****************************************************************************/
+
+#ifndef MAPERROR_H
+#define MAPERROR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*====================================================================
+ * maperror.c
+ *====================================================================*/
+
+#define MS_NOERR 0 /* general error codes */
+#define MS_IOERR 1
+#define MS_MEMERR 2
+#define MS_TYPEERR 3
+#define MS_SYMERR 4
+#define MS_REGEXERR 5
+#define MS_TTFERR 6
+#define MS_DBFERR 7
+#define MS_GDERR 8
+#define MS_IDENTERR 9
+#define MS_EOFERR 10
+#define MS_PROJERR 11
+#define MS_MISCERR 12
+#define MS_CGIERR 13
+#define MS_WEBERR 14
+#define MS_IMGERR 15
+#define MS_HASHERR 16
+#define MS_JOINERR 17
+#define MS_NOTFOUND 18 /* empty search results */
+#define MS_SHPERR 19
+#define MS_PARSEERR 20
+#define MS_SDEERR 21
+#define MS_OGRERR 22
+#define MS_QUERYERR 23
+#define MS_WMSERR 24 /* WMS server error */
+#define MS_WMSCONNERR 25 /* WMS connectiontype error */
+#define MS_ORACLESPATIALERR 26
+#define MS_WFSERR 27 /* WFS server error */
+#define MS_WFSCONNERR 28 /* WFS connectiontype error */
+#define MS_MAPCONTEXTERR 29 /* Map Context error */
+#define MS_HTTPERR 30
+#define MS_CHILDERR 31 /* Errors involving arrays of child objects */
+#define MS_WCSERR 32
+#define MS_GEOSERR 33
+#define MS_RECTERR 34
+#define MS_TIMEERR 35
+#define MS_GMLERR 36
+#define MS_SOSERR 37
+#define MS_NULLPARENTERR 38
+#define MS_AGGERR 39
+#define MS_NUMERRORCODES 40
+#define MS_OGLERR 41
+
+#define MESSAGELENGTH 2048
+#define ROUTINELENGTH 64
+
+#define MS_ERROR_LANGUAGE "en-US"
+
+#if defined(_WIN32) && !defined(__CYGWIN__)
+# define MS_DLL_EXPORT __declspec(dllexport)
+#else
+#define MS_DLL_EXPORT
+#endif
+
+typedef struct error_obj {
+ int code;
+ char routine[ROUTINELENGTH];
+ char message[MESSAGELENGTH];
+#ifndef SWIG
+ struct error_obj *next;
+#endif
+} errorObj;
+
+/*
+** Function prototypes
+*/
+MS_DLL_EXPORT errorObj *msGetErrorObj(void);
+MS_DLL_EXPORT void msResetErrorList(void);
+MS_DLL_EXPORT char *msGetVersion(void);
+MS_DLL_EXPORT int msGetVersionInt(void);
+MS_DLL_EXPORT char *msGetErrorString(char *delimiter);
+
+#ifndef SWIG
+MS_DLL_EXPORT void msSetError(int code, const char *message, const char *routine, ...);
+MS_DLL_EXPORT void msWriteError(FILE *stream);
+MS_DLL_EXPORT void msWriteErrorXML(FILE *stream);
+MS_DLL_EXPORT char *msGetErrorCodeString(int code);
+MS_DLL_EXPORT char *msAddErrorDisplayString(char *source, errorObj *error);
+
+struct map_obj;
+MS_DLL_EXPORT void msWriteErrorImage(struct map_obj *map, char *filename, int blank);
+
+#endif /* SWIG */
+
+/*====================================================================
+ * mapdebug.c (See also MS-RFC-28)
+ *====================================================================*/
+
+typedef enum { MS_DEBUGLEVEL_ERRORSONLY = 0, /* DEBUG OFF, log fatal errors */
+ MS_DEBUGLEVEL_DEBUG = 1, /* DEBUG ON */
+ MS_DEBUGLEVEL_TUNING = 2, /* Reports timing info */
+ MS_DEBUGLEVEL_V = 3, /* Verbose */
+ MS_DEBUGLEVEL_VV = 4, /* Very verbose */
+ MS_DEBUGLEVEL_VVV = 5 /* Very very verbose */
+} debugLevel;
+
+#ifndef SWIG
+
+typedef enum { MS_DEBUGMODE_OFF,
+ MS_DEBUGMODE_FILE,
+ MS_DEBUGMODE_STDERR,
+ MS_DEBUGMODE_STDOUT,
+ MS_DEBUGMODE_WINDOWSDEBUG
+} debugMode;
+
+typedef struct debug_info_obj
+{
+ debugLevel global_debug_level;
+ debugMode debug_mode;
+ char *errorfile;
+ FILE *fp;
+ /* The following 2 members are used only with USE_THREAD (but we won't #ifndef them) */
+ int thread_id;
+ struct debug_info_obj *next;
+} debugInfoObj;
+
+
+MS_DLL_EXPORT void msDebug( const char * pszFormat, ... );
+MS_DLL_EXPORT int msSetErrorFile(const char *pszErrorFile);
+MS_DLL_EXPORT void msCloseErrorFile( void );
+MS_DLL_EXPORT const char *msGetErrorFile( void );
+MS_DLL_EXPORT void msSetGlobalDebugLevel(int level);
+MS_DLL_EXPORT debugLevel msGetGlobalDebugLevel( void );
+MS_DLL_EXPORT int msDebugInitFromEnv( void );
+MS_DLL_EXPORT void msDebugCleanup( void );
+
+#endif /* SWIG */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MAPERROR_H */
Deleted: sandbox/opengl/maperror.h
===================================================================
--- sandbox/opengl/maperror.h 2009-01-09 03:26:19 UTC (rev 8414)
+++ sandbox/opengl/maperror.h 2009-01-09 03:27:00 UTC (rev 8415)
@@ -1,173 +0,0 @@
-/******************************************************************************
- * $Id: maperror.h 6749 2007-08-30 18:39:42Z dmorissette $
- *
- * Project: MapServer
- * Purpose: Declarations for Error and Debug functions.
- * Author: Steve Lime and the MapServer team.
- *
- ******************************************************************************
- * Copyright (c) 1996-2005 Regents of the University of Minnesota.
- *
- * 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 and this permission notice shall be included in
- * all copies of this Software or works derived from this 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
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- ****************************************************************************/
-
-#ifndef MAPERROR_H
-#define MAPERROR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*====================================================================
- * maperror.c
- *====================================================================*/
-
-#define MS_NOERR 0 /* general error codes */
-#define MS_IOERR 1
-#define MS_MEMERR 2
-#define MS_TYPEERR 3
-#define MS_SYMERR 4
-#define MS_REGEXERR 5
-#define MS_TTFERR 6
-#define MS_DBFERR 7
-#define MS_GDERR 8
-#define MS_IDENTERR 9
-#define MS_EOFERR 10
-#define MS_PROJERR 11
-#define MS_MISCERR 12
-#define MS_CGIERR 13
-#define MS_WEBERR 14
-#define MS_IMGERR 15
-#define MS_HASHERR 16
-#define MS_JOINERR 17
-#define MS_NOTFOUND 18 /* empty search results */
-#define MS_SHPERR 19
-#define MS_PARSEERR 20
-#define MS_SDEERR 21
-#define MS_OGRERR 22
-#define MS_QUERYERR 23
-#define MS_WMSERR 24 /* WMS server error */
-#define MS_WMSCONNERR 25 /* WMS connectiontype error */
-#define MS_ORACLESPATIALERR 26
-#define MS_WFSERR 27 /* WFS server error */
-#define MS_WFSCONNERR 28 /* WFS connectiontype error */
-#define MS_MAPCONTEXTERR 29 /* Map Context error */
-#define MS_HTTPERR 30
-#define MS_CHILDERR 31 /* Errors involving arrays of child objects */
-#define MS_WCSERR 32
-#define MS_GEOSERR 33
-#define MS_RECTERR 34
-#define MS_TIMEERR 35
-#define MS_GMLERR 36
-#define MS_SOSERR 37
-#define MS_NULLPARENTERR 38
-#define MS_AGGERR 39
-#define MS_NUMERRORCODES 40
-#define MS_OGLERR 41
-
-#define MESSAGELENGTH 2048
-#define ROUTINELENGTH 64
-
-#define MS_ERROR_LANGUAGE "en-US"
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-# define MS_DLL_EXPORT __declspec(dllexport)
-#else
-#define MS_DLL_EXPORT
-#endif
-
-typedef struct error_obj {
- int code;
- char routine[ROUTINELENGTH];
- char message[MESSAGELENGTH];
-#ifndef SWIG
- struct error_obj *next;
-#endif
-} errorObj;
-
-/*
-** Function prototypes
-*/
-MS_DLL_EXPORT errorObj *msGetErrorObj(void);
-MS_DLL_EXPORT void msResetErrorList(void);
-MS_DLL_EXPORT char *msGetVersion(void);
-MS_DLL_EXPORT int msGetVersionInt(void);
-MS_DLL_EXPORT char *msGetErrorString(char *delimiter);
-
-#ifndef SWIG
-MS_DLL_EXPORT void msSetError(int code, const char *message, const char *routine, ...);
-MS_DLL_EXPORT void msWriteError(FILE *stream);
-MS_DLL_EXPORT void msWriteErrorXML(FILE *stream);
-MS_DLL_EXPORT char *msGetErrorCodeString(int code);
-MS_DLL_EXPORT char *msAddErrorDisplayString(char *source, errorObj *error);
-
-struct map_obj;
-MS_DLL_EXPORT void msWriteErrorImage(struct map_obj *map, char *filename, int blank);
-
-#endif /* SWIG */
-
-/*====================================================================
- * mapdebug.c (See also MS-RFC-28)
- *====================================================================*/
-
-typedef enum { MS_DEBUGLEVEL_ERRORSONLY = 0, /* DEBUG OFF, log fatal errors */
- MS_DEBUGLEVEL_DEBUG = 1, /* DEBUG ON */
- MS_DEBUGLEVEL_TUNING = 2, /* Reports timing info */
- MS_DEBUGLEVEL_V = 3, /* Verbose */
- MS_DEBUGLEVEL_VV = 4, /* Very verbose */
- MS_DEBUGLEVEL_VVV = 5 /* Very very verbose */
-} debugLevel;
-
-#ifndef SWIG
-
-typedef enum { MS_DEBUGMODE_OFF,
- MS_DEBUGMODE_FILE,
- MS_DEBUGMODE_STDERR,
- MS_DEBUGMODE_STDOUT,
- MS_DEBUGMODE_WINDOWSDEBUG
-} debugMode;
-
-typedef struct debug_info_obj
-{
- debugLevel global_debug_level;
- debugMode debug_mode;
- char *errorfile;
- FILE *fp;
- /* The following 2 members are used only with USE_THREAD (but we won't #ifndef them) */
- int thread_id;
- struct debug_info_obj *next;
-} debugInfoObj;
-
-
-MS_DLL_EXPORT void msDebug( const char * pszFormat, ... );
-MS_DLL_EXPORT int msSetErrorFile(const char *pszErrorFile);
-MS_DLL_EXPORT void msCloseErrorFile( void );
-MS_DLL_EXPORT const char *msGetErrorFile( void );
-MS_DLL_EXPORT void msSetGlobalDebugLevel(int level);
-MS_DLL_EXPORT debugLevel msGetGlobalDebugLevel( void );
-MS_DLL_EXPORT int msDebugInitFromEnv( void );
-MS_DLL_EXPORT void msDebugCleanup( void );
-
-#endif /* SWIG */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MAPERROR_H */
More information about the mapserver-commits
mailing list