@img/sharp-libvips-dev 0.0.1 → 0.0.2

package/include/vips/region.h

@@ -8,28 +8,28 @@
 
 /*
 
-    This file is part of VIPS.
+	This file is part of VIPS.
 
-    VIPS is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+	VIPS is free software; you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+	02110-1301  USA
 
  */
 
 /*
 
-    These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
+	These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
 
  */
 
@@ -48,19 +48,19 @@ extern "C" {
 #endif /*__cplusplus*/
 
 #define VIPS_TYPE_REGION (vips_region_get_type())
-#define VIPS_REGION( obj ) \
-	(G_TYPE_CHECK_INSTANCE_CAST( (obj), \
-	VIPS_TYPE_REGION, VipsRegion ))
-#define VIPS_REGION_CLASS( klass ) \
-	(G_TYPE_CHECK_CLASS_CAST( (klass), \
-	VIPS_TYPE_REGION, VipsRegionClass))
-#define VIPS_IS_REGION( obj ) \
-	(G_TYPE_CHECK_INSTANCE_TYPE( (obj), VIPS_TYPE_REGION ))
-#define VIPS_IS_REGION_CLASS( klass ) \
-	(G_TYPE_CHECK_CLASS_TYPE( (klass), VIPS_TYPE_REGION ))
-#define VIPS_REGION_GET_CLASS( obj ) \
-	(G_TYPE_INSTANCE_GET_CLASS( (obj), \
-	VIPS_TYPE_REGION, VipsRegionClass ))
+#define VIPS_REGION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		VIPS_TYPE_REGION, VipsRegion))
+#define VIPS_REGION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		VIPS_TYPE_REGION, VipsRegionClass))
+#define VIPS_IS_REGION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), VIPS_TYPE_REGION))
+#define VIPS_IS_REGION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE((klass), VIPS_TYPE_REGION))
+#define VIPS_REGION_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS((obj), \
+		VIPS_TYPE_REGION, VipsRegionClass))
 
 /**
  * VipsRegionShrink:
@@ -93,16 +93,16 @@ struct _VipsRegion {
 	/*< public >*/
 	/* Users may read these two fields.
 	 */
-	VipsImage *im;		/* Link back to parent image */
-	VipsRect valid;		/* Area of parent we can see */
+	VipsImage *im;	/* Link back to parent image */
+	VipsRect valid; /* Area of parent we can see */
 
 	/* The rest of VipsRegion is private.
 	 */
 	/*< private >*/
-	RegionType type;	/* What kind of attachment */
-	VipsPel *data;		/* Off here to get data */
-	int bpl;		/* Bytes-per-line for data */
-	void *seq;		/* Sequence we are using to fill region */
+	RegionType type; /* What kind of attachment */
+	VipsPel *data;	 /* Off here to get data */
+	int bpl;		 /* Bytes-per-line for data */
+	void *seq;		 /* Sequence we are using to fill region */
 
 	/* The thread that made this region. Used to assert() test that
 	 * regions are not being shared between threads.
@@ -120,7 +120,7 @@ struct _VipsRegion {
 	/* The image this region is on has changed and caches need to be
 	 * dropped.
 	 */
