epoc32/include/VG/1.0/openvg.h
branchSymbian3
changeset 4 837f303aceeb
parent 3 e1b950c65cb4
     1.1 --- a/epoc32/include/VG/1.0/openvg.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/VG/1.0/openvg.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  /*------------------------------------------------------------------------
     1.5   *
     1.6 - * OpenVG 1.1 Reference Implementation
     1.7 + * OpenVG 1.0.1 Reference Implementation
     1.8   * -------------------------------------
     1.9   *
    1.10 - * Copyright (c) 2008 The Khronos Group Inc.
    1.11 + * Copyright (c) 2007-2009 The Khronos Group Inc.
    1.12   *
    1.13   * Permission is hereby granted, free of charge, to any person obtaining a
    1.14   * copy of this software and /or associated documentation files
    1.15 @@ -26,11 +26,11 @@
    1.16   *
    1.17   *//**
    1.18   * \file
    1.19 - * \brief	OpenVG 1.1 API.
    1.20 + * \brief	OpenVG 1.0.1 API.
    1.21   *//*-------------------------------------------------------------------*/
    1.22  
    1.23 -#ifndef __VG_1_1_OPENVG_H
    1.24 -#define __VG_1_1_OPENVG_H
    1.25 +#ifndef __VG_1_0_OPENVG_H
    1.26 +#define __VG_1_0_OPENVG_H
    1.27  
    1.28  #ifndef __VG_OPENVG_H_
    1.29  #error Do not include this file directly. Use <VG/openvg.h>.
    1.30 @@ -43,7 +43,7 @@
    1.31  	#define VG_API_CALL extern 
    1.32  	to 
    1.33  	#define VG_API_CALL IMPORT_C
    1.34 -- the addition of __SOFTFP to all function prototypes
    1.35 +- the addition of __SOFTFP in some of the function prototypes
    1.36  - the addition of VG_PATH_DATATYPE_INVALID in VGPathDatatype
    1.37  - the addition of VG_IMAGE_FORMAT_INVALID in VGImageFormat
    1.38  - the addition of VGeglImageKHR typedef for the VG_KHR_EGL_image extension
    1.39 @@ -58,12 +58,12 @@
    1.40  extern "C" {
    1.41  #endif
    1.42  
    1.43 +#define OPENVG_VERSION_1_0		1
    1.44 +#define OPENVG_VERSION_1_0_1	1
    1.45 +
    1.46  #include <khronos_types.h>
    1.47  
    1.48 -#define OPENVG_VERSION_1_0 1
    1.49 -#define OPENVG_VERSION_1_1 2
    1.50 -
    1.51 -typedef khronos_float_t  VGfloat;
    1.52 +typedef khronos_float    VGfloat;
    1.53  typedef khronos_int8_t   VGbyte;
    1.54  typedef khronos_uint8_t  VGubyte;
    1.55  typedef khronos_int16_t  VGshort;
    1.56 @@ -107,10 +107,6 @@
    1.57    /* Scissoring rectangles */
    1.58    VG_SCISSOR_RECTS                            = 0x1106,
    1.59  
    1.60 -  /* Color Transformation */
    1.61 -  VG_COLOR_TRANSFORM                          = 0x1170,
    1.62 -  VG_COLOR_TRANSFORM_VALUES                   = 0x1171,
    1.63 -
    1.64    /* Stroke parameters */
    1.65    VG_STROKE_LINE_WIDTH                        = 0x1110,
    1.66    VG_STROKE_CAP_STYLE                         = 0x1111,
    1.67 @@ -126,9 +122,6 @@
    1.68    /* Color for vgClear */
    1.69    VG_CLEAR_COLOR                              = 0x1121,
    1.70  
    1.71 -  /* Glyph origin */
    1.72 -  VG_GLYPH_ORIGIN                             = 0x1122,
    1.73 -
    1.74    /* Enable/disable alpha masking and scissoring */
    1.75    VG_MASKING                                  = 0x1130,
    1.76    VG_SCISSORING                               = 0x1131,
    1.77 @@ -176,8 +169,7 @@
    1.78    VG_MATRIX_PATH_USER_TO_SURFACE              = 0x1400,
    1.79    VG_MATRIX_IMAGE_USER_TO_SURFACE             = 0x1401,
    1.80    VG_MATRIX_FILL_PAINT_TO_USER                = 0x1402,
    1.81 -  VG_MATRIX_STROKE_PAINT_TO_USER              = 0x1403,
    1.82 -  VG_MATRIX_GLYPH_USER_TO_SURFACE             = 0x1404
    1.83 +  VG_MATRIX_STROKE_PAINT_TO_USER              = 0x1403
    1.84  } VGMatrixMode;
    1.85  
    1.86  typedef enum {
    1.87 @@ -352,8 +344,6 @@
    1.88    VG_lL_8                                     = 10,
    1.89    VG_A_8                                      = 11,
    1.90    VG_BW_1                                     = 12,
    1.91 -  VG_A_1                                      = 13,
    1.92 -  VG_A_4                                      = 14,
    1.93  
    1.94    /* {A,X}RGB channel ordering */
    1.95    VG_sXRGB_8888                               =  0 | (1 << 6),
    1.96 @@ -445,371 +435,212 @@
    1.97    VG_EXTENSIONS                               = 0x2303
    1.98  } VGStringID;
    1.99  
   1.100 -typedef enum {
   1.101 -  VG_FONT_NUM_GLYPHS                          = 0x2F00
   1.102 -} VGFontParamType;
   1.103 -
   1.104 -
   1.105  /* Function Prototypes */
   1.106  
   1.107  #ifndef VG_API_CALL
   1.108 -#define VG_API_CALL IMPORT_C
   1.109 -#endif
   1.110 -#ifndef VG_APIENTRY
   1.111 -#define VG_APIENTRY /* nothing */
   1.112 -#endif
   1.113 -#ifndef VG_APIEXIT
   1.114 -#define VG_APIEXIT __SOFTFP
   1.115 +#   if defined(SYMBIAN_VG_DLL_EXPORTS) 
   1.116 +#       define VG_API_CALL EXPORT_C
   1.117 +#   else
   1.118 +#       define VG_API_CALL IMPORT_C
   1.119 +#   endif //defined(SYMBIAN_VG_DLL_EXPORTS)
   1.120  #endif
   1.121  
   1.122 -VG_API_CALL VGErrorCode VG_APIENTRY
   1.123 -    vgGetError(void) VG_APIEXIT;
   1.124 +VG_API_CALL VGErrorCode vgGetError(void);
   1.125  
   1.126 -VG_API_CALL void VG_APIENTRY
   1.127 -    vgFlush(void) VG_APIEXIT;
   1.128 -VG_API_CALL void VG_APIENTRY
   1.129 -    vgFinish(void) VG_APIEXIT;
   1.130 +VG_API_CALL void vgFlush(void);
   1.131 +VG_API_CALL void vgFinish(void);
   1.132  
   1.133  /* Getters and Setters */
   1.134 -VG_API_CALL void VG_APIENTRY
   1.135 -   vgSetf (VGParamType type, VGfloat value) VG_APIEXIT;
   1.136 -VG_API_CALL void VG_APIENTRY
   1.137 -    vgSeti (VGParamType type, VGint value) VG_APIEXIT;
   1.138 -VG_API_CALL void VG_APIENTRY
   1.139 -    vgSetfv(VGParamType type, VGint count,
   1.140 -        const VGfloat * values) VG_APIEXIT;
   1.141 -VG_API_CALL void VG_APIENTRY
   1.142 -    vgSetiv(VGParamType type, VGint count,
   1.143 -        const VGint * values) VG_APIEXIT;
   1.144 -VG_API_CALL VGfloat VG_APIENTRY
   1.145 -    vgGetf(VGParamType type) VG_APIEXIT;
   1.146 -VG_API_CALL VGint   VG_APIENTRY
   1.147 -    vgGeti(VGParamType type) VG_APIEXIT;
   1.148 -VG_API_CALL VGint   VG_APIENTRY
   1.149 -    vgGetVectorSize(VGParamType type) VG_APIEXIT;
   1.150 -VG_API_CALL void    VG_APIENTRY
   1.151 -    vgGetfv(VGParamType type, VGint count,
   1.152 -        VGfloat * values) VG_APIEXIT;
   1.153 -VG_API_CALL void    VG_APIENTRY
   1.154 -    vgGetiv(VGParamType type, VGint count,
   1.155 -        VGint * values) VG_APIEXIT;
   1.156 -VG_API_CALL void VG_APIENTRY
   1.157 -    vgSetParameterf(VGHandle object,
   1.158 -        VGint paramType,
   1.159 -        VGfloat value) VG_APIEXIT;
   1.160 -VG_API_CALL void VG_APIENTRY
   1.161 -    vgSetParameteri(VGHandle object,
   1.162 -        VGint paramType,
   1.163 -        VGint value) VG_APIEXIT;
   1.164 -VG_API_CALL void VG_APIENTRY
   1.165 -    vgSetParameterfv(VGHandle object,
   1.166 -        VGint paramType,
   1.167 -        VGint count,
   1.168 -        const VGfloat * values) VG_APIEXIT;
   1.169 -VG_API_CALL void VG_APIENTRY
   1.170 -    vgSetParameteriv(VGHandle object,
   1.171 -        VGint paramType,
   1.172 -        VGint count,
   1.173 -        const VGint * values) VG_APIEXIT;
   1.174 +VG_API_CALL void vgSetf (VGParamType type, VGfloat value) __SOFTFP;
   1.175 +VG_API_CALL void vgSeti (VGParamType type, VGint value);
   1.176 +VG_API_CALL void vgSetfv(VGParamType type, VGint count,
   1.177 +                         const VGfloat * values);
   1.178 +VG_API_CALL void vgSetiv(VGParamType type, VGint count,
   1.179 +                         const VGint * values);
   1.180  
   1.181 -VG_API_CALL VGfloat VG_APIENTRY
   1.182 -    vgGetParameterf(VGHandle object,
   1.183 -        VGint paramType) VG_APIEXIT;
   1.184 -VG_API_CALL VGint VG_APIENTRY
   1.185 -    vgGetParameteri(VGHandle object,
   1.186 -        VGint paramType) VG_APIEXIT;
   1.187 -VG_API_CALL VGint VG_APIENTRY
   1.188 -    vgGetParameterVectorSize(VGHandle object,
   1.189 -        VGint paramType) VG_APIEXIT;
   1.190 -VG_API_CALL void VG_APIENTRY
   1.191 -    vgGetParameterfv(VGHandle object,
   1.192 -        VGint paramType,
   1.193 -        VGint count,
   1.194 -        VGfloat * values) VG_APIEXIT;
   1.195 -VG_API_CALL void VG_APIENTRY
   1.196 -    vgGetParameteriv(VGHandle object,
   1.197 -        VGint paramType,
   1.198 -        VGint count,
   1.199 -        VGint * values) VG_APIEXIT;
   1.200 +VG_API_CALL VGfloat vgGetf(VGParamType type) __SOFTFP;
   1.201 +VG_API_CALL VGint   vgGeti(VGParamType type);
   1.202 +VG_API_CALL VGint   vgGetVectorSize(VGParamType type);
   1.203 +VG_API_CALL void    vgGetfv(VGParamType type, VGint count, VGfloat * values);
   1.204 +VG_API_CALL void    vgGetiv(VGParamType type, VGint count, VGint * values);
   1.205 +
   1.206 +VG_API_CALL void vgSetParameterf(VGHandle object,
   1.207 +                                 VGint paramType,
   1.208 +                                 VGfloat value) __SOFTFP;
   1.209 +VG_API_CALL void vgSetParameteri(VGHandle object,
   1.210 +                                 VGint paramType,
   1.211 +                                 VGint value);
   1.212 +VG_API_CALL void vgSetParameterfv(VGHandle object,
   1.213 +                                  VGint paramType,
   1.214 +                                  VGint count, const VGfloat * values);
   1.215 +VG_API_CALL void vgSetParameteriv(VGHandle object,
   1.216 +                                  VGint paramType,
   1.217 +                                  VGint count, const VGint * values);
   1.218 +
   1.219 +VG_API_CALL VGfloat vgGetParameterf(VGHandle object,
   1.220 +                                    VGint paramType) __SOFTFP;
   1.221 +VG_API_CALL VGint vgGetParameteri(VGHandle object,
   1.222 +                                  VGint paramType);
   1.223 +VG_API_CALL VGint vgGetParameterVectorSize(VGHandle object,
   1.224 +                                           VGint paramType);
   1.225 +VG_API_CALL void vgGetParameterfv(VGHandle object,
   1.226 +                                  VGint paramType,
   1.227 +                                  VGint count, VGfloat * values);
   1.228 +VG_API_CALL void vgGetParameteriv(VGHandle object,
   1.229 +                                  VGint paramType,
   1.230 +                                  VGint count, VGint * values);
   1.231  
   1.232  /* Matrix Manipulation */
   1.233 -VG_API_CALL void VG_APIENTRY
   1.234 -    vgLoadIdentity(void) VG_APIEXIT;
   1.235 -VG_API_CALL void VG_APIENTRY
   1.236 -    vgLoadMatrix(const VGfloat * m) VG_APIEXIT;
   1.237 -VG_API_CALL void VG_APIENTRY
   1.238 -    vgGetMatrix(VGfloat * m) VG_APIEXIT;
   1.239 -VG_API_CALL void VG_APIENTRY
   1.240 -    vgMultMatrix(const VGfloat * m) VG_APIEXIT;
   1.241 -VG_API_CALL void VG_APIENTRY
   1.242 -    vgTranslate(VGfloat tx, VGfloat ty) VG_APIEXIT;
   1.243 -VG_API_CALL void VG_APIENTRY
   1.244 -    vgScale(VGfloat sx, VGfloat sy) VG_APIEXIT;
   1.245 -VG_API_CALL void VG_APIENTRY
   1.246 -    vgShear(VGfloat shx, VGfloat shy) VG_APIEXIT;
   1.247 -VG_API_CALL void VG_APIENTRY
   1.248 -    vgRotate(VGfloat angle) VG_APIEXIT;
   1.249 +VG_API_CALL void vgLoadIdentity(void);
   1.250 +VG_API_CALL void vgLoadMatrix(const VGfloat * m);
   1.251 +VG_API_CALL void vgGetMatrix(VGfloat * m);
   1.252 +VG_API_CALL void vgMultMatrix(const VGfloat * m);
   1.253 +VG_API_CALL void vgTranslate(VGfloat tx, VGfloat ty) __SOFTFP;
   1.254 +VG_API_CALL void vgScale(VGfloat sx, VGfloat sy) __SOFTFP;
   1.255 +VG_API_CALL void vgShear(VGfloat shx, VGfloat shy) __SOFTFP;
   1.256 +VG_API_CALL void vgRotate(VGfloat angle) __SOFTFP;
   1.257  
   1.258  /* Masking and Clearing */
   1.259 -typedef VGHandle VGMaskLayer;
   1.260 -
   1.261 -VG_API_CALL void VG_APIENTRY
   1.262 -    vgMask(VGHandle mask, VGMaskOperation operation,
   1.263 -        VGint x, VGint y,
   1.264 -        VGint width, VGint height) VG_APIEXIT;
   1.265 -VG_API_CALL void VG_APIENTRY
   1.266 -    vgRenderToMask(VGPath path,
   1.267 -        VGbitfield paintModes,
   1.268 -        VGMaskOperation operation) VG_APIEXIT;
   1.269 -VG_API_CALL VGMaskLayer VG_APIENTRY
   1.270 -    vgCreateMaskLayer(VGint width, VGint height) VG_APIEXIT;
   1.271 -VG_API_CALL void VG_APIENTRY
   1.272 -    vgDestroyMaskLayer(VGMaskLayer maskLayer) VG_APIEXIT;
   1.273 -VG_API_CALL void VG_APIENTRY
   1.274 -    vgFillMaskLayer(VGMaskLayer maskLayer,
   1.275 -        VGint x, VGint y,
   1.276 -        VGint width, VGint height,
   1.277 -        VGfloat value) VG_APIEXIT;
   1.278 -VG_API_CALL void VG_APIENTRY
   1.279 -    vgCopyMask(VGMaskLayer maskLayer,
   1.280 -        VGint sx, VGint sy,
   1.281 -        VGint dx, VGint dy,
   1.282 -        VGint width, VGint height) VG_APIEXIT;
   1.283 -VG_API_CALL void VG_APIENTRY
   1.284 -    vgClear(VGint x, VGint y,
   1.285 -        VGint width, VGint height) VG_APIEXIT;
   1.286 +VG_API_CALL void vgMask(VGImage mask, VGMaskOperation operation,
   1.287 +                        VGint x, VGint y, VGint width, VGint height);
   1.288 +VG_API_CALL void vgClear(VGint x, VGint y, VGint width, VGint height);
   1.289  
   1.290  /* Paths */
   1.291 -VG_API_CALL VGPath VG_APIENTRY
   1.292 -    vgCreatePath(VGint pathFormat,
   1.293 -        VGPathDatatype datatype,
   1.294 -        VGfloat scale, VGfloat bias,
   1.295 -        VGint segmentCapacityHint,
   1.296 -        VGint coordCapacityHint,
   1.297 -        VGbitfield capabilities) VG_APIEXIT;
   1.298 -VG_API_CALL void VG_APIENTRY
   1.299 -    vgClearPath(VGPath path, VGbitfield capabilities) VG_APIEXIT;
   1.300 -VG_API_CALL void VG_APIENTRY
   1.301 -    vgDestroyPath(VGPath path) VG_APIEXIT;
   1.302 -VG_API_CALL void VG_APIENTRY
   1.303 -    vgRemovePathCapabilities(VGPath path,
   1.304 -        VGbitfield capabilities) VG_APIEXIT;
   1.305 -VG_API_CALL VGbitfield VG_APIENTRY
   1.306 -    vgGetPathCapabilities(VGPath path) VG_APIEXIT;
   1.307 -VG_API_CALL void VG_APIENTRY
   1.308 -    vgAppendPath(VGPath dstPath, VGPath srcPath) VG_APIEXIT;
   1.309 -VG_API_CALL void VG_APIENTRY
   1.310 -    vgAppendPathData(VGPath dstPath,
   1.311 -        VGint numSegments,
   1.312 -        const VGubyte * pathSegments,
   1.313 -        const void * pathData) VG_APIEXIT;
   1.314 -VG_API_CALL void VG_APIENTRY
   1.315 -    vgModifyPathCoords(VGPath dstPath,
   1.316 -        VGint startIndex,
   1.317 -        VGint numSegments,
   1.318 -        const void * pathData) VG_APIEXIT;
   1.319 -VG_API_CALL void VG_APIENTRY
   1.320 -    vgTransformPath(VGPath dstPath, VGPath srcPath) VG_APIEXIT;
   1.321 -VG_API_CALL VGboolean VG_APIENTRY
   1.322 -    vgInterpolatePath(VGPath dstPath,
   1.323 -        VGPath startPath,
   1.324 -        VGPath endPath,
   1.325 -        VGfloat amount) VG_APIEXIT;
   1.326 -VG_API_CALL VGfloat VG_APIENTRY
   1.327 -    vgPathLength(VGPath path,
   1.328 -        VGint startSegment,
   1.329 -        VGint numSegments) VG_APIEXIT;
   1.330 -VG_API_CALL void VG_APIENTRY
   1.331 -    vgPointAlongPath(VGPath path,
   1.332 -        VGint startSegment,
   1.333 -        VGint numSegments,
   1.334 -        VGfloat distance,
   1.335 -        VGfloat * x, VGfloat * y,
   1.336 -        VGfloat * tangentX,
   1.337 -        VGfloat * tangentY) VG_APIEXIT;
   1.338 -VG_API_CALL void VG_APIENTRY
   1.339 -    vgPathBounds(VGPath path,
   1.340 -        VGfloat * minX,
   1.341 -        VGfloat * minY,
   1.342 -        VGfloat * width,
   1.343 -        VGfloat * height) VG_APIEXIT;
   1.344 -VG_API_CALL void VG_APIENTRY
   1.345 -    vgPathTransformedBounds(VGPath path,
   1.346 -        VGfloat * minX,
   1.347 -        VGfloat * minY,
   1.348 -        VGfloat * width,
   1.349 -        VGfloat * height) VG_APIEXIT;
   1.350 -VG_API_CALL void VG_APIENTRY
   1.351 -    vgDrawPath(VGPath path, VGbitfield paintModes) VG_APIEXIT;
   1.352 +VG_API_CALL VGPath vgCreatePath(VGint pathFormat,
   1.353 +                                VGPathDatatype datatype,
   1.354 +                                VGfloat scale, VGfloat bias,
   1.355 +                                VGint segmentCapacityHint,
   1.356 +                                VGint coordCapacityHint,
   1.357 +                                VGbitfield capabilities) __SOFTFP;
   1.358 +VG_API_CALL void vgClearPath(VGPath path, VGbitfield capabilities);
   1.359 +VG_API_CALL void vgDestroyPath(VGPath path);
   1.360 +VG_API_CALL void vgRemovePathCapabilities(VGPath path,
   1.361 +                                          VGbitfield capabilities);
   1.362 +VG_API_CALL VGbitfield vgGetPathCapabilities(VGPath path);
   1.363 +VG_API_CALL void vgAppendPath(VGPath dstPath, VGPath srcPath);
   1.364 +VG_API_CALL void vgAppendPathData(VGPath dstPath,
   1.365 +                                  VGint numSegments,
   1.366 +                                  const VGubyte * pathSegments,
   1.367 +                                  const void * pathData);
   1.368 +VG_API_CALL void vgModifyPathCoords(VGPath dstPath, VGint startIndex,
   1.369 +                                    VGint numSegments,
   1.370 +                                    const void * pathData);
   1.371 +VG_API_CALL void vgTransformPath(VGPath dstPath, VGPath srcPath);
   1.372 +VG_API_CALL VGboolean vgInterpolatePath(VGPath dstPath,
   1.373 +                                        VGPath startPath,
   1.374 +                                        VGPath endPath,
   1.375 +                                        VGfloat amount) __SOFTFP;
   1.376 +VG_API_CALL VGfloat vgPathLength(VGPath path,
   1.377 +                                 VGint startSegment, VGint numSegments) __SOFTFP;
   1.378 +VG_API_CALL void vgPointAlongPath(VGPath path,
   1.379 +                                  VGint startSegment, VGint numSegments,
   1.380 +                                  VGfloat distance,
   1.381 +                                  VGfloat * x, VGfloat * y,
   1.382 +                                  VGfloat * tangentX, VGfloat * tangentY) __SOFTFP;
   1.383 +VG_API_CALL void vgPathBounds(VGPath path,
   1.384 +                              VGfloat * minX, VGfloat * minY,
   1.385 +                              VGfloat * width, VGfloat * height);
   1.386 +VG_API_CALL void vgPathTransformedBounds(VGPath path,
   1.387 +                                         VGfloat * minX, VGfloat * minY,
   1.388 +                                         VGfloat * width, VGfloat * height);
   1.389 +VG_API_CALL void vgDrawPath(VGPath path, VGbitfield paintModes);
   1.390  
   1.391  /* Paint */
   1.392 -VG_API_CALL VGPaint VG_APIENTRY
   1.393 -    vgCreatePaint(void) VG_APIEXIT;
   1.394 -VG_API_CALL void VG_APIENTRY
   1.395 -    vgDestroyPaint(VGPaint paint) VG_APIEXIT;
   1.396 -VG_API_CALL void VG_APIENTRY
   1.397 -    vgSetPaint(VGPaint paint, VGbitfield paintModes) VG_APIEXIT;
   1.398 -VG_API_CALL VGPaint VG_APIENTRY
   1.399 -    vgGetPaint(VGPaintMode paintMode) VG_APIEXIT;
   1.400 -VG_API_CALL void VG_APIENTRY
   1.401 -    vgSetColor(VGPaint paint, VGuint rgba) VG_APIEXIT;
   1.402 -VG_API_CALL VGuint VG_APIENTRY
   1.403 -    vgGetColor(VGPaint paint) VG_APIEXIT;
   1.404 -VG_API_CALL void VG_APIENTRY
   1.405 -    vgPaintPattern(VGPaint paint, VGImage pattern) VG_APIEXIT;
   1.406 +VG_API_CALL VGPaint vgCreatePaint(void);
   1.407 +VG_API_CALL void vgDestroyPaint(VGPaint paint);
   1.408 +VG_API_CALL void vgSetPaint(VGPaint paint, VGbitfield paintModes);
   1.409 +VG_API_CALL VGPaint vgGetPaint(VGPaintMode paintMode);
   1.410 +VG_API_CALL void vgSetColor(VGPaint paint, VGuint rgba);
   1.411 +VG_API_CALL VGuint vgGetColor(VGPaint paint);
   1.412 +VG_API_CALL void vgPaintPattern(VGPaint paint, VGImage pattern);
   1.413  
   1.414  /* Images */
   1.415 -VG_API_CALL VGImage VG_APIENTRY
   1.416 -    vgCreateImage(VGImageFormat format,
   1.417 -        VGint width, VGint height,
   1.418 -        VGbitfield allowedQuality) VG_APIEXIT;
   1.419 -VG_API_CALL void VG_APIENTRY
   1.420 -    vgDestroyImage(VGImage image) VG_APIEXIT;
   1.421 -VG_API_CALL void VG_APIENTRY
   1.422 -    vgClearImage(VGImage image,
   1.423 -        VGint x, VGint y,
   1.424 -        VGint width, VGint height) VG_APIEXIT;
   1.425 -VG_API_CALL void VG_APIENTRY
   1.426 -    vgImageSubData(VGImage image,
   1.427 -        const void * data,
   1.428 -        VGint dataStride,
   1.429 -        VGImageFormat dataFormat,
   1.430 -        VGint x, VGint y,
   1.431 -        VGint width, VGint height) VG_APIEXIT;
   1.432 -VG_API_CALL void VG_APIENTRY
   1.433 -    vgGetImageSubData(VGImage image,
   1.434 -        void * data,
   1.435 -        VGint dataStride,
   1.436 -        VGImageFormat dataFormat,
   1.437 -        VGint x, VGint y,
   1.438 -        VGint width, VGint height) VG_APIEXIT;
   1.439 -VG_API_CALL VGImage VG_APIENTRY
   1.440 -    vgChildImage(VGImage parent,
   1.441 -        VGint x, VGint y,
   1.442 -        VGint width, VGint height) VG_APIEXIT;
   1.443 -VG_API_CALL VGImage VG_APIENTRY
   1.444 -    vgGetParent(VGImage image) VG_APIEXIT;
   1.445 -VG_API_CALL void VG_APIENTRY
   1.446 -    vgCopyImage(VGImage dst, VGint dx, VGint dy,
   1.447 -        VGImage src, VGint sx, VGint sy,
   1.448 -        VGint width, VGint height,
   1.449 -        VGboolean dither) VG_APIEXIT;
   1.450 -VG_API_CALL void VG_APIENTRY
   1.451 -    vgDrawImage(VGImage image) VG_APIEXIT;
   1.452 -VG_API_CALL void VG_APIENTRY
   1.453 -    vgSetPixels(VGint dx, VGint dy,
   1.454 -        VGImage src, VGint sx, VGint sy,
   1.455 -        VGint width, VGint height) VG_APIEXIT;
   1.456 -VG_API_CALL void VG_APIENTRY
   1.457 -    vgWritePixels(const void * data, VGint dataStride,
   1.458 -        VGImageFormat dataFormat,
   1.459 -        VGint dx, VGint dy,
   1.460 -        VGint width, VGint height) VG_APIEXIT;
   1.461 -VG_API_CALL void VG_APIENTRY
   1.462 -    vgGetPixels(VGImage dst, VGint dx, VGint dy,
   1.463 -        VGint sx, VGint sy,
   1.464 -        VGint width, VGint height) VG_APIEXIT;
   1.465 -VG_API_CALL void VG_APIENTRY
   1.466 -    vgReadPixels(void * data, VGint dataStride,
   1.467 -        VGImageFormat dataFormat,
   1.468 -        VGint sx, VGint sy,
   1.469 -        VGint width, VGint height) VG_APIEXIT;
   1.470 -VG_API_CALL void VG_APIENTRY
   1.471 -    vgCopyPixels(VGint dx, VGint dy,
   1.472 -        VGint sx, VGint sy,
   1.473 -        VGint width, VGint height) VG_APIEXIT;
   1.474 -
   1.475 -/* Text */
   1.476 -typedef VGHandle VGFont;
   1.477 -
   1.478 -VG_API_CALL VGFont VG_APIENTRY
   1.479 -    vgCreateFont(VGint glyphCapacityHint) VG_APIEXIT;
   1.480 -VG_API_CALL void VG_APIENTRY
   1.481 -    vgDestroyFont(VGFont font) VG_APIEXIT;
   1.482 -VG_API_CALL void VG_APIENTRY
   1.483 -    vgSetGlyphToPath(VGFont font,
   1.484 -        VGuint glyphIndex,
   1.485 -        VGPath path,
   1.486 -        VGboolean isHinted,
   1.487 -        const VGfloat glyphOrigin [2],
   1.488 -        const VGfloat escapement[2]) VG_APIEXIT;
   1.489 -VG_API_CALL void VG_APIENTRY
   1.490 -    vgSetGlyphToImage(VGFont font,
   1.491 -        VGuint glyphIndex,
   1.492 -        VGImage image,
   1.493 -        const VGfloat glyphOrigin [2],
   1.494 -        const VGfloat escapement[2]) VG_APIEXIT;
   1.495 -VG_API_CALL void VG_APIENTRY
   1.496 -    vgClearGlyph(VGFont font,
   1.497 -        VGuint glyphIndex) VG_APIEXIT;
   1.498 -VG_API_CALL void VG_APIENTRY
   1.499 -    vgDrawGlyph(VGFont font,
   1.500 -        VGuint glyphIndex,
   1.501 -        VGbitfield paintModes,
   1.502 -        VGboolean allowAutoHinting) VG_APIEXIT;
   1.503 -VG_API_CALL void VG_APIENTRY
   1.504 -    vgDrawGlyphs(VGFont font,
   1.505 -        VGint glyphCount,
   1.506 -        const VGuint * glyphIndices,
   1.507 -        const VGfloat * adjustments_x,
   1.508 -        const VGfloat * adjustments_y,
   1.509 -        VGbitfield paintModes,
   1.510 -        VGboolean allowAutoHinting) VG_APIEXIT;
   1.511 +VG_API_CALL VGImage vgCreateImage(VGImageFormat format,
   1.512 +                                  VGint width, VGint height,
   1.513 +                                  VGbitfield allowedQuality);
   1.514 +VG_API_CALL void vgDestroyImage(VGImage image);
   1.515 +VG_API_CALL void vgClearImage(VGImage image,
   1.516 +                              VGint x, VGint y, VGint width, VGint height);
   1.517 +VG_API_CALL void vgImageSubData(VGImage image,
   1.518 +                                const void * data, VGint dataStride,
   1.519 +                                VGImageFormat dataFormat,
   1.520 +                                VGint x, VGint y, VGint width, VGint height);
   1.521 +VG_API_CALL void vgGetImageSubData(VGImage image,
   1.522 +                                   void * data, VGint dataStride,
   1.523 +                                   VGImageFormat dataFormat,
   1.524 +                                   VGint x, VGint y,
   1.525 +                                   VGint width, VGint height);
   1.526 +VG_API_CALL VGImage vgChildImage(VGImage parent,
   1.527 +                                 VGint x, VGint y, VGint width, VGint height);
   1.528 +VG_API_CALL VGImage vgGetParent(VGImage image); 
   1.529 +VG_API_CALL void vgCopyImage(VGImage dst, VGint dx, VGint dy,
   1.530 +                             VGImage src, VGint sx, VGint sy,
   1.531 +                             VGint width, VGint height,
   1.532 +                             VGboolean dither);
   1.533 +VG_API_CALL void vgDrawImage(VGImage image);
   1.534 +VG_API_CALL void vgSetPixels(VGint dx, VGint dy,
   1.535 +                             VGImage src, VGint sx, VGint sy,
   1.536 +                             VGint width, VGint height);
   1.537 +VG_API_CALL void vgWritePixels(const void * data, VGint dataStride,
   1.538 +                               VGImageFormat dataFormat,
   1.539 +                               VGint dx, VGint dy,
   1.540 +                               VGint width, VGint height);
   1.541 +VG_API_CALL void vgGetPixels(VGImage dst, VGint dx, VGint dy,
   1.542 +                             VGint sx, VGint sy,
   1.543 +                             VGint width, VGint height);
   1.544 +VG_API_CALL void vgReadPixels(void * data, VGint dataStride,
   1.545 +                              VGImageFormat dataFormat,
   1.546 +                              VGint sx, VGint sy,
   1.547 +                              VGint width, VGint height);
   1.548 +VG_API_CALL void vgCopyPixels(VGint dx, VGint dy,
   1.549 +                              VGint sx, VGint sy,
   1.550 +                              VGint width, VGint height);
   1.551  
   1.552  /* Image Filters */
   1.553 -VG_API_CALL void VG_APIENTRY
   1.554 -    vgColorMatrix(VGImage dst, VGImage src,
   1.555 -        const VGfloat * matrix) VG_APIEXIT;
   1.556 -VG_API_CALL void VG_APIENTRY
   1.557 -    vgConvolve(VGImage dst, VGImage src,
   1.558 -        VGint kernelWidth, VGint kernelHeight,
   1.559 -        VGint shiftX, VGint shiftY,
   1.560 -        const VGshort * kernel,
   1.561 -        VGfloat scale,
   1.562 -        VGfloat bias,
   1.563 -        VGTilingMode tilingMode) VG_APIEXIT;
   1.564 -VG_API_CALL void VG_APIENTRY
   1.565 -    vgSeparableConvolve(VGImage dst, VGImage src,
   1.566 -        VGint kernelWidth,
   1.567 -        VGint kernelHeight,
   1.568 -        VGint shiftX, VGint shiftY,
   1.569 -        const VGshort * kernelX,
   1.570 -        const VGshort * kernelY,
   1.571 -        VGfloat scale,
   1.572 -        VGfloat bias,
   1.573 -        VGTilingMode tilingMode) VG_APIEXIT;
   1.574 -VG_API_CALL void VG_APIENTRY
   1.575 -    vgGaussianBlur(VGImage dst, VGImage src,
   1.576 -        VGfloat stdDeviationX,
   1.577 -        VGfloat stdDeviationY,
   1.578 -        VGTilingMode tilingMode) VG_APIEXIT;
   1.579 -VG_API_CALL void VG_APIENTRY
   1.580 -    vgLookup(VGImage dst, VGImage src,
   1.581 -        const VGubyte * redLUT,
   1.582 -        const VGubyte * greenLUT,
   1.583 -        const VGubyte * blueLUT,
   1.584 -        const VGubyte * alphaLUT,
   1.585 -        VGboolean outputLinear,
   1.586 -        VGboolean outputPremultiplied) VG_APIEXIT;
   1.587 -VG_API_CALL void VG_APIENTRY
   1.588 -    vgLookupSingle(VGImage dst, VGImage src,
   1.589 -        const VGuint * lookupTable,
   1.590 -        VGImageChannel sourceChannel,
   1.591 -        VGboolean outputLinear,
   1.592 -        VGboolean outputPremultiplied) VG_APIEXIT;
   1.593 +VG_API_CALL void vgColorMatrix(VGImage dst, VGImage src,
   1.594 +                               const VGfloat * matrix);
   1.595 +VG_API_CALL void vgConvolve(VGImage dst, VGImage src,
   1.596 +                            VGint kernelWidth, VGint kernelHeight,
   1.597 +                            VGint shiftX, VGint shiftY,
   1.598 +                            const VGshort * kernel,
   1.599 +                            VGfloat scale,
   1.600 +                            VGfloat bias,
   1.601 +                            VGTilingMode tilingMode) __SOFTFP;
   1.602 +VG_API_CALL void vgSeparableConvolve(VGImage dst, VGImage src,
   1.603 +                                     VGint kernelWidth,
   1.604 +                                     VGint kernelHeight,
   1.605 +                                     VGint shiftX, VGint shiftY,
   1.606 +                                     const VGshort * kernelX,
   1.607 +                                     const VGshort * kernelY,
   1.608 +                                     VGfloat scale,
   1.609 +                                     VGfloat bias,
   1.610 +                                     VGTilingMode tilingMode) __SOFTFP;
   1.611 +VG_API_CALL void vgGaussianBlur(VGImage dst, VGImage src,
   1.612 +                                VGfloat stdDeviationX,
   1.613 +                                VGfloat stdDeviationY,
   1.614 +                                VGTilingMode tilingMode) __SOFTFP;
   1.615 +VG_API_CALL void vgLookup(VGImage dst, VGImage src,
   1.616 +                          const VGubyte * redLUT,
   1.617 +                          const VGubyte * greenLUT,
   1.618 +                          const VGubyte * blueLUT,
   1.619 +                          const VGubyte * alphaLUT,
   1.620 +                          VGboolean outputLinear,
   1.621 +                          VGboolean outputPremultiplied);
   1.622 +VG_API_CALL void vgLookupSingle(VGImage dst, VGImage src,
   1.623 +                                const VGuint * lookupTable,
   1.624 +                                VGImageChannel sourceChannel,
   1.625 +                                VGboolean outputLinear,
   1.626 +                                VGboolean outputPremultiplied);
   1.627  
   1.628  /* Hardware Queries */
   1.629 -VG_API_CALL VGHardwareQueryResult VG_APIENTRY
   1.630 -    vgHardwareQuery
   1.631 -        (VGHardwareQueryType key,
   1.632 -        VGint setting) VG_APIEXIT;
   1.633 +VG_API_CALL VGHardwareQueryResult vgHardwareQuery(VGHardwareQueryType key,
   1.634 +                                                  VGint setting);
   1.635  
   1.636  /* Renderer and Extension Information */
   1.637 -VG_API_CALL const VGubyte * VG_APIENTRY
   1.638 -    vgGetString(VGStringID name) VG_APIEXIT;
   1.639 +VG_API_CALL const VGubyte * vgGetString(VGStringID name);
   1.640  
   1.641 -#ifdef __cplusplus
   1.642 +#ifdef __cplusplus 
   1.643  } /* extern "C" */
   1.644  #endif
   1.645  
   1.646 -#endif /* __VG_1_1_OPENVG_H */
   1.647 +#endif /*__VG_1_0_OPENVG_H */