start im_zone()

libvips/create/Makefile.am

@@ -4,6 +4,7 @@ libcreate_la_SOURCES = \
 	create.c \
 	eye.c \
 	grey.c \
+	zone.c \
 	xyz.c \
 	black.c \
 	text.c \

libvips/create/create.c

@@ -106,6 +106,7 @@ vips_create_operation_init( void )
 	extern GType vips_xyz_get_type( void ); 
 	extern GType vips_eye_get_type( void ); 
 	extern GType vips_grey_get_type( void ); 
+	extern GType vips_zone_get_type( void ); 
 
 	vips_black_get_type();
 	vips_gaussnoise_get_type(); 
@@ -115,5 +116,6 @@ vips_create_operation_init( void )
 	vips_xyz_get_type(); 
 	vips_eye_get_type(); 
 	vips_grey_get_type(); 
+	vips_zone_get_type(); 
 }
 

libvips/create/zone.c

@@ -0,0 +1,213 @@
+/* square zone plate of size
+ *
+ * N. Dessipris 01/02/1991
+ *
+ * 22/7/93 JC
+ *	- externs removed
+ *	- im_outcheck() added
+ * 30/8/95 JC
+ *	- modernized
+ *	- memory leaks fixed
+ *	- split into im_zone() and im_fzone()
+ * 1/2/11
+ * 	- gtk-doc
+ * 13/6/13
+ * 	- redo as a class
+ */
+
+/*
+
+    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
+
+ */
+
+/*
+#define VIPS_DEBUG
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /*HAVE_CONFIG_H*/
+#include <vips/intl.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include <vips/vips.h>
+
+#include "create.h"
+
+typedef struct _VipsZone {
+	VipsCreate parent_instance;
+
+	int width;
+	int height;
+
+	gboolean uchar;
+
+} VipsZone;
+
+typedef VipsCreateClass VipsZoneClass;
+
+G_DEFINE_TYPE( VipsZone, vips_zone, VIPS_TYPE_CREATE );
+
+static int
+vips_zone_gen( VipsRegion *or, void *seq, void *a, void *b,
+	gboolean *stop )
+{
+	VipsZone *zone = (VipsZone *) a;
+	VipsRect *r = &or->valid;
+	int le = r->left;
+	int to = r->top;
+	int ri = VIPS_RECT_RIGHT( r );
+	int bo = VIPS_RECT_BOTTOM( r );
+
+	int hsize = zone->width / 2;
+	double c = VIPS_PI / zone->width;
+	int vsize = zone->height / 2;
+
+	int x, y;
+
+	for( y = to; y < bo; y++ ) {
+		float *q = (float *) VIPS_REGION_ADDR( or, le, y );
+		int vp = (y - vsize) * (y - vsize);
+
+		for( x = le; x < ri; x++ ) 
+			q[x] = cos( c * (vp + ((x - hsize) * (x - hsize))) );
+	}
+
+	return( 0 );
+}
+
+static int
+vips_zone_build( VipsObject *object )
+{
+	VipsCreate *create = VIPS_CREATE( object );
+	VipsZone *zone = (VipsZone *) object;
+	VipsImage **t = (VipsImage **) vips_object_local_array( object, 7 );
+	VipsImage *in;
+
+	if( VIPS_OBJECT_CLASS( vips_zone_parent_class )->build( object ) )
+		return( -1 );
+
+	t[0] = vips_image_new();
+	vips_image_init_fields( t[0],
+		zone->width, zone->height, 1,
+		VIPS_FORMAT_FLOAT, VIPS_CODING_NONE, VIPS_INTERPRETATION_B_W,
+		1.0, 1.0 );
+	vips_demand_hint( t[0], 
+		VIPS_DEMAND_STYLE_ANY, NULL );
+	if( vips_image_generate( t[0], 
+		NULL, vips_zone_gen, NULL, zone, NULL ) )
+		return( -1 );
+
+	in = t[0];
+	if( zone->uchar ) {
+		if( vips_linear1( in, &t[1], 127.5, 127.5, NULL ) ||
+			vips_cast( t[1], &t[2], VIPS_FORMAT_UCHAR, NULL ) )
+			return( -1 );
+		in = t[2];
+	}
+
+	if( vips_image_write( in, create->out ) )
+		return( -1 );
+
+	return( 0 );
+}
+
+static void
+vips_zone_class_init( VipsZoneClass *class )
+{
+	GObjectClass *gobject_class = G_OBJECT_CLASS( class );
+	VipsObjectClass *vobject_class = VIPS_OBJECT_CLASS( class );
+
+	gobject_class->set_property = vips_object_set_property;
+	gobject_class->get_property = vips_object_get_property;
+
+	vobject_class->nickname = "zone";
+	vobject_class->description = _( "make a zone plate" );
+	vobject_class->build = vips_zone_build;
+
+	VIPS_ARG_INT( class, "width", 4, 
+		_( "Width" ), 
+		_( "Image width in pixels" ),
+		VIPS_ARGUMENT_REQUIRED_INPUT,
+		G_STRUCT_OFFSET( VipsZone, width ),
+		1, 1000000, 1 );
+
+	VIPS_ARG_INT( class, "height", 5, 
+		_( "Height" ), 
+		_( "Image height in pixels" ),
+		VIPS_ARGUMENT_REQUIRED_INPUT,
+		G_STRUCT_OFFSET( VipsZone, height ),
+		1, 1000000, 1 );
+
+	VIPS_ARG_BOOL( class, "uchar", 7, 
+		_( "Uchar" ), 
+		_( "Output an unsigned char image" ),
+		VIPS_ARGUMENT_OPTIONAL_INPUT,
+		G_STRUCT_OFFSET( VipsZone, uchar ),
+		FALSE );
+
+}
+
+static void
+vips_zone_init( VipsZone *zone )
+{
+}
+
+
+/**
+ * vips_zone:
+ * @out: output image
+ * @xsize: image size
+ * @ysize: image size
+ * @...: %NULL-terminated list of optional named arguments
+ *
+ * Optional arguments:
+ *
+ * @uchar: output a uchar image
+ *
+ * Create a one-band image of a zone plate. 
+ *
+ * Pixels are normally in [-1, +1], set @uchar to output [0, 255]. 
+ *
+ * See also: vips_eye(), vips_xyz().
+ *
+ * Returns: 0 on success, -1 on error
+ */
+int
+vips_zone( VipsImage **out, int width, int height, ... )
+{
+	va_list ap;
+	int result;
+
+	va_start( ap, height );
+	result = vips_call_split( "zone", ap, out, width, height );
+	va_end( ap );
+
+	return( result );
+}

libvips/include/vips/create.h

@@ -55,6 +55,8 @@ int vips_gaussnoise( VipsImage **out, int width, int height, ... )
 	__attribute__((sentinel));
 int vips_eye( VipsImage **out, int width, int height, ... )
 	__attribute__((sentinel));
+int vips_zone( VipsImage **out, int width, int height, ... )
+	__attribute__((sentinel));