[cairo-commit] libpixman/src Makefile.am,1.5,1.6 pixman.h,1.11,1.12

Richard Worth commit at pdx.freedesktop.org
Thu Jan 22 21:05:10 PST 2004


Committed by: rworth

Update of /cvs/cairo/libpixman/src
In directory pdx:/tmp/cvs-serv25060/src

Modified Files:
	Makefile.am pixman.h 
Log Message:
        * src/Makefile.am: Add '-no-undefined' to end of
        libpixman_la_LDFLAGS tp enable building shared libary under
        cygwin.
 
        * src/pixman.h: Remove all 'extern ' and ' __external_linkage'
        (macro for __declspec(dllexport) and __declspec(dllimport))
        from function declarations. These are no longer needed for cygwin.



Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/libpixman/src/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am	12 Dec 2003 23:11:23 -0000	1.5
--- Makefile.am	23 Jan 2004 05:05:08 -0000	1.6
***************
*** 25,29 ****
  	slim_internal.h
  
! libpixman_la_LDFLAGS = -version-info @VERSION_INFO@
  
  INCLUDES = -I$(srcdir)
--- 25,29 ----
  	slim_internal.h
  
! libpixman_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
  
  INCLUDES = -I$(srcdir)

Index: pixman.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/pixman.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pixman.h	17 Dec 2003 21:17:13 -0000	1.11
--- pixman.h	23 Jan 2004 05:05:08 -0000	1.12
***************
*** 93,107 ****
  
  
- /* From slim_export.h and slim_import.h */
- #if defined(WIN32) || defined(__CYGWIN__)
- # if defined(_PIXREGIONINT_H_) || defined(_ICINT_H_)
- #  define __external_linkage	__declspec(dllexport)
- # else
- #  define __external_linkage	__declspec(dllimport)
- # endif
- #else
- # define __external_linkage
- #endif
- 
  #if defined(__cplusplus) || defined(c_plusplus)
  extern "C" {
--- 93,96 ----
***************
*** 123,161 ****
  /* creation/destruction */
  
! extern pixman_region16_t * __external_linkage
  pixman_region_create (void);
  
! extern pixman_region16_t * __external_linkage
  pixman_region_create_simple (pixman_box16_t *extents);
  
! extern void __external_linkage
  pixman_region_destroy (pixman_region16_t *region);
  
  /* manipulation */
  
! extern void __external_linkage
  pixman_region_translate (pixman_region16_t *region, int x, int y);
  
! extern pixman_region_status_t __external_linkage
  pixman_region_copy (pixman_region16_t *dest, pixman_region16_t *source);
  
! extern pixman_region_status_t __external_linkage
  pixman_region_intersect (pixman_region16_t *newReg, pixman_region16_t *reg1, pixman_region16_t *reg2);
  
! extern pixman_region_status_t __external_linkage
  pixman_region_union (pixman_region16_t *newReg, pixman_region16_t *reg1, pixman_region16_t *reg2);
  
! extern pixman_region_status_t __external_linkage
  pixman_region_union_rect(pixman_region16_t *dest, pixman_region16_t *source,
  		   int x, int y, unsigned int width, unsigned int height);
  
! extern pixman_region_status_t __external_linkage
  pixman_region_subtract (pixman_region16_t *regD, pixman_region16_t *regM, pixman_region16_t *regS);
  
! extern pixman_region_status_t __external_linkage
  pixman_region_inverse (pixman_region16_t *newReg, pixman_region16_t *reg1, pixman_box16_t *invRect);
  
  /* XXX: Need to fix this so it doesn't depend on an X data structure
! extern pixman_region16_t * __external_linkage
  RectsTopixman_region16_t (int nrects, xRectanglePtr prect, int ctype);
  */
--- 112,150 ----
  /* creation/destruction */
  
! pixman_region16_t *
  pixman_region_create (void);
  
! pixman_region16_t *
  pixman_region_create_simple (pixman_box16_t *extents);
  
! void
  pixman_region_destroy (pixman_region16_t *region);
  
  /* manipulation */
  
! void
  pixman_region_translate (pixman_region16_t *region, int x, int y);
  
! pixman_region_status_t
  pixman_region_copy (pixman_region16_t *dest, pixman_region16_t *source);
  
! pixman_region_status_t
  pixman_region_intersect (pixman_region16_t *newReg, pixman_region16_t *reg1, pixman_region16_t *reg2);
  
! pixman_region_status_t
  pixman_region_union (pixman_region16_t *newReg, pixman_region16_t *reg1, pixman_region16_t *reg2);
  
! pixman_region_status_t
  pixman_region_union_rect(pixman_region16_t *dest, pixman_region16_t *source,
  		   int x, int y, unsigned int width, unsigned int height);
  
! pixman_region_status_t
  pixman_region_subtract (pixman_region16_t *regD, pixman_region16_t *regM, pixman_region16_t *regS);
  
! pixman_region_status_t
  pixman_region_inverse (pixman_region16_t *newReg, pixman_region16_t *reg1, pixman_box16_t *invRect);
  
  /* XXX: Need to fix this so it doesn't depend on an X data structure
! pixman_region16_t *
  RectsTopixman_region16_t (int nrects, xRectanglePtr prect, int ctype);
  */
***************
*** 164,171 ****
  
  /* XXX: These should proably be combined: pixman_region16_tGetRects? */
! extern int __external_linkage
  pixman_region_num_rects (pixman_region16_t *region);
  
! extern pixman_box16_t * __external_linkage
  pixman_region_rects (pixman_region16_t *region);
  
--- 153,160 ----
  
  /* XXX: These should proably be combined: pixman_region16_tGetRects? */
! int
  pixman_region_num_rects (pixman_region16_t *region);
  
! pixman_box16_t *
  pixman_region_rects (pixman_region16_t *region);
  
***************
*** 175,188 ****
  #define rgnPART 2
  
! extern int __external_linkage
  pixman_region_contains_point (pixman_region16_t *region, int x, int y, pixman_box16_t *box);
  
! extern int __external_linkage
  pixman_region_contains_rectangle (pixman_region16_t *pixman_region16_t, pixman_box16_t *prect);
  
! extern int __external_linkage
  pixman_region_not_empty (pixman_region16_t *region);
  
! extern pixman_box16_t * __external_linkage
  pixman_region_extents (pixman_region16_t *region);
  
--- 164,177 ----
  #define rgnPART 2
  
! int
  pixman_region_contains_point (pixman_region16_t *region, int x, int y, pixman_box16_t *box);
  
! int
  pixman_region_contains_rectangle (pixman_region16_t *pixman_region16_t, pixman_box16_t *prect);
  
! int
  pixman_region_not_empty (pixman_region16_t *region);
  
! pixman_box16_t *
  pixman_region_extents (pixman_region16_t *region);
  
***************
*** 191,198 ****
  /* WARNING: calling pixman_region_append may leave dest as an invalid
     region. Follow-up with pixman_region_validate to fix it up. */
! extern pixman_region_status_t __external_linkage
  pixman_region_append (pixman_region16_t *dest, pixman_region16_t *region);
  
! extern pixman_region_status_t __external_linkage
  pixman_region_validate (pixman_region16_t *badreg, int *pOverlap);
  
--- 180,187 ----
  /* WARNING: calling pixman_region_append may leave dest as an invalid
     region. Follow-up with pixman_region_validate to fix it up. */
! pixman_region_status_t
  pixman_region_append (pixman_region16_t *dest, pixman_region16_t *region);
  
! pixman_region_status_t
  pixman_region_validate (pixman_region16_t *badreg, int *pOverlap);
  
***************
*** 201,208 ****
   */
  
! extern void __external_linkage
  pixman_region_reset (pixman_region16_t *region, pixman_box16_t *pBox);
  
! extern void __external_linkage
  pixman_region_empty (pixman_region16_t *region);
  
--- 190,197 ----
   */
  
! void
  pixman_region_reset (pixman_region16_t *region, pixman_box16_t *pBox);
  
! void
  pixman_region_empty (pixman_region16_t *region);
  
***************
*** 239,246 ****
  typedef struct _pixman_format_t pixman_format_t;
  
! extern pixman_format_t * __external_linkage
  pixman_format_create (pixman_format_tName name);
  
! extern pixman_format_t * __external_linkage
  pixman_format_create_masks (int bpp,
  		     int alpha_mask,
--- 228,235 ----
  typedef struct _pixman_format_t pixman_format_t;
  
! pixman_format_t *
  pixman_format_create (pixman_format_tName name);
  
! pixman_format_t *
  pixman_format_create_masks (int bpp,
  		     int alpha_mask,
***************
*** 249,253 ****
  		     int blue_mask);
  
! extern void __external_linkage
  pixman_format_destroy (pixman_format_t *format);
  
--- 238,242 ----
  		     int blue_mask);
  
! void
  pixman_format_destroy (pixman_format_t *format);
  
***************
*** 256,260 ****
  typedef struct _pixman_image_t	pixman_image_t;
  
! extern pixman_image_t * __external_linkage
  pixman_image_create (pixman_format_t	*format,
  	       int	width,
--- 245,249 ----
  typedef struct _pixman_image_t	pixman_image_t;
  
! pixman_image_t *
  pixman_image_create (pixman_format_t	*format,
  	       int	width,
***************
*** 280,290 ****
  #endif
  
! extern pixman_image_t * __external_linkage
  pixman_image_create_for_data (pixman_bits_t *data, pixman_format_t *format, int width, int height, int bpp, int stride);
  
! extern void __external_linkage
  pixman_image_destroy (pixman_image_t *image);
  
! extern int __external_linkage
  pixman_image_set_clip_region (pixman_image_t	*image,
  		      pixman_region16_t	*region);
--- 269,279 ----
  #endif
  
! pixman_image_t *
  pixman_image_create_for_data (pixman_bits_t *data, pixman_format_t *format, int width, int height, int bpp, int stride);
  
! void
  pixman_image_destroy (pixman_image_t *image);
  
! int
  pixman_image_set_clip_region (pixman_image_t	*image,
  		      pixman_region16_t	*region);
***************
*** 333,364 ****
  } pixman_filter_t;
  
! extern int __external_linkage
  pixman_image_set_transform (pixman_image_t		*image,
  		     pixman_transform_t	*transform);
  
! extern void __external_linkage
  pixman_image_set_repeat (pixman_image_t	*image,
  		  int		repeat);
  
! extern void __external_linkage
  pixman_image_set_filter (pixman_image_t	*image,
  		  pixman_filter_t	filter);
  
! extern int __external_linkage
  pixman_image_get_width (pixman_image_t	*image);
  
! extern int __external_linkage
  pixman_image_get_height (pixman_image_t	*image);
  
! extern int __external_linkage
  pixman_image_get_stride (pixman_image_t	*image);
  
! extern int __external_linkage
  pixman_image_get_depth (pixman_image_t	*image);
  
! extern pixman_format_t * __external_linkage
  pixman_image_get_format (pixman_image_t	*image);
  
! extern pixman_bits_t * __external_linkage
  pixman_image_get_data (pixman_image_t	*image);
  
--- 322,353 ----
  } pixman_filter_t;
  
! int
  pixman_image_set_transform (pixman_image_t		*image,
  		     pixman_transform_t	*transform);
  
! void
  pixman_image_set_repeat (pixman_image_t	*image,
  		  int		repeat);
  
! void
  pixman_image_set_filter (pixman_image_t	*image,
  		  pixman_filter_t	filter);
  
! int
  pixman_image_get_width (pixman_image_t	*image);
  
! int
  pixman_image_get_height (pixman_image_t	*image);
  
! int
  pixman_image_get_stride (pixman_image_t	*image);
  
! int
  pixman_image_get_depth (pixman_image_t	*image);
  
! pixman_format_t *
  pixman_image_get_format (pixman_image_t	*image);
  
! pixman_bits_t *
  pixman_image_get_data (pixman_image_t	*image);
  
***************
*** 373,382 ****
  } pixman_color_t;
  
! extern void __external_linkage
  pixman_color_to_pixel (const pixman_format_t	*format,
  		const pixman_color_t	*color,
  		pixman_bits_t		*pixel);
  
! extern void __external_linkage
  pixman_pixel_to_color (const pixman_format_t	*format,
  		pixman_bits_t		pixel,
--- 362,371 ----
  } pixman_color_t;
  
! void
  pixman_color_to_pixel (const pixman_format_t	*format,
  		const pixman_color_t	*color,
  		pixman_bits_t		*pixel);
  
! void
  pixman_pixel_to_color (const pixman_format_t	*format,
  		pixman_bits_t		pixel,
***************
*** 385,389 ****
  /* icrect.c */
  
! extern void __external_linkage
  pixman_fill_rectangle (pixman_operator_t	op,
  		 pixman_image_t	*dst,
--- 374,378 ----
  /* icrect.c */
  
! void
  pixman_fill_rectangle (pixman_operator_t	op,
  		 pixman_image_t	*dst,
***************
*** 394,398 ****
  		 unsigned int	height);
  
! extern void __external_linkage
  pixman_fill_rectangles (pixman_operator_t		op,
  		  pixman_image_t		*dst,
--- 383,387 ----
  		 unsigned int	height);
  
! void
  pixman_fill_rectangles (pixman_operator_t		op,
  		  pixman_image_t		*dst,
***************
*** 404,408 ****
  
  /* XXX: Switch to enum for op */
! extern void __external_linkage
  pixman_composite_trapezoids (pixman_operator_t	op,
  		       pixman_image_t		*src,
--- 393,397 ----
  
  /* XXX: Switch to enum for op */
! void
  pixman_composite_trapezoids (pixman_operator_t	op,
  		       pixman_image_t		*src,
***************
*** 415,419 ****
  /* ictri.c */
  
! extern void __external_linkage
  pixman_composite_triangles (pixman_operator_t	op,
  		      pixman_image_t		*src,
--- 404,408 ----
  /* ictri.c */
  
! void
  pixman_composite_triangles (pixman_operator_t	op,
  		      pixman_image_t		*src,
***************
*** 424,428 ****
  		      int		ntris);
  
! extern void __external_linkage
  pixman_composite_tri_strip (pixman_operator_t		op,
  		     pixman_image_t		*src,
--- 413,417 ----
  		      int		ntris);
  
! void
  pixman_composite_tri_strip (pixman_operator_t		op,
  		     pixman_image_t		*src,
***************
*** 434,438 ****
  
  
! extern void __external_linkage
  pixman_composite_tri_fan (pixman_operator_t		op,
  		   pixman_image_t		*src,
--- 423,427 ----
  
  
! void
  pixman_composite_tri_fan (pixman_operator_t		op,
  		   pixman_image_t		*src,
***************
*** 445,449 ****
  /* ic.c */
  
! extern void __external_linkage
  pixman_composite (pixman_operator_t	op,
  	     pixman_image_t	*iSrc,
--- 434,438 ----
  /* ic.c */
  
! void
  pixman_composite (pixman_operator_t	op,
  	     pixman_image_t	*iSrc,
***************
*** 465,469 ****
  #endif
  
- #undef __external_linkage
- 
  #endif /* _PIXMAN_H_ */
--- 454,456 ----





More information about the cairo-commit mailing list