-	gboolean invalid;	
+	gboolean invalid;
 };
 
 typedef struct _VipsRegionClass {
@@ -134,102 +134,102 @@ VIPS_API
 GType vips_region_get_type(void);
 
 VIPS_API
-VipsRegion *vips_region_new( VipsImage *image );
+VipsRegion *vips_region_new(VipsImage *image);
 
 VIPS_API
-int vips_region_buffer( VipsRegion *reg, const VipsRect *r );
+int vips_region_buffer(VipsRegion *reg, const VipsRect *r);
 VIPS_API
-int vips_region_image( VipsRegion *reg, const VipsRect *r );
+int vips_region_image(VipsRegion *reg, const VipsRect *r);
 VIPS_API
-int vips_region_region( VipsRegion *reg, VipsRegion *dest, 
-	const VipsRect *r, int x, int y );
+int vips_region_region(VipsRegion *reg, VipsRegion *dest,
+	const VipsRect *r, int x, int y);
 VIPS_API
-int vips_region_equalsregion( VipsRegion *reg1, VipsRegion *reg2 );
+int vips_region_equalsregion(VipsRegion *reg1, VipsRegion *reg2);
 VIPS_API
-int vips_region_position( VipsRegion *reg, int x, int y );
+int vips_region_position(VipsRegion *reg, int x, int y);
 
 VIPS_API
-void vips_region_paint( VipsRegion *reg, const VipsRect *r, int value );
+void vips_region_paint(VipsRegion *reg, const VipsRect *r, int value);
 VIPS_API
-void vips_region_paint_pel( VipsRegion *reg, 
-	const VipsRect *r, const VipsPel *ink );
+void vips_region_paint_pel(VipsRegion *reg,
+	const VipsRect *r, const VipsPel *ink);
 VIPS_API
-void vips_region_black( VipsRegion *reg );
+void vips_region_black(VipsRegion *reg);
 VIPS_API
-void vips_region_copy( VipsRegion *reg, VipsRegion *dest,
-	const VipsRect *r, int x, int y );
+void vips_region_copy(VipsRegion *reg, VipsRegion *dest,
+	const VipsRect *r, int x, int y);
 VIPS_API
-int vips_region_shrink_method( VipsRegion *from, VipsRegion *to, 
-	const VipsRect *target, VipsRegionShrink method );
+int vips_region_shrink_method(VipsRegion *from, VipsRegion *to,
+	const VipsRect *target, VipsRegionShrink method);
 VIPS_API
-int vips_region_shrink( VipsRegion *from, VipsRegion *to, 
-	const VipsRect *target );
+int vips_region_shrink(VipsRegion *from, VipsRegion *to,
+	const VipsRect *target);
 
 VIPS_API
-int vips_region_prepare( VipsRegion *reg, const VipsRect *r );
+int vips_region_prepare(VipsRegion *reg, const VipsRect *r);
 VIPS_API
-int vips_region_prepare_to( VipsRegion *reg,
-	VipsRegion *dest, const VipsRect *r, int x, int y );
+int vips_region_prepare_to(VipsRegion *reg,
+	VipsRegion *dest, const VipsRect *r, int x, int y);
 
 VIPS_API
-VipsPel *vips_region_fetch( VipsRegion *region, 
-	int left, int top, int width, int height, size_t *len );
+VipsPel *vips_region_fetch(VipsRegion *region,
+	int left, int top, int width, int height, size_t *len);
 VIPS_API
-int vips_region_width( VipsRegion *region );
+int vips_region_width(VipsRegion *region);
 VIPS_API
-int vips_region_height( VipsRegion *region );
+int vips_region_height(VipsRegion *region);
 
 VIPS_API
-void vips_region_invalidate( VipsRegion *reg );
+void vips_region_invalidate(VipsRegion *reg);
 
 /* Use this to count pixels passing through key points. Handy for spotting bad
  * overcomputation.
  */
 #ifdef DEBUG_LEAK
-#define VIPS_COUNT_PIXELS( R, N ) vips__region_count_pixels( R, N )
+#define VIPS_COUNT_PIXELS(R, N) vips__region_count_pixels(R, N)
 #else /*!DEBUG_LEAK*/
-#define VIPS_COUNT_PIXELS( R, N ) 
+#define VIPS_COUNT_PIXELS(R, N)
 #endif /*DEBUG_LEAK*/
 
-#define VIPS_REGION_LSKIP( R ) \
-	((size_t)((R)->bpl))
-#define VIPS_REGION_N_ELEMENTS( R ) \
-	((size_t)((R)->valid.width * (R)->im->Bands))
-#define VIPS_REGION_SIZEOF_ELEMENT( R ) \
-	(VIPS_IMAGE_SIZEOF_ELEMENT( (R)->im ))
-#define VIPS_REGION_SIZEOF_PEL( R ) \
-	(VIPS_IMAGE_SIZEOF_PEL( (R)->im ))
-#define VIPS_REGION_SIZEOF_LINE( R ) \
-	((size_t)((R)->valid.width * VIPS_REGION_SIZEOF_PEL( R )))
+#define VIPS_REGION_LSKIP(R) \
+	((size_t) ((R)->bpl))
+#define VIPS_REGION_N_ELEMENTS(R) \
+	((size_t) ((R)->valid.width * (R)->im->Bands))
+#define VIPS_REGION_SIZEOF_ELEMENT(R) \
+	(VIPS_IMAGE_SIZEOF_ELEMENT((R)->im))
+#define VIPS_REGION_SIZEOF_PEL(R) \
+	(VIPS_IMAGE_SIZEOF_PEL((R)->im))
+#define VIPS_REGION_SIZEOF_LINE(R) \
+	((size_t) ((R)->valid.width * VIPS_REGION_SIZEOF_PEL(R)))
 
 /* If DEBUG is defined, add bounds checking.
  */
 #ifdef DEBUG
-#define VIPS_REGION_ADDR( R, X, Y ) \
-	( (vips_rect_includespoint( &(R)->valid, (X), (Y) ))? \
-	  ((R)->data + ((Y) - (R)->valid.top) * VIPS_REGION_LSKIP(R) + \
-	  ((X) - (R)->valid.left) * VIPS_REGION_SIZEOF_PEL( R )): \
-	  (fprintf( stderr, \
-		"VIPS_REGION_ADDR: point out of bounds, " \
-		"file \"%s\", line %d\n" \
-		"(point x=%d, y=%d\n" \
-		" should have been within VipsRect left=%d, top=%d, " \
-		"width=%d, height=%d)\n", \
-		__FILE__, __LINE__, \
-		(X), (Y), \
-		(R)->valid.left, \
-		(R)->valid.top, \
-		(R)->valid.width, \
-		(R)->valid.height ), abort(), (VipsPel *) NULL) \
-	)
+#define VIPS_REGION_ADDR(R, X, Y) \
+	((vips_rect_includespoint(&(R)->valid, (X), (Y))) \
+			? ((R)->data + ((Y) - (R)->valid.top) * VIPS_REGION_LSKIP(R) + \
+				  ((X) - (R)->valid.left) * VIPS_REGION_SIZEOF_PEL(R)) \
+			: (fprintf(stderr, \
+				   "VIPS_REGION_ADDR: point out of bounds, " \
+				   "file \"%s\", line %d\n" \
+				   "(point x=%d, y=%d\n" \
+				   " should have been within VipsRect left=%d, top=%d, " \
+				   "width=%d, height=%d)\n", \
+				   __FILE__, __LINE__, \
+				   (X), (Y), \
+				   (R)->valid.left, \
+				   (R)->valid.top, \
+				   (R)->valid.width, \
+				   (R)->valid.height), \
+				  abort(), (VipsPel *) NULL))
 #else /*DEBUG*/
-#define VIPS_REGION_ADDR( R, X, Y ) \
+#define VIPS_REGION_ADDR(R, X, Y) \
 	((R)->data + \
-	((Y)-(R)->valid.top) * VIPS_REGION_LSKIP( R ) + \
-	((X)-(R)->valid.left) * VIPS_REGION_SIZEOF_PEL( R ))
+		((Y) - (R)->valid.top) * VIPS_REGION_LSKIP(R) + \
+		((X) - (R)->valid.left) * VIPS_REGION_SIZEOF_PEL(R))
 #endif /*DEBUG*/
 
-#define VIPS_REGION_ADDR_TOPLEFT( R ) ((R)->data)
+#define VIPS_REGION_ADDR_TOPLEFT(R) ((R)->data)
 
 #ifdef __cplusplus
 }

package/include/vips/resample.h

@@ -6,28 +6,28 @@
 
 /*
 
-    This file is part of VIPS.
-    
-    VIPS is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA
+	This file is part of VIPS.
+
+	VIPS is free software; you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+	02110-1301  USA
 
  */
 
 /*
 
-    These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
+	These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
 
  */
 
@@ -57,63 +57,63 @@ typedef enum {
 } VipsSize;
 
 VIPS_API
-int vips_shrink( VipsImage *in, VipsImage **out, 
-	double hshrink, double vshrink, ... )
+int vips_shrink(VipsImage *in, VipsImage **out,
+	double hshrink, double vshrink, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
-int vips_shrinkh( VipsImage *in, VipsImage **out, int hshrink, ... )
+int vips_shrinkh(VipsImage *in, VipsImage **out, int hshrink, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
-int vips_shrinkv( VipsImage *in, VipsImage **out, int vshrink, ... )
+int vips_shrinkv(VipsImage *in, VipsImage **out, int vshrink, ...)
 	G_GNUC_NULL_TERMINATED;
 
 VIPS_API
-int vips_reduce( VipsImage *in, VipsImage **out, 
-	double hshrink, double vshrink, ... )
+int vips_reduce(VipsImage *in, VipsImage **out,
+	double hshrink, double vshrink, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
-int vips_reduceh( VipsImage *in, VipsImage **out, double hshrink, ... )
+int vips_reduceh(VipsImage *in, VipsImage **out, double hshrink, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
-int vips_reducev( VipsImage *in, VipsImage **out, double vshrink, ... )
+int vips_reducev(VipsImage *in, VipsImage **out, double vshrink, ...)
 	G_GNUC_NULL_TERMINATED;
 
 VIPS_API
-int vips_thumbnail( const char *filename, VipsImage **out, int width, ... )
+int vips_thumbnail(const char *filename, VipsImage **out, int width, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
-int vips_thumbnail_buffer( void *buf, size_t len, VipsImage **out, 
-	int width, ... )
+int vips_thumbnail_buffer(void *buf, size_t len, VipsImage **out,
+	int width, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
-int vips_thumbnail_image( VipsImage *in, VipsImage **out, int width, ... )
+int vips_thumbnail_image(VipsImage *in, VipsImage **out, int width, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
-int vips_thumbnail_source( VipsSource *source, VipsImage **out, 
-	int width, ... )
+int vips_thumbnail_source(VipsSource *source, VipsImage **out,
+	int width, ...)
 	G_GNUC_NULL_TERMINATED;
 
 VIPS_API
-int vips_similarity( VipsImage *in, VipsImage **out, ... )
+int vips_similarity(VipsImage *in, VipsImage **out, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
-int vips_rotate( VipsImage *in, VipsImage **out, double angle, ... )
+int vips_rotate(VipsImage *in, VipsImage **out, double angle, ...)
 	G_GNUC_NULL_TERMINATED;
 VIPS_API
-int vips_affine( VipsImage *in, VipsImage **out, 
-	double a, double b, double c, double d, ... )
+int vips_affine(VipsImage *in, VipsImage **out,
+	double a, double b, double c, double d, ...)
 	G_GNUC_NULL_TERMINATED;
 
 VIPS_API
-int vips_resize( VipsImage *in, VipsImage **out, double scale, ... )
+int vips_resize(VipsImage *in, VipsImage **out, double scale, ...)
 	G_GNUC_NULL_TERMINATED;
 
 VIPS_API
-int vips_mapim( VipsImage *in, VipsImage **out, VipsImage *index, ... ) 
+int vips_mapim(VipsImage *in, VipsImage **out, VipsImage *index, ...)
 	G_GNUC_NULL_TERMINATED;
 
 VIPS_API
-int vips_quadratic( VipsImage *in, VipsImage **out, VipsImage *coeff, ... )
+int vips_quadratic(VipsImage *in, VipsImage **out, VipsImage *coeff, ...)
 	G_GNUC_NULL_TERMINATED;
 
 #ifdef __cplusplus

package/include/vips/sbuf.h

@@ -5,28 +5,28 @@
 
 /*
 
-    This file is part of VIPS.
+	This file is part of VIPS.
 
-    VIPS is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+	VIPS is free software; you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+	02110-1301  USA
 
  */
 
 /*
 
-    These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
+	These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
 
  */
 
@@ -42,24 +42,24 @@ extern "C" {
 #endif /*__cplusplus*/
 
 #define VIPS_TYPE_SBUF (vips_sbuf_get_type())
-#define VIPS_SBUF( obj ) \
-	(G_TYPE_CHECK_INSTANCE_CAST( (obj), \
-	VIPS_TYPE_SBUF, VipsSbuf ))
-#define VIPS_SBUF_CLASS( klass ) \
-	(G_TYPE_CHECK_CLASS_CAST( (klass), \
-	VIPS_TYPE_SBUF, VipsSbufClass))
-#define VIPS_IS_SBUF( obj ) \
-	(G_TYPE_CHECK_INSTANCE_TYPE( (obj), VIPS_TYPE_SBUF ))
-#define VIPS_IS_SBUF_CLASS( klass ) \
-	(G_TYPE_CHECK_CLASS_TYPE( (klass), VIPS_TYPE_SBUF ))
-#define VIPS_SBUF_GET_CLASS( obj ) \
-	(G_TYPE_INSTANCE_GET_CLASS( (obj), \
-	VIPS_TYPE_SBUF, VipsSbufClass ))
+#define VIPS_SBUF(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		VIPS_TYPE_SBUF, VipsSbuf))
+#define VIPS_SBUF_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		VIPS_TYPE_SBUF, VipsSbufClass))
+#define VIPS_IS_SBUF(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), VIPS_TYPE_SBUF))
+#define VIPS_IS_SBUF_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE((klass), VIPS_TYPE_SBUF))
+#define VIPS_SBUF_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS((obj), \
+		VIPS_TYPE_SBUF, VipsSbufClass))
 
 #define VIPS_SBUF_BUFFER_SIZE (4096)
 
 /* Layer over source: read with an input buffer.
- * 
+ *
  * Libraries like libjpeg do their own input buffering and need raw IO, but
  * others, like radiance, need to parse the input into lines. A buffered read
  * class is very convenient.
@@ -96,46 +96,45 @@ typedef struct _VipsSbufClass {
 } VipsSbufClass;
 
 VIPS_API
-GType vips_sbuf_get_type( void );
+GType vips_sbuf_get_type(void);
 
 VIPS_API
-VipsSbuf *vips_sbuf_new_from_source( VipsSource *source );
+VipsSbuf *vips_sbuf_new_from_source(VipsSource *source);
 
 VIPS_API
-void vips_sbuf_unbuffer( VipsSbuf *sbuf );
+void vips_sbuf_unbuffer(VipsSbuf *sbuf);
 
 VIPS_API
-int vips_sbuf_getc( VipsSbuf *sbuf );
-#define VIPS_SBUF_GETC( S ) ( \
-	(S)->read_point < (S)->chars_in_buffer ? \
-		(S)->input_buffer[(S)->read_point++] : \
-		vips_sbuf_getc( S ) \
-)
+int vips_sbuf_getc(VipsSbuf *sbuf);
+#define VIPS_SBUF_GETC(S) ( \
+	(S)->read_point < (S)->chars_in_buffer \
+		? (S)->input_buffer[(S)->read_point++] \
+		: vips_sbuf_getc(S))
 VIPS_API
-void vips_sbuf_ungetc( VipsSbuf *sbuf );
-#define VIPS_SBUF_UNGETC( S ) { \
-	if( (S)->read_point > 0 ) \
-		(S)->read_point -= 1; \
-}
+void vips_sbuf_ungetc(VipsSbuf *sbuf);
+#define VIPS_SBUF_UNGETC(S) \
+	{ \
+		if ((S)->read_point > 0) \
+			(S)->read_point -= 1; \
+	}
 
 VIPS_API
-int vips_sbuf_require( VipsSbuf *sbuf, int require );
-#define VIPS_SBUF_REQUIRE( S, R ) ( \
-	(S)->read_point + (R) <= (S)->chars_in_buffer ? \
-		0 :  \
-		vips_sbuf_require( (S), (R) ) \
-)
-#define VIPS_SBUF_PEEK( S ) ((S)->input_buffer + (S)->read_point)
-#define VIPS_SBUF_FETCH( S ) ((S)->input_buffer[(S)->read_point++])
+int vips_sbuf_require(VipsSbuf *sbuf, int require);
+#define VIPS_SBUF_REQUIRE(S, R) ( \
+	(S)->read_point + (R) <= (S)->chars_in_buffer \
+		? 0 \
+		: vips_sbuf_require((S), (R)))
+#define VIPS_SBUF_PEEK(S) ((S)->input_buffer + (S)->read_point)
+#define VIPS_SBUF_FETCH(S) ((S)->input_buffer[(S)->read_point++])
 
 VIPS_API
-const char *vips_sbuf_get_line( VipsSbuf *sbuf ); 
+const char *vips_sbuf_get_line(VipsSbuf *sbuf);
 VIPS_API
-char *vips_sbuf_get_line_copy( VipsSbuf *sbuf ); 
+char *vips_sbuf_get_line_copy(VipsSbuf *sbuf);
 VIPS_API
-const char *vips_sbuf_get_non_whitespace( VipsSbuf *sbuf );
+const char *vips_sbuf_get_non_whitespace(VipsSbuf *sbuf);
 VIPS_API
-int vips_sbuf_skip_whitespace( VipsSbuf *sbuf );
+int vips_sbuf_skip_whitespace(VipsSbuf *sbuf);
 
 #ifdef __cplusplus
 }

package/include/vips/semaphore.h

@@ -9,28 +9,28 @@
 
 /*
 
-    This file is part of VIPS.
-    
-    VIPS is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA
+	This file is part of VIPS.
+
+	VIPS is free software; you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+	02110-1301  USA
 
  */
 
 /*
 
-    These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
+	These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
 
  */
 
@@ -56,19 +56,19 @@ typedef struct {
 } VipsSemaphore;
 
 VIPS_API
-int vips_semaphore_up( VipsSemaphore *s );
+int vips_semaphore_up(VipsSemaphore *s);
 VIPS_API
-int vips_semaphore_upn( VipsSemaphore *s, int n );
+int vips_semaphore_upn(VipsSemaphore *s, int n);
 VIPS_API
-int vips_semaphore_down( VipsSemaphore *s );
+int vips_semaphore_down(VipsSemaphore *s);
 VIPS_API
-int vips_semaphore_downn( VipsSemaphore *s, int n );
+int vips_semaphore_downn(VipsSemaphore *s, int n);
 VIPS_API
-int vips_semaphore_down_timeout( VipsSemaphore *s, gint64 timeout );
+int vips_semaphore_down_timeout(VipsSemaphore *s, gint64 timeout);
 VIPS_API
-void vips_semaphore_destroy( VipsSemaphore *s );
+void vips_semaphore_destroy(VipsSemaphore *s);
 VIPS_API
-void vips_semaphore_init( VipsSemaphore *s, int v, char *name );
+void vips_semaphore_init(VipsSemaphore *s, int v, char *name);
 
 #ifdef __cplusplus
 }