--- a/holdingarea/vg/2D_OpenVG_1_1_SF/ri/src/riDefs.h Thu Sep 16 12:43:44 2010 +0100
+++ b/holdingarea/vg/2D_OpenVG_1_1_SF/ri/src/riDefs.h Mon Sep 20 14:29:05 2010 +0100
@@ -1,206 +1,206 @@
-#ifndef __RIDEFS_H
-#define __RIDEFS_H
-
-/*------------------------------------------------------------------------
- *
- * OpenVG 1.1 Reference Implementation
- * -----------------------------------
- *
- * Copyright (c) 2007 The Khronos Group Inc.
- * Portions copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and /or associated documentation files
- * (the "Materials "), to deal in the Materials without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Materials,
- * and to permit persons to whom the Materials are furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Materials.
- *
- * THE MATERIALS ARE 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 MATERIALS OR
- * THE USE OR OTHER DEALINGS IN THE MATERIALS.
- *
- *//**
- * \file
- * \brief Platform- and compiler-dependent type and macro definitions.
- * \note
- *//*-------------------------------------------------------------------*/
-
-#include <float.h>
-#include <math.h>
-#include <assert.h>
-#include <new> //for bad_alloc
-
-#if defined(_WIN32) && defined(_DEBUG)
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-#endif
-
-//make for-clause scope c++ standard compliant on msvc
-#if defined (_MSC_VER)
-# if !defined (for)
- __forceinline bool getFalse (void) { return false; }
-# define for if(getFalse()); else for
-# endif // for
-
-#pragma warning(disable:4710) //disable function not inlined warning
-#pragma warning(disable:4714) //disable function not __forceinlined warning
-#endif // _MSC_VER
-
-namespace OpenVGRI
-{
-
-//=======================================================================
-
-typedef long long RIint64;
-typedef unsigned long long RIuint64;
-typedef int RIint32;
-typedef unsigned int RIuint32;
-typedef short RIint16;
-typedef unsigned short RIuint16;
-typedef signed char RIint8;
-typedef unsigned char RIuint8;
-typedef float RIfloat32;
-//TODO add compile-time assertions to guarantee the sizes
-
-#if defined (_MSC_VER) // MSVC WIN32
-# define RI_INLINE __forceinline
-#elif defined __APPLE__ || defined (__GNUC__) || defined (__GCC32__)
-# define RI_INLINE inline
-#endif
-
-/*!< Unsigned int that can hold a pointer to any type */
-/*!< Signed int that can hold a pointer to any type */
-#if defined (_MSC_VER) && (_MSC_VER >= 1300)
-typedef uintptr_t RIuintptr;
-typedef intptr_t RIintptr;
-#else
-typedef unsigned long RIuintptr;
-typedef signed long RIintptr;
-#endif
-
-#define RI_UINT32_MAX (0xffffffffu)
-#define RI_INT32_MAX (0x7fffffff)
-#define RI_INT32_MIN (-0x7fffffff-1)
-
-/* maximum mantissa is 23 */
-#define RI_MANTISSA_BITS 23
-
-/* maximum exponent is 8 */
-#define RI_EXPONENT_BITS 8
-
-typedef union
-{
- RIfloat32 f;
- RIuint32 i;
-} RIfloatInt;
-
-RI_INLINE float getFloatMax()
-{
- RIfloatInt v;
- v.i = (((1<<(RI_EXPONENT_BITS-1))-1+127) << 23) | (((1<<RI_MANTISSA_BITS)-1) << (23-RI_MANTISSA_BITS));
- return v.f;
-}
-#define RI_FLOAT_MAX getFloatMax()
-
-#define RI_MAX_IMAGE_WIDTH 16384
-#define RI_MAX_IMAGE_HEIGHT 16384
-#define RI_MAX_IMAGE_PIXELS (RI_MAX_IMAGE_WIDTH*RI_MAX_IMAGE_HEIGHT)
-#define RI_MAX_IMAGE_BYTES (4*RI_MAX_IMAGE_WIDTH*RI_MAX_IMAGE_HEIGHT)
-#define RI_MAX_DASH_COUNT 256
-#define RI_MAX_COLOR_RAMP_STOPS 256
-#define RI_MAX_KERNEL_SIZE 256
-#define RI_MAX_SEPARABLE_KERNEL_SIZE 256
-#define RI_MAX_GAUSSIAN_STD_DEVIATION 16.0f
-#define RI_MAX_SCISSOR_RECTANGLES 256
-#define RI_MAX_EDGES 262144
-#define RI_MAX_SAMPLES 1
-//#define RI_NUM_TESSELLATED_SEGMENTS_QUAD 256
-//#define RI_NUM_TESSELLATED_SEGMENTS_CUBIC 256
-//#define RI_NUM_TESSELLATED_SEGMENTS_ARC 256
-#define RI_NUM_TESSELLATED_SEGMENTS_QUAD 8
-#define RI_NUM_TESSELLATED_SEGMENTS_CUBIC 8
-#define RI_NUM_TESSELLATED_SEGMENTS_ARC 8
-
-#if !defined(_WIN32) && !defined(SF_PROFILE)
-# ifndef NDEBUG
-# define _DEBUG 1
-# endif
-#endif
-
-#if _DEBUG
- #define RI_DEBUG
-#endif
-
-#ifdef RI_DEBUG
-# define RI_ASSERT(X) assert(X)
-#else
-# define RI_ASSERT(X) (void(0))
-#endif
-
-#if defined(RI_DEBUG)
-# define RI_PRINTF(...) printf(__VA_ARGS__)
-#else
-# define RI_PRINTF(...)
-#endif
-
-#if defined(RI_DEBUG)
-# if defined(_WIN32)
-# define RI_TRACE(...) do { \
- char buf[512]; \
- snprintf(buf, sizeof(buf), __VA_ARGS__); \
- OutputDebugString(buf); \
- } while(false)
-# else
-# define RI_TRACE(...) printf(__VA_ARGS__)
-# endif
-#else
-# define RI_TRACE(...)
-#endif
-
-#define RI_UNREF(X) ((void)(X))
-#if defined(_WIN32)
-# define RI_APIENTRY VG_API_ENTRY
-#else
-# define RI_APIENTRY
-#endif
-
-#if defined(_WIN32)
-# define snprintf sprintf_s
-#endif
-
-#define RI_API_CALL VG_API_CALL
-
-#define RI_NEW(TYPE, PARAMS) (new TYPE PARAMS)
-#define RI_NEW_ARRAY(TYPE, ITEMS) (new TYPE[ITEMS])
-#define RI_DELETE(PARAMS) (delete (PARAMS))
-#define RI_DELETE_ARRAY(PARAMS) (delete[] (PARAMS))
-
-bool isValidImageFormat(int format);
-
-// \todo Move these to utility functions, etc.
-RI_INLINE void RI_MEM_ZERO(void *dst, size_t n)
-{
- RI_ASSERT(n > 0);
- RI_ASSERT((n & 0x3) == 0);
-
- RIuint32 *ptr = (RIuint32*)dst;
- for(size_t i = 0; i < (n>>2); i++)
- {
- *ptr++ = 0;
- }
-}
-
-//=======================================================================
-
-} //namespace OpenVGRI
-
-#endif /* __RIDEFS_H */
+#ifndef __RIDEFS_H
+#define __RIDEFS_H
+
+/*------------------------------------------------------------------------
+ *
+ * OpenVG 1.1 Reference Implementation
+ * -----------------------------------
+ *
+ * Copyright (c) 2007 The Khronos Group Inc.
+ * Portions copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and /or associated documentation files
+ * (the "Materials "), to deal in the Materials without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Materials,
+ * and to permit persons to whom the Materials are furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Materials.
+ *
+ * THE MATERIALS ARE 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 MATERIALS OR
+ * THE USE OR OTHER DEALINGS IN THE MATERIALS.
+ *
+ *//**
+ * \file
+ * \brief Platform- and compiler-dependent type and macro definitions.
+ * \note
+ *//*-------------------------------------------------------------------*/
+
+#include <float.h>
+#include <math.h>
+#include <assert.h>
+#include <new> //for bad_alloc
+
+#if defined(_WIN32) && defined(_DEBUG)
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+
+//make for-clause scope c++ standard compliant on msvc
+#if defined (_MSC_VER)
+# if !defined (for)
+ __forceinline bool getFalse (void) { return false; }
+# define for if(getFalse()); else for
+# endif // for
+
+#pragma warning(disable:4710) //disable function not inlined warning
+#pragma warning(disable:4714) //disable function not __forceinlined warning
+#endif // _MSC_VER
+
+namespace OpenVGRI
+{
+
+//=======================================================================
+
+typedef long long RIint64;
+typedef unsigned long long RIuint64;
+typedef int RIint32;
+typedef unsigned int RIuint32;
+typedef short RIint16;
+typedef unsigned short RIuint16;
+typedef signed char RIint8;
+typedef unsigned char RIuint8;
+typedef float RIfloat32;
+//TODO add compile-time assertions to guarantee the sizes
+
+#if defined (_MSC_VER) // MSVC WIN32
+# define RI_INLINE __forceinline
+#elif defined __APPLE__ || defined (__GNUC__) || defined (__GCC32__)
+# define RI_INLINE inline
+#endif
+
+/*!< Unsigned int that can hold a pointer to any type */
+/*!< Signed int that can hold a pointer to any type */
+#if defined (_MSC_VER) && (_MSC_VER >= 1300)
+typedef uintptr_t RIuintptr;
+typedef intptr_t RIintptr;
+#else
+typedef unsigned long RIuintptr;
+typedef signed long RIintptr;
+#endif
+
+#define RI_UINT32_MAX (0xffffffffu)
+#define RI_INT32_MAX (0x7fffffff)
+#define RI_INT32_MIN (-0x7fffffff-1)
+
+/* maximum mantissa is 23 */
+#define RI_MANTISSA_BITS 23
+
+/* maximum exponent is 8 */
+#define RI_EXPONENT_BITS 8
+
+typedef union
+{
+ RIfloat32 f;
+ RIuint32 i;
+} RIfloatInt;
+
+RI_INLINE float getFloatMax()
+{
+ RIfloatInt v;
+ v.i = (((1<<(RI_EXPONENT_BITS-1))-1+127) << 23) | (((1<<RI_MANTISSA_BITS)-1) << (23-RI_MANTISSA_BITS));
+ return v.f;
+}
+#define RI_FLOAT_MAX getFloatMax()
+
+#define RI_MAX_IMAGE_WIDTH 16384
+#define RI_MAX_IMAGE_HEIGHT 16384
+#define RI_MAX_IMAGE_PIXELS (RI_MAX_IMAGE_WIDTH*RI_MAX_IMAGE_HEIGHT)
+#define RI_MAX_IMAGE_BYTES (4*RI_MAX_IMAGE_WIDTH*RI_MAX_IMAGE_HEIGHT)
+#define RI_MAX_DASH_COUNT 256
+#define RI_MAX_COLOR_RAMP_STOPS 256
+#define RI_MAX_KERNEL_SIZE 256
+#define RI_MAX_SEPARABLE_KERNEL_SIZE 256
+#define RI_MAX_GAUSSIAN_STD_DEVIATION 16.0f
+#define RI_MAX_SCISSOR_RECTANGLES 256
+#define RI_MAX_EDGES 262144
+#define RI_MAX_SAMPLES 1
+//#define RI_NUM_TESSELLATED_SEGMENTS_QUAD 256
+//#define RI_NUM_TESSELLATED_SEGMENTS_CUBIC 256
+//#define RI_NUM_TESSELLATED_SEGMENTS_ARC 256
+#define RI_NUM_TESSELLATED_SEGMENTS_QUAD 8
+#define RI_NUM_TESSELLATED_SEGMENTS_CUBIC 8
+#define RI_NUM_TESSELLATED_SEGMENTS_ARC 8
+
+#if !defined(_WIN32) && !defined(SF_PROFILE)
+# ifndef NDEBUG
+# define _DEBUG 1
+# endif
+#endif
+
+#if _DEBUG
+ #define RI_DEBUG
+#endif
+
+#ifdef RI_DEBUG
+# define RI_ASSERT(X) assert(X)
+#else
+# define RI_ASSERT(X) (void(0))
+#endif
+
+#if defined(RI_DEBUG)
+# define RI_PRINTF(...) printf(__VA_ARGS__)
+#else
+# define RI_PRINTF(...)
+#endif
+
+#if defined(RI_DEBUG)
+# if defined(_WIN32)
+# define RI_TRACE(...) do { \
+ char buf[512]; \
+ snprintf(buf, sizeof(buf), __VA_ARGS__); \
+ OutputDebugString(buf); \
+ } while(false)
+# else
+# define RI_TRACE(...) printf(__VA_ARGS__)
+# endif
+#else
+# define RI_TRACE(...)
+#endif
+
+#define RI_UNREF(X) ((void)(X))
+#if defined(_WIN32)
+# define RI_APIENTRY VG_API_ENTRY
+#else
+# define RI_APIENTRY
+#endif
+
+#if defined(_WIN32)
+# define snprintf sprintf_s
+#endif
+
+#define RI_API_CALL VG_API_CALL
+
+#define RI_NEW(TYPE, PARAMS) (new TYPE PARAMS)
+#define RI_NEW_ARRAY(TYPE, ITEMS) (new TYPE[ITEMS])
+#define RI_DELETE(PARAMS) (delete (PARAMS))
+#define RI_DELETE_ARRAY(PARAMS) (delete[] (PARAMS))
+
+bool isValidImageFormat(int format);
+
+// \todo Move these to utility functions, etc.
+RI_INLINE void RI_MEM_ZERO(void *dst, size_t n)
+{
+ RI_ASSERT(n > 0);
+ RI_ASSERT((n & 0x3) == 0);
+
+ RIuint32 *ptr = (RIuint32*)dst;
+ for(size_t i = 0; i < (n>>2); i++)
+ {
+ *ptr++ = 0;
+ }
+}
+
+//=======================================================================
+
+} //namespace OpenVGRI
+
+#endif /* __RIDEFS_H */