Merge pull request #307 from Jondeen/add-hsv

Add hsv

TODO

@@ -1,3 +1,5 @@
+- vips_sink_screen() should create its output images
+
 
 - how about something like vips_grid() which turns a tall thin one-band 
   image into a much smaller many-band image?

libvips/colour/HSV2sRGB.c

@@ -38,26 +38,58 @@
 
 #include <stdio.h>
 
+#include <math.h>
+
 #include <vips/vips.h>
 
 #include "pcolour.h"
 
+#define SIXTH_OF_CHAR 42.5
+
+
 typedef VipsColourCode VipsHSV2sRGB;
 typedef VipsColourCodeClass VipsHSV2sRGBClass;
 
 G_DEFINE_TYPE( VipsHSV2sRGB, vips_HSV2sRGB, VIPS_TYPE_COLOUR_CODE );
 
-static void
-vips_HSV2sRGB_line( VipsColour *colour, VipsPel *out, VipsPel **in, int width )
-{
+static void vips_HSV2sRGB_line(VipsColour *colour, VipsPel *out, VipsPel **in,
+		int width) {
 	unsigned char *p = (unsigned char *) in[0];
 	unsigned char *q = (unsigned char *) out;
 	int i;
 
-	for( i = 0; i < width; i++ ) {
-		q[0] = p[0];
-		q[1] = p[1];
-		q[2] = p[2];
+	float c, x, m;
+	for (i = 0; i < width; i++) {
+
+		c = p[2] * p[1] / 255.0f;
+		x = c * (1 - fabs(fmod(p[0] / SIXTH_OF_CHAR, 2) - 1));
+		m = p[2] - c;
+
+		if (p[0] < SIXTH_OF_CHAR) {
+			q[0]= (c+m);
+			q[1]= (x+m);
+			q[2]= (0+m);
+		} else if (p[0] < 2*SIXTH_OF_CHAR) {
+			q[0]= (x+m);
+			q[1]= (c+m);
+			q[2]= (0+m);
+		} else if (p[0] < 3*SIXTH_OF_CHAR) {
+			q[0]= (0+m);
+			q[1]= (c+m);
+			q[2]= (x+m);
+		} else if (p[0] < 4*SIXTH_OF_CHAR) {
+			q[0]= (0+m);
+			q[1]= (x+m);
+			q[2]= (c+m);
+		} else if (p[0] < 5*SIXTH_OF_CHAR) {
+			q[0]= (x+m);
+			q[1]= (0+m);
+			q[2]= (c+m);
+		} else {
+			q[0]= (c+m);
+			q[1]= (0+m);
+			q[2]= (x+m);
+		}
 
 		p += 3;
 		q += 3;

libvips/colour/sRGB2HSV.c

@@ -54,63 +54,59 @@ vips_sRGB2HSV_line( VipsColour *colour, VipsPel *out, VipsPel **in, int width )
 	unsigned char *q = (unsigned char *) out;
 	int i;
 
+	unsigned char c_max,c_min,delta;
+
+	float wrap_around_hue, secondary_diff;
+
+
 	for( i = 0; i < width; i++ ) {
-		unsigned char c_max;
-		unsigned char c_min;
-		unsigned char delta;
-		float wrap_around_hue;
-		float secondary_diff;
 
-		wrap_around_hue = 0;
-	       	secondary_diff = 0;
-
-		if( p[1] < p[2] ) {
-			if( p[2] < p[0] ) {
+		if (p[1] < p[2]) {
+			if (p[2] < p[0]) {
+				// Center red (at top)
 				c_max = p[0];
 				c_min = p[1];
 				secondary_diff = p[1] - p[2];
 				wrap_around_hue = 255.0f;
-			} 
-			else {
+			} else {
+				// Center blue
 				c_max = p[2];
-				c_min = VIPS_MIN( p[1], p[0] );
+				c_min = VIPS_MIN(p[1], p[0]);
 				secondary_diff = p[0] - p[1];
 				wrap_around_hue = 170.0f;
 			}
-		} 
-		else {
-			if( p[1] < p[0] ) {
+		} else {
+			if (p[1] < p[0]) {
+				// Center red (at bottom)
 				c_max = p[0];
 				c_min = p[2];
 				secondary_diff = p[1] - p[2];
 				wrap_around_hue = 0.0f;
-			} 
-			else {
+			} else {
+				// Center green
 				c_max = p[1];
-				c_min = VIPS_MIN( p[2], p[0] );
+				c_min = VIPS_MIN(p[2], p[0]);
 				secondary_diff = p[2] - p[0];
 				wrap_around_hue = 85.0f;
 			}
 		}
 
-		if( c_max == 0 ) {
+
+		if (c_max == 0) {
 			q[0] = 0;
 			q[1] = 0;
 			q[2] = 0;
-		} 
-		else {
+		} else {
 			q[2] = c_max;
 			delta = c_max - c_min;
 
-			if( delta == 0 ) 
+			if (delta == 0) {
 				q[0] = 0;
-			else {
-				q[0] = (unsigned char) 
-					(42.5f * (secondary_diff / delta) + 
-					 wrap_around_hue);
+			} else {
+				q[0] = (42.5f*(secondary_diff / (float) delta) + wrap_around_hue);
 			}
 
-			q[1] = delta * 255.0f / c_max;
+			q[1] = (( delta*255.0f / (float) c_max));
 		}
 
 		p += 3;

libvips/conversion/bandfold.c

@@ -2,6 +2,8 @@
  *
  * 5/6/15
  * 	- from copy.c
+ * 10/6/15
+ * 	- add @factor option
  */
 
 /*
@@ -58,6 +60,8 @@ typedef struct _VipsBandfold {
 	 */
 	VipsImage *in;
 
+	int factor;
+
 } VipsBandfold;
 
 typedef VipsConversionClass VipsBandfoldClass;
@@ -68,8 +72,8 @@ static int
 vips_bandfold_gen( VipsRegion *or, 
 	void *seq, void *a, void *b, gboolean *stop )
 {
+	VipsBandfold *bandfold = (VipsBandfold *) b;
 	VipsRegion *ir = (VipsRegion *) seq;
-	VipsImage *in = ir->im;
 	VipsImage *out = or->im;
 	VipsRect *r = &or->valid;
 	int psize = VIPS_IMAGE_SIZEOF_PEL( out );
@@ -77,21 +81,22 @@ vips_bandfold_gen( VipsRegion *or,
 	VipsRect need;
 	int y;
 
-	need.left = 0;
+	need.left = r->left * bandfold->factor;
 	need.top = r->top;
-	need.width = in->Xsize;
+	need.width = r->width * bandfold->factor;
 	need.height = r->height;
 	if( vips_region_prepare( ir, &need ) )
 		return( -1 );
 
 	for( y = 0; y < r->height; y++ ) {
-		VipsPel *p = VIPS_REGION_ADDR( ir, 0, r->top + y );
-		VipsPel *q = VIPS_REGION_ADDR( or, 0, r->top + y );
+		VipsPel *p = VIPS_REGION_ADDR( ir, 
+			r->left * bandfold->factor, r->top + y );
+		VipsPel *q = VIPS_REGION_ADDR( or, r->left, r->top + y );
 
 		/* We can't use vips_region_region() since we change pixel
 		 * coordinates.
 		 */
-		memcpy( q, p, psize );
+		memcpy( q, p, psize * r->width );
 	}
 
 	return( 0 );
@@ -100,6 +105,7 @@ vips_bandfold_gen( VipsRegion *or,
 static int
 vips_bandfold_build( VipsObject *object )
 {
+	VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( object );
 	VipsConversion *conversion = VIPS_CONVERSION( object );
 	VipsBandfold *bandfold = (VipsBandfold *) object;
 
@@ -109,12 +115,20 @@ vips_bandfold_build( VipsObject *object )
 	if( vips_image_pio_input( bandfold->in ) )
 		return( -1 );
 
+	if( bandfold->factor == 0 )
+		bandfold->factor = bandfold->in->Xsize;
+	if( bandfold->in->Xsize % bandfold->factor != 0 ) {
+		vips_error( class->nickname, 
+			"%s", _( "@factor must be a factor of image width" ) );
+		return( -1 ); 
+	}
+
 	if( vips_image_pipelinev( conversion->out, 
 		VIPS_DEMAND_STYLE_THINSTRIP, bandfold->in, NULL ) )
 		return( -1 );
 
-	conversion->out->Xsize = 1;
-	conversion->out->Bands *= bandfold->in->Xsize;
+	conversion->out->Xsize /= bandfold->factor;
+	conversion->out->Bands *= bandfold->factor;
 
 	if( vips_image_generate( conversion->out,
 		vips_start_one, vips_bandfold_gen, vips_stop_one, 
@@ -148,11 +162,20 @@ vips_bandfold_class_init( VipsBandfoldClass *class )
 		VIPS_ARGUMENT_REQUIRED_INPUT,
 		G_STRUCT_OFFSET( VipsBandfold, in ) );
 
+	VIPS_ARG_INT( class, "factor", 11, 
+		_( "Factor" ), 
+		_( "Fold by this factor" ),
+		VIPS_ARGUMENT_OPTIONAL_INPUT,
+		G_STRUCT_OFFSET( VipsBandfold, factor ),
+		0, 10000000, 0 );
 }
 
 static void
 vips_bandfold_init( VipsBandfold *bandfold )
 {
+	/* 0 means fold by width, see above.
+	 */
+	bandfold->factor = 0;
 }
 
 /**
@@ -161,9 +184,14 @@ vips_bandfold_init( VipsBandfold *bandfold )
  * @out: output image
  * @...: %NULL-terminated list of optional named arguments
  *
+ * Optional arguments:
+ *
+ * @factor: fold by this factor
+ *
  * Fold up an image horizontally: width is collapsed into bands. 
- * @out has width 1 and has bands 
- * equal to @in bands times @in width. 
+ * Use @factor to set how much to fold by: @factor 3, for example, will make
+ * the output image three times narrower than the input, and with three times
+ * as many bands. By default the whole of the input width is folded up. 
  *
  * See also: vips_csvload(), vips_bandunfold().
  *

libvips/conversion/bandunfold.c

@@ -2,6 +2,8 @@
  *
  * 5/6/15
  * 	- from copy.c
+ * 10/6/15
+ * 	- add @factor option
  */
 
 /*
@@ -58,6 +60,8 @@ typedef struct _VipsBandunfold {
 	 */
 	VipsImage *in;
 
+	int factor;
+
 } VipsBandunfold;
 
 typedef VipsConversionClass VipsBandunfoldClass;
@@ -68,30 +72,34 @@ static int
 vips_bandunfold_gen( VipsRegion *or, 
 	void *seq, void *a, void *b, gboolean *stop )
 {
+	VipsBandunfold *bandunfold = (VipsBandunfold *) b;
 	VipsRegion *ir = (VipsRegion *) seq;
 	VipsImage *in = ir->im;
+	VipsImage *out = or->im;
 	VipsRect *r = &or->valid;
 	int esize = VIPS_IMAGE_SIZEOF_ELEMENT( in );
+	int psize = VIPS_IMAGE_SIZEOF_PEL( out );
 
 	VipsRect need;
 	int y;
 
-	need.left = 0;
+	need.left = r->left / bandunfold->factor;
 	need.top = r->top;
-	need.width = 1;
+	need.width = (1 + r->width) / bandunfold->factor;
 	need.height = r->height;
 	if( vips_region_prepare( ir, &need ) )
 		return( -1 );
 
 	for( y = 0; y < r->height; y++ ) {
-		VipsPel *p = VIPS_REGION_ADDR( ir, 0, r->top + y ) + 
-			r->left * esize;
+		VipsPel *p = VIPS_REGION_ADDR( ir, 
+			r->left / bandunfold->factor, r->top + y ) + 
+			(r->left % bandunfold->factor) * esize;
 		VipsPel *q = VIPS_REGION_ADDR( or, r->left, r->top + y );
 
 		/* We can't use vips_region_region() since we change pixel
 		 * coordinates.
 		 */
-		memcpy( q, p, r->width * esize );
+		memcpy( q, p, r->width * psize );
 	}
 
 	return( 0 );
@@ -100,6 +108,7 @@ vips_bandunfold_gen( VipsRegion *or,
 static int
 vips_bandunfold_build( VipsObject *object )
 {
+	VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( object );
 	VipsConversion *conversion = VIPS_CONVERSION( object );
 	VipsBandunfold *bandunfold = (VipsBandunfold *) object;
 
@@ -109,12 +118,20 @@ vips_bandunfold_build( VipsObject *object )
 	if( vips_image_pio_input( bandunfold->in ) )
 		return( -1 );
 
+	if( bandunfold->factor == 0 )
+		bandunfold->factor = bandunfold->in->Bands;
+	if( bandunfold->in->Bands % bandunfold->factor != 0 ) {
+		vips_error( class->nickname, 
+			"%s", _( "@factor must be a factor of image bands" ) );
+		return( -1 ); 
+	}
+
 	if( vips_image_pipelinev( conversion->out, 
 		VIPS_DEMAND_STYLE_THINSTRIP, bandunfold->in, NULL ) )
 		return( -1 );
 
-	conversion->out->Xsize *= bandunfold->in->Bands;
-	conversion->out->Bands = 1;
+	conversion->out->Xsize *= bandunfold->factor;
+	conversion->out->Bands /= bandunfold->factor;
 
 	if( vips_image_generate( conversion->out,
 		vips_start_one, vips_bandunfold_gen, vips_stop_one, 
@@ -148,11 +165,20 @@ vips_bandunfold_class_init( VipsBandunfoldClass *class )
 		VIPS_ARGUMENT_REQUIRED_INPUT,
 		G_STRUCT_OFFSET( VipsBandunfold, in ) );
 
+	VIPS_ARG_INT( class, "factor", 11, 
+		_( "Factor" ), 
+		_( "Unfold by this factor" ),
+		VIPS_ARGUMENT_OPTIONAL_INPUT,
+		G_STRUCT_OFFSET( VipsBandunfold, factor ),
+		0, 10000000, 0 );
 }
 
 static void
 vips_bandunfold_init( VipsBandunfold *bandunfold )
 {
+	/* 0 means unfold by width, see above.
+	 */
+	bandunfold->factor = 0;
 }
 
 /**
@@ -161,8 +187,14 @@ vips_bandunfold_init( VipsBandunfold *bandunfold )
  * @out: output image
  * @...: %NULL-terminated list of optional named arguments
  *
- * Unfold image bands into x axis. @out has 1 band, and has width
- * equal to @in bands times @in width. 
+ * Optional arguments:
+ *
+ * @factor: unfold by this factor
+ *
+ * Unfold image bands into x axis. 
+ * Use @factor to set how much to unfold by: @factor 3, for example, will make
+ * the output image three times wider than the input, and with one third 
+ * as many bands. By default, all bands are unfolded.
  *
  * See also: vips_csvload(), vips_bandfold().
  *

libvips/foreign/csvload.c

@@ -189,7 +189,8 @@ vips_foreign_load_csv_init( VipsForeignLoadCsv *csv )
  * @separator: set of separator characters
  *
  * Load a CSV (comma-separated values) file. The output image is always 1 
- * band (monochrome), #VIPS_FORMAT_DOUBLE. 
+ * band (monochrome), #VIPS_FORMAT_DOUBLE. Use vips_bandfold() to turn
+ * RGBRGBRGB mono images into colour iamges. 
  *
  * Items in lines can be either floating point numbers in the C locale, or 
  * strings enclosed in double-quotes ("), or empty.
@@ -213,7 +214,7 @@ vips_foreign_load_csv_init( VipsForeignLoadCsv *csv )
  * @separator sets the characters that separate fields. 
  * Default ;,<emphasis>tab</emphasis>. Separators are never run together.
  *
- * See also: vips_image_new_from_file().
+ * See also: vips_image_new_from_file(), vips_bandfold().
  *
  * Returns: 0 on success, -1 on error.
  */

libvips/foreign/dzsave.c

@@ -342,7 +342,7 @@ vips_gsf_has_zip64( void )
 {
 	return( libgsf_major_version > 1 ||
 		libgsf_minor_version > 14 ||
-		libgsf_micro_version > 31 );
+		libgsf_micro_version >= 31 );
 }
 
 typedef struct _VipsForeignSaveDz VipsForeignSaveDz;

libvips/foreign/foreign.c

@@ -10,6 +10,8 @@
  * 	- pack and unpack rad to scrgb
  * 18/8/14
  * 	- fix conversion to 16-bit RGB, thanks John
+ * 18/6/15
+ * 	- forward progress signals from load
  */
 
 /*
@@ -758,6 +760,31 @@ vips_foreign_load_iscompat( VipsImage *a, VipsImage *b )
 	return( TRUE );
 }
 
+/* Forward pre-eval-post signals to our output image so our caller can see
+ * progress for load via disc or memory.
+ */
+
+static void
+vips_foreign_load_preeval( VipsImage *image, 
+	VipsProgress *progress, VipsForeignLoad *load )
+{
+	vips_image_preeval( load->out );
+}
+
+static void
+vips_foreign_load_eval( VipsImage *image, 
+	VipsProgress *progress, VipsForeignLoad *load )
+{
+	vips_image_eval( load->out, progress->npels );
+}
+
+static void
+vips_foreign_load_posteval( VipsImage *image, 
+	VipsProgress *progress, VipsForeignLoad *load )
+{
+	vips_image_posteval( load->out );
+}
+
 /* Our start function ... do the lazy open, if necessary, and return a region
  * on the new image.
  */
@@ -775,8 +802,20 @@ vips_foreign_load_start( VipsImage *out, void *a, void *b )
 		printf( "vips_foreign_load_start: triggering ->load()\n" );
 #endif /*DEBUG*/
 
-		/* Read the image in.
+		/* Read the image in. This may involve a long computation and
+		 * will finish with load->real holding the decompressed image. 
+		 *
+		 * We want our caller to be able to see this computation on
+		 * @out, so we need to forward the signals.
 		 */
+		g_signal_connect( load->real, "preeval",
+			G_CALLBACK( vips_foreign_load_preeval ), load );
+		g_signal_connect( load->real, "eval",
+			G_CALLBACK( vips_foreign_load_eval ), load );
+		g_signal_connect( load->real, "posteval",
+			G_CALLBACK( vips_foreign_load_posteval ), load );
+		vips_image_set_progress( load->real, TRUE );
+
 		if( class->load( load ) ||
 			vips_image_pio_input( load->real ) ) 
 			return( NULL );

libvips/iofuncs/header.c

@@ -482,6 +482,7 @@ vips_image_guess_interpretation( const VipsImage *image )
 	case VIPS_INTERPRETATION_sRGB: 
 	case VIPS_INTERPRETATION_HSV: 
 	case VIPS_INTERPRETATION_scRGB: 
+	case VIPS_INTERPRETATION_HSV:
 	case VIPS_INTERPRETATION_YXY: 
 		if( image->Bands < 3 )
 			sane = FALSE;

libvips/iofuncs/image.c

@@ -746,7 +746,7 @@ vips_image_save_cb( VipsImage *image, int *result )
 /* Progress feedback. 
  */
 
-static int
+static void
 vips_image_preeval_cb( VipsImage *image, VipsProgress *progress, int *last )
 {
 	int tile_width; 
@@ -754,7 +754,7 @@ vips_image_preeval_cb( VipsImage *image, VipsProgress *progress, int *last )
 	int nlines;
 
 	if( vips_image_get_typeof( image, "hide-progress" ) )
-		return( 0 ); 
+		return;
 
 	*last = -1;
 
@@ -767,15 +767,13 @@ vips_image_preeval_cb( VipsImage *image, VipsProgress *progress, int *last )
 		vips_concurrency_get(),
 		tile_width, tile_height, nlines );
 	printf( "\n" );
-
-	return( 0 );
 }
 
-static int
+static void
 vips_image_eval_cb( VipsImage *image, VipsProgress *progress, int *last )
 {
 	if( vips_image_get_typeof( image, "hide-progress" ) )
-		return( 0 ); 
+		return;
 
 	if( progress->percent != *last ) {
 		printf( _( "%s %s: %d%% complete" ), 
@@ -790,23 +788,19 @@ vips_image_eval_cb( VipsImage *image, VipsProgress *progress, int *last )
 		vips_region_dump_all();
 		 */
 	}
-
-	return( 0 );
 }
 
-static int
+static void
 vips_image_posteval_cb( VipsImage *image, VipsProgress *progress )
 {
 	if( vips_image_get_typeof( image, "hide-progress" ) )
-		return( 0 ); 
+		return;
 
 	/* Spaces at end help to erase the %complete message we overwrite.
 	 */
 	printf( _( "%s %s: done in %.3gs          \n" ), 
 		g_get_prgname(), image->filename, 
 		g_timer_elapsed( progress->start, NULL ) );
-
-	return( 0 );
 }
 
 /* Attach progress feedback, if required.

test/images/WFPC2u5780205r_c0fx.fits

@@ -160,7 +160,7 @@ N
 ¾ž=í?$Ïû¾˜Ÿ¬¾Z–ô?,9V¾Îª>¿“0Ô?&¾¾<>°h?2-B?Ôk¿”€¾Å<&¾X
?'é<‚F ?:M—¾(˜n¾5Ù½ß>t¾KkŽ?Xüí¾W<C2BE>á½M¤4?M„ö?B¾>¾Œ<C2BE>Ò?<hŠ?=ª¤?G[)¿“>Î?ù4ê¿–™Ž¿‡žÉ?I#†¾|’§¿‘-|½†½ÿô?‹ñ/¾…y^¾_B¾hC¾ea¾›?T¾¡¶ê½ê’|?Rr¥?Pä`?äZ¾<5A>’š?÷ʾ/°Ê>§M<¾UÈ„?9`g½÷Äž¾‡ôæ?J›8½ßHŽ¾ˆî,¾L㨾¤×<C2A4>½âŠf?Eè?EœQ?<
a?7ËX¿£ºL½ä>¤¾y]Ú?E\¾’dÈ?ðKM¾›
â¾×æ¾;¾X?cÙоlÿö?JÙN?F…g¾Q’?HöF¾ch¾²u®¾ŽK•?@êÞ¾ã÷N?*›?Fæ¾}îѾ<C391>GŸ?4®¾:$ ¾šÒ?KbJ¾‹? ?äîª?.ó¨À?q¾³;³¾Ûó¾æ¬¾n?î?'6¿xîö?-ê@S"¿0?Ö
 ¾Ž4e¿ Tü?,…’?/œÆ@4.d?ÝŠ$?Eiæ?…è¾Ç1<C387>?1—6C±‰„C”—s@3ò9¾”¦*?â2²¾{*¸?7˜Q?N|¿¾¿
 #?éw¾Ÿs<¿¡õ®¾2Ïh¾<68>ÆÓ?×t¾[¡V?û¬?Û†º?àòa¾"9`?§ô¾_F¦¾ÕVz?"²|?7Ý?:ø²¾¥×?âŒW¿´ß;›ÀÀ?:*¿‘«5¿<35>›@?)ùô¾š.2<£y€?83?Ñ\?1¿–(.¾|µ¯?CV¾¬/^?yåú½vöܾ2„?´P?-ƪ¾“§
?&¶¾Óóš¿<C5A1>yU¾‘æc?;bß¾Ÿ¾OϾŒGb?G5t¾=¾\?ϾöW¿š°p¾x°¾µ;íÀýÀ¾E¿’8L?Le?2´~¾ˆÍ¾‚é³?8üž?D­Ø¿ž5J?3úu?<Üþ¿šý
¾“ÒÅ?8Ì?<1E>c¿¢6ê?Ý°+¾‚û¶¾–ο°¯w¾ãŠœ?Ù¿~?ÕË?m(?/4×¾™=Î?4§`¾¦SŽ¾~Ƙ?I<>·¾h˜¾©@3H¾\ë
-½»,–?SÌ;¿<>f¹?9šP?E²À¾‘{K?N`ž¾(JÄ?k­„?#¸<?ÛÚÖ¾»Ú\¾Š@¿‰³þ?[3?uÊa½›òÚ¾P%½¾¦ËP?Fžm¾~ºŠ¾µ9?GÀÂ?I¶
¼‰ãоež,?>Ó?gB?/ýû½ P¿£ë`¾ˆy‹¾”ƒ¶?>›Ì@¤;¿˜Ê	¿ˆî-?WÌØ?Qo·¾-WÐ?n¯Ò¾¯õš¾®0ê¿‘‘—?Un<55>?äN&?7sÚ??Iœ¾‚Ä<E2809A>¼‹“°¿…wÒ¿’¬¿<C2AC>Ò³A(ÔÄ>÷™§?ÝI¾$³´¾‰’оv9ð>Ú“I¾ff?D
™?,%j¿<6A>ë,?"(÷?J9ʾqi@¾“¿<>?B¾<>°?Y¾F¾´¬¾¡w¤¾Vô¿©Ÿ£¾~›ì¾¯öä?,ÿο˜œ¿œ·¾Õ<C2BE>G¿Ÿ<C2BF>¾¿˜/L?T1¶¾qå¾&íè¿Â
+½»,–?SÌ;¿<>f¹?9šP?E²À¾‘{K?N`ž¾(JÄ?k­„?#¸<?ÛÚÖ¾»Ú\¾Š@¿‰³þ?[3?uÊa½›òÚ¾P%½¾¦ËP?Fžm¾~ºŠ¾µ9?GÀÂ?I¶
¼‰ãоež,?>Ó?gB?/ýû½ P¿£ë`¾ˆy‹¾”ƒ¶?>›Ì@¤;¿˜Ê	¿ˆî-?WÌØ?Qo·¾-WÐ?n¯Ò¾¯õš¾®0ê¿‘‘—?Un<55>?äN&?7sÚ??Iœ¾‚Ä<E2809A>¼‹“°¿…wÒ¿’¬¿<C2AC>Ò³A(ÔÄ>÷™§?ÝI¾$³´¾‰’оv9ð>Ú“I¾ff?D
™?,%j¿<6A>ë,?"(÷?J9ʾqi@¾“¿<>?B¾<>°?Y¾F¾´¬¾¡w¤¾Vô¿©Ÿ£¾~›ì¾¯öä?,ÿο˜œ¿œ·¾Õ<C2BE>G¿Ÿ<C2BF>¾¿˜/L?T1¶¾qå¾&íè¿Â
 ?ÁJ¢?)Ͼ“OÐ?)’P¾Ï|~?/Ü	?°•ô?<y½¬[n¾iÈÀ?1o¾<>-7?í˜èBãÚTBb¬?³µ¸?8ͯ?7
|?:5r¾¶ãi¾fÕµ?'‡4¿ždª?+ÿü¿<C3BC>¨·?&ü?/”?~§¾Ê&?%ÅÖ¾§-?,ÊÚ¼œùh¾Syþ?A¶&¾ùSi>ñ)ø¾Á<C2BE>€?NJ„?G±¸¾
6Ú¾UlZ¾vùʾ•Ð¼?7ľcKX¾Xù@?Ú^j?W¾±¾x¦??Ÿ:?. ?!É‚?Ø+¸¾Œ€Ô¾™½Z?
YR¾‡™é¾<C3A9><C2BE>(?!eÝ4?1_¾™º³¾nªõ¾‡õÄ?-˜˜@9Bô¾³ƒˆ?!?
 츾ÜÓ¾µÃ)¿¬×,?†?oྈ¤ì?7ÐZ?8E‘¾Íu•¿”(•¾za}¾?ñô¾!»[?T¾³œ¦?®Á
 ¿¦p$?ì²0¿ŸRqÀÏ>½i¯l?¾¾?ïG)??w ¾üðG?7Ⱥ?;uŸ?!Æf?L–|¾§^ ?#Aa¾Ëÿ¦?Êò?R>ã¿£¯b?'§n¾€‡í?ÙöH?™>­5†?^]?Z꘿…Ôx½°å¸?f“H¾	¯?•eÙ¾qQ5?FgÕ¾ŠÀ?AÑ0¾)MD¾‚™Ü¿—í?éhY?S^¾#¾E!t¾Ü?i?cÊž¾¦Ææ¾-	¤¾Uk‰?,6ç?jb<?Mo©?`C[?V0É?L|Û¾k\à?=Åq¿’S
?½¿6¿›¤Ð¾lÇ?Fó ¾\il¾e=D¾É}¾<>J¾@‡<?â<>(¿Œ<C2BF>¬¾g4ª?S‰
¾"ùh?*)”?<à¬?L¶´?'AÄ¿„€¾±+v@B«¾)]o?>tÖ>Š<å½ñÚ¬¿€ã"¾
ãÆ¿’¾C¿‘I®¿—	?8/…¾L"e¿¢Jt¾;…å?mK?QªŽ?îb?1b„¾‹Œ?TÌ ¿ð?-V¤?M<>T?:C<>¿žÙW¾Ø{K?-¡—¾½^¹¾Iš¾¸§¿˜‘­¾Š¤?1RF?;¾”jþ?,”–?T!n¿Œ[«?0•¬¾º‡"¾£Àµ¾ÇÕô??!9?9c¯?-8î?.$?M,\¾ªiG¿¡A¨@>IÊ@ÀM@ŸC¬?0F?RP¾Xç{¿“!¾‹
.¾‘"¾—-b?,ˆ%?U
@@ -214,7 +214,7 @@ a
 ©¿”<EFBFBD>!?À¾Ç‘?'þæ¾æ¢ ¾As¾3›¾^êT?,¿žPF¾Ð)t?äé@‚f
@àj•A–´ìB†B¤BèÜCû¯C1À'B­ßB+·~?"¯‚?S…оô±@Ýj+B­Ý|?í7×?Óœ¿¤³(>û̾¾Ü³W¾à(x¾<78>kØ?-
 `×?NN¾½HÔ½Õ’¾±€a?T
ò¾Ñ˜?Y<>n¾×b>Š¾»R¾•9?N
‡>{,H? û@„Èr¾€ï†¾<E280A0>›g¾Ê¿¡?f?ÓËʾ¹û?+‡¾Œ¶-¾vL¿¾9j¾6‘-¾FKš¿‚Å?7KÆ¿£“]¿·?‘?5x¿<78>Û˜?!~E?7åî?
°Î¾±æˆ?4Ku¾ƒž°?3ž†?!Y^¿—hî¾rg6¿Á°O?èÅn? §
¾<>•H¾K+?+‚H¾½‚e¿¢—(¾d‹Ê½<C38A>#R¿¬¬l¾¤tÂ>þB#¾>%·¿‹{f¾<66>z¾KB¾>ç¿Š˜Õ½Ù÷v¾;Ãõ½ðJ"?ã.?]L¾†#»¾Zˆ?ôsÝ?gê¾Ù½ª°¬¿<C2AC>IÏ>¥gT?B&À¿”e÷¿—y
¾'ed¿‹b<E280B9>¾Z”ؾÉ⨾a¾N翈ûb¾€’ì?‡ø¼ªÈ`¿—Ÿq?Þ]U¿†è<E280A0>¾Oµ?âot¾ )8?Xx&¾sí<b¢€?:\¦?=J¾KÝ)¾ŒùÊ?B€Ô¾k•V¿¦-÷?1ÍN½›~¿’kò¾À{?UÂÌ¿;R¿‘??M]?SÆ/¾fãŒ?=0É?F¾…-ܾhg@¿›xž¾=Wu¾†Ø¾Ðξ:ó’?@̾€É/½ÏPâ¾<C3A2>X°¾¸X¾<58>Qþ¾x«ï¾NÛ)?×b˜¿šO#?(™†½ñ¸ž¾«¢¾Â<¿—Ìã¿“ Ð¾xÏؾ‘9=¾›å¯?æÆ<C3A6>?/DX¾_´"?ÛŽ†¾‘3?#ì?)õ࿾$'?8¸+¿§¤a?ò ?=¾ˆ?h;'?ÞÇü?@<40>\¿¡‘ľŸ´K?4‰Ô?5ðR?%Ó¼¾7H\?)¨Ú?'×¾¹8x¾u
 ¾Â¼ø¾ÈT$¾@•Ï¾<C38F>¾À7>?F^ÿ?Q}ª?')©?Þk¾ž#Í¿ž6A?R¡µ?Ü0@@ž£ÊAßnA<×È@Ùz{?çM?
-Ⱦ¾ý³¾ÛmÕ¾diè¾—<+?=˜Àæ»?>°ô¾–(v?7ii?&ˆ?AŒ$¾¿Ø®¾€Õ†?2ô@Cä?š²¾¹@ù?B	?èåE¾µ·À—¡¾!ù?=È°¾°L»¾K
+Ⱦ¾ý³¾ÛmÕ¾diè¾—<+?=˜Àæ»?>°ô¾–(v?7ii?&ˆ?AŒ$¾¿Ø®¾€Õ†?2ô@Cä?š²¾¹@ù?B	?èåE¾µ·À—¡¾!ù?=È°¾°L»¾K
 ¿¢·±¾MMd¿©e?+|¿¢ÂN?-pì¾|ú^?Ñ«¾aSf¾šÌ ? H?¿šM¢?âµ?
 À¾Uý>?]
 ¿µÑ?)Î?[ÖU?UÑø?Ù‹‘¿£iB¾<42>¬@¾N±­¿£ö?b‡¾®|¾§B(¾—l¤¾šX¿—$D>„ÊŠ¾å¨¦¿£â­?Qdn¾ˆ®Ò¾S¸È?(<28>¾…/??8?â¨V¾§Ìƒ¿”Â?S<>‹?‡äû¾©V¿Ž’?¾’pÒ?h·H¿uò8¿¤²„?Gä	¿Žÿ©?êÝ°¿…Á¾<>cr½¢$r¾o2ú¾+e̾£÷ó½:
Œ?86D?T_†¿<E280A0>쯾sé4½·!Š¿†Ôü?àŒ?dA‘¿’Pp?Gpö¾OS ¾1Á¾iUÉ?â¾/À	áá?k`¾~1+?E¬È¾wEg½ôп ºÔ¿˜2»¾Gg¾¿ì¾­gؾHC¾_¾61¾ŽÉÌ¿Ž˜R?4–†?eø@¾ª|$?ç ?>âŽL½7Eà?!§É?"Ú/?Vu,?ä)—¾7k»½Þ¥Ü¿¡æ7¾EóY¾<59>± ?kØÞ¿“½§„?9¥¾Mÿ
@@ -500,7 +500,7 @@ B
 ?EÀý¾Ç‹¨½ÂÀz¾<7A>[<5B>¾Éí¥?E˜¾‰h¨?Uä¹¾¯Ùa¾¹(ú?<Ô‰>‰þ‘¾Ëo[¿˜Ö©?>œ”?<!?‰È¿©<C2BF>z¾á‹·¾¥ª¬¾–õb¾<62>•¾Œ×V¾Ê@+?†ÕŒ¾V¯¾—{ß¾j ×¿£½Ð?/O<>¾œ=¾?E<>:?FÎ?:¦?QLÖ¾w>«?Iï…?CZG¿¢¸·¾Pº‘¾ÄûÞ¿­v0?Ò$ü?)<N¾zfv>Œ„ö?j¾Mꀿ©sÈ?YSH?/†?H(¿š§à¾4<C2BE>¼¾ˆ^«?,3~¾<>Ò¾œ`¯?&˜>>³·­?v§?\KŽ¾“C·¾{&O?JW–¿r¨?Y¿¤—?%—W¾“C`?á!¿žNš¾<C5A1>pR¾<52>‘ô¾¦<C2BE>J?3¦í¿›c?Gð:?Bêâ¾+Z?8
K?PðW¾¾ô¶¾"Ii?/ÅÄ?Kg@.[T¾Ž5>¾ŽL´ÀjÞ¾wÞ¢¿ˆõ8?XÉ×?r›¾Œ@¬?F0>_N¿•©?UR~¿¯—e¾+“±?7!¿¼¦?5=…¾{‚;¾·†¿Œ_9¾ÆÂ?A« ?BÓ¾;&Ž?Ü:¾b'†?A¦\¾,‹0¾Š×侎üž½ÝrÀ¾"¬„¾N7¾È}z¿—¥¡¿˜‡*¿˜0Z??Ça¾.Ñá?HŠH¾ÍmÇ?-‹¡¾Ž<C2BE>3¾<33>Þ¾?	„¾ÆêH¾¢h“¾wä¾—²*¾—A¾µâÓ¿ŠÛ澶š¾‚•0?E­0?åó¾U<C2BE>¹?K³ô¾“×j>­t¾½ì&>ºô^¿ 2¨?M×r?*Nؾ„žï¿ „»¾Ÿ7{¾ñø?:Eú¾‘î ¾¼bµ¾ðüľәu¾‰÷§¾HE¬?6‰1?æyÄ¿¬ýƒ?,Ðn¿–Áï>}¡P¾ÓíN¿¤aP?2<>r¾ÞK?@d¾q<C2BE>~¾<19>À?%Ñ´¾f<C2BE>¯?g`¾¾£.?˜Ü†>Áñ>¾…yb?ÇA¶?Î_&?9ö?â¨?H§ú¾~Á¢¾{¹
 ¾nœ¾b´Š?.§¸¾•Ì×¾}Ô’¾ë<C2BE>?1X¦?+D2¾¢ˆŒ¿¬Ì*¿«od¾mö¤¾‘æ¾ùg¾µ9æ¾u{h¾K¾Ê?;"ϾfTï?5,>¾ˆûI?TA®¾uW½¶Sô½Åb2¿cåh?O<>V?Ô¢…¾GÜ´¾.ÐC?á]k??Êk>žÝ\¾F¬f¾§Ÿ¾ŠÀ&?E»e¾õƒn¾§NÖ¾“8?x,¾>êæ¾½ù¬?:X¾¾¿ðS¿çª?Mì›?3M„¾šÂî?E×x?.˜,¾AS¾Ô•š?7=%?Fhh¿•%<25>¾ O(?&ã(¾V¼µ¿­‰¾Ós'¿©&?8Ï"¾btn?"Ï·¾‡'J?-b>•àÒ?>eO¾¢ñ–¾âI¿«=µ?7‡?D¬¾g<C2BE>á¾Ä!¾ÄÌv¾W¢K¾ƒïS>÷‡'?MÁŽ¾^<5E>å¾ ä„?/>ñ?Jcþ¾nr>D@ì?3_N?)¾Hê
 ?Üt¬¾ HÕ¾›=ú?7³	?6šv¿•M·?XâW¾¡3B¾bä5?[Ð=?PŸk¾m‘P¿<50><C2BF>·?1D§¾H½¾†<C2BE>t¾vÀˆ¾šš%¾‡P¦¿ª¥<C2AA>¾<EFBFBD>à׾̘“¿“âÊÀL‡?2
“¾†_±¾1c¾P¼	? s?yÈ?éx&?ÞÖP¿€Å<¾±þ?!£?Xß?JãÔ¿¦!Ò?û¾‚"0¾x¤Ú?-cL?Trƒ¿<C692>ö?2Z9¿˜4{?Dßl¾ž–?/ß?
-â¾g@µ¾c2Š¿”å>?*ê?/|h¾³<C2BE>R?(M?È –¾<E28093>f<EFBFBD>?A¡-¾ª¹j=÷¬¾†*«¿¶_•?;P”?M›.?G<8¿–‘o?£è¾§—M¾[‰Æ?Tت?O»?<1D>ܾ<C39C>²?1z¼?5ËŠ?2¢Ž?¹¨¾<C2A8>N¾Ö9‰¾"¢?F_*¿œ5?ÂÇÕ?+2/¾‘Mz¾Â}v¿·—’?ÝXu?S<>ù¾³Èš?I28?Gp¾šH¾K=нý!>?/x€¿Ÿ©ó¾1^?'b̾<f‘?jmÕ?å<?E­¿¾fð\¾¥c¿‘.ˆ?8×C¾¯¿?›¾²?H•?0§8?U£â?âœØ?5SŸ=•¢?,ñ®¾£Gô¾”ጾ…s<E280A6>¾<°M¾ö»Ô?;Ë|?LQs?à%<25>?
Å<>?Eàî?3"?×Ú¿­þ<C383>Š¾­:"¿¢}‡¿<E280A1>eŸ¿Ÿ)6¾–®D¿•ìÏ>ÿC•?B<>£¿­=9¾Ú¶þ¾`x,¾†‡†¾¦Øý¿¤Áh?5Ž¾ÎÓ¾?A1¾€É?9Þï¿œØ{?3ž?%-«>³¾—e9?IT¾vÅÔ¾Ø&~?äOî?JÃÄ?A
+â¾g@µ¾c2Š¿”å>?*ê?/|h¾³<C2BE>R?(M?È –¾<E28093>f<EFBFBD>?A¡-¾ª¹j=÷¬¾†*«¿¶_•?;P”?M›.?G<8¿–‘o?£è¾§—M¾[‰Æ?Tت?O»?<1D>ܾ<C39C>²?1z¼?5ËŠ?2¢Ž?¹¨¾<C2A8>N¾Ö9‰¾"¢?F_*¿œ5?ÂÇÕ?+2/¾‘Mz¾Â}v¿·—’?ÝXu?S<>ù¾³Èš?I28?Gp¾šH¾K=нý!>?/x€¿Ÿ©ó¾1^?'b̾<f‘?jmÕ?å<?E­¿¾fð\¾¥c¿‘.ˆ?8×C¾¯¿?›¾²?H•?0§8?U£â?âœØ?5SŸ=•¢?,ñ®¾£Gô¾”ጾ…s<E280A6>¾<°M¾ö»Ô?;Ë|?LQs?à%<25>?
Å<>?Eàî?3"?×Ú¿­þ<C383>Š¾­:"¿¢}‡¿<E280A1>eŸ¿Ÿ)6¾–®D¿•ìÏ>ÿC•?B<>£¿­=9¾Ú¶þ¾`x,¾†‡†¾¦Øý¿¤Áh?5Ž¾ÎÓ¾?A1¾€É?9Þï¿œØ{?3ž?%-«>³¾—e9?IT¾vÅÔ¾Ø&~?äOî?JÃÄ?A
 ¾™m„¿£<EFBFBD>B¾¯c>¿–†?=¾Þ¾j÷S¾¯æ~?5n3¾£öò¿’Á@¾˜3³¾‰:ø¾´-F¾º"§¾z™Š?]$¶¾Vuh?O­ë¿¦¤Û¾S¯0?:ÅÒ?E”¾¸S?"ëe¾‰;­?wÖ¾œqþ<C383>oK¾™k辤³?Ce?(0õ>çÅ%>ÃÁÌ?7ct¾e·Ð¿<C390>s½æ›ø¿©«?^Àn?Çåj?¯o¾ZAô?Eåõ?SÖR¿–<§?ñÂ\?Tyø¾0Ñí¾<C3AD>;ä¾Q0“?këÁ¾¥âX¾o)3?G¦A¾^2?1ç¿	<µ¾”ór¾¿ly¾\Ìƾ«í¾’C‡?ó¬¾[%ž¤b@¾·0;PLð?Eú¯?;^Ñ?jo?M!;‡¹X?J
 V¿¹¾œýˆ¿¤-V¾‡Jt?:¯?9íÒ>ôõN>‹äâ?R…¹¾S«Ý¾¯Ö#>¶Ó|¾~ð?>+3¾Q4¥¾¿õz¾	°¢¾Œã¼¾Ÿ’´¾žÜ<C5BE>¾<EFBFBD>R¾v…Ç?.w0¿¢hÌ?Kœ??à‚¾n:?¾eqŒ¾vL¾¦|<7C>?9;‘?9.¹¾<C2B9>ë~?u¿(z¾c:µ¾PM6?N1ž&?\?AçÍ?#Nc¾…‘D<‚º?(Kx¾†Q·¾Vܾºî¾ŸaŠ¾­'¤?>Á²¾Sfã?ÍGd¿¦þH?A½¾]‹{¾¨v,¿·lǾƒ¢ý¾´<C2BE>´¾ÀwF¾¤ 9À	D?T¸“?[d-¾¼Ø“¾?÷$?#OŽ?Ür?ã
 i?-ÿ–¿5lV¿³a¿¢a\¾|²?0"?’0Ï?NN|¾QÝR?'®2?Æ?ÓÁÚ¾ 7u?5$?"Í?$ªù?D‹¾<>Q¿³±å?%Ž¾7Ý?:‹Š¾d™x¿"ê¿ž½´¾™¢Z?iwо‹ìT¿•¬­?;R7¿™º+?ÕoM¾’ûŒ¾·†x¾–
]?3íª¿ÈV?J±Š¾†jõ?<| ?>6¾±¨Ì?q?,Ž?e”ž?&¤?*³W¿§’²?"¾â?+ø¾©ÎI¿¤Ø¿—¾¢Ž‰¾¶©*¾œ¹J¾<4A>^&¾“‰ì?°´¾’¡°¾iç$?Å}p?Ó
r¾‘u¾=Ò¿Ëíb¾Ëè+¾<>%+?zп<C390>‘k?:%€¾Á‰?;UR?"¿Ö¾R|¾wíi¾2àfÀ1T?Ì$P?ÎJŒ¾¡£ü¾œ¾bÜM?9Á?7½,?7¶?XÇÖ?ß	n?_†¿¶F½&k0¿˜±÷?oÕ?\äV¾h±ž¾Ãñr¾<72>8/?ã<>«¾çGϾŠëd¾IA”?U:—?hãá¾B6¾<>ëq? žñ¾Cº!?Rž1?nuÂ?TžÄ?%¿÷¾4¶8¿™-¿?åÊ[½ÊŒ¥¾ÓðŠ¾xþb¾—cy?(É.?¿¬¾jƒÆ¾	:¾®Q¼?ÍV?QÙ?®¾ˆ¼6¾õ*꾿…|?CZ¾
¯ü?Af½?J©B¾S?sF??ʾ¾•B?	¾Ù?J-ü¾Ü¢¾‰æk?7Ãœ¾gj¾Òl?g“‹?/¹&?<:Ú¾<C39A>VÌ?Å¡?D?Ⱦ™€€¾º<C2BE>??½c?R¢¾–2?1¦‘¾Ðœ¾T·˜½ªX¾€,¾¾*›?gÞ§?0ö„?=)*¾öb<¾<>?&>¿™‚´?3ß ¾Vªe¾Z?Eð>¾”UÚ¾ ©2¾“Ü*¾‚!B¾Ä*¾›¥±?Ó@¾÷žB?IÙ=øÀ?›ÿ¾<C3BF>lä?•<>?WXv?_µ‘¿–m÷¾]€?JŸ—¾sÉ?+Ô?ArÁ¾a~о\’Ü? ˆ¾›|¦¾l^T¾Íä¾sôª?Mb¾˜J¾"!¿ég¾<67>¨Ð?Tõz?B¸³¾wʨ?E•¾Š¤ü¾¯øl?ßpÞ¿š
@@ -1541,7 +1541,7 @@ p?]<ȿ
 `¦½ÇX¬?>ݾëY½ò4à¿<C3A0>¼æ?ßA?Z`w?"Yz½î‰¾ýнn,¾<>‚É¿—²]¾@;]¼$B°?OC<½Çsö¿à•?Ðl?[<04>?|Þ(?[:‚<ãо#
 d¿„]ø¾we9=ÔeN>ªÀ?DRÜ?:É2½¸(Z¾´0¼lP0¾CRv=+_°?¡·r?y<>C¿mV<6D>ÀŽ>‹–Ø¿iདTD<ºôh?8<>x=B>D¾=¶€½Ìh?[[±½ŽBê¿–œ ?k(.?Ü´Œ½£ ¾°óÖ?^]±½÷L¾<{ ¾t_h?|QX?.'¡=‡Ab¿•/À'?Xí»²ÒÀ¿Žú¿nW|¾Qû¿wã:¾
Uâ½Ú@?A‹=f«ô¾˜:íÿ?*¿xep?NC`?-Ʋ¿’t»7þÀ?M¿xòÞ½ŒW"?‘Ö?V=»?]gÛ½d?L?XKÉ?â¿<–|X¾‹/%¿‹À
n­?Uú‚?ô¿ŒÝ:¾ÐC?tô¿¤ko¿…ŠD¿œ-d¾c-?J~¿<>÷ž?Z”¾N¶w¾<77>È*½Þ„¿µö½…<C2BD>Ô¾„¶6¾Qg<51>¾©=«ºð>€¿m<C2BF>k¿<6B>.W¾8pˆ¼’HØ¿’bØ?ú:Ì?3<>ø¼o°?Zà|<ÓÄP¿Žb„¾8攽
 T¿fïW¿™e~¾†Ø?«,½¡êL¼–÷ˆ¾&.X½òDÈ?mž‚¿–Ím¿‰£¿½Ü
ô?Pá7¿”ó¼]྅*¿¤•5¿£Ç>cm0?Q2º?MؾyåÞ½ ¾I>?g4-¾•k?[Sö¾<–¾RÀªD¾‰q`¿	*?^Îá¾t:¸½ª
-`?*qð:áà€¾cÕ[¾MæÕ¿‰‰‚¾ ;
¾Q†f½êX¾Cl¾‹ëg?E+d?E~ä¾CˆX?eоêò<«g¸=Þ¸?nî¾<C3AE>Œô?Už<55>¾3I¾ðœ?Aͺ½&›ü?Í©¦¿‚Š”¾˜p«¾D3*?±òr½ƒ\0?]æ½5¨¿ˆ:ê¾4'þ½ýÒ´½<C2B4>‚?éä?G¡à¾«ãn?;@È¿4Àk½‘µ°¾ŸÌ?Vñp¿ž"x?*¡ú¾¢WS?3r?.||¾±<C2BE>p½÷â?u8?9.l¼<6C>`0?hÐ?ia¢¿„Bá?~˜Ô¿“œ ?iGß<H­À¿~Jž¾ÀÍ­¿ƒ<C2BF>8½Ì‚æ=
+`?*qð:áà€¾cÕ[¾MæÕ¿‰‰‚¾ ;
¾Q†f½êX¾Cl¾‹ëg?E+d?E~ä¾CˆX?eоêò<«g¸=Þ¸?nî¾<C3AE>Œô?Už<55>¾3I¾ðœ?Aͺ½&›ü?Í©¦¿‚Š”¾˜p«¾D3*?±òr½ƒ\0?]æ½5¨¿ˆ:ê¾4'þ½ýÒ´½<C2B4>‚?éä?G¡à¾«ãn?;@È¿4Àk½‘µ°¾ŸÌ?Vñp¿ž"x?*¡ú¾¢WS?3r?.||¾±<C2BE>p½÷â?u8?9.l¼<6C>`0?hÐ?ia¢¿„Bá?~˜Ô¿“œ ?iGß<H­À¿~Jž¾ÀÍ­¿ƒ<C2BF>8½Ì‚æ=
 à?aÒ?eèi?2™.?,hÁ¾C.¾.yÈ?W;=?j±?[¶l=µ|¿†‚Z½l{X¾ÉÇ%=	*0¿’"ï¿÷Ž{¿‰)¿€­î½˜Ô=R·È?RŽ=”¾fái¾'å&?ç3(?‡á¾Lé¿^<5E>¸½Ëg–=X?P‰¼?|O"¿‚%½6½œÐ¶½º½ Q€½ ¦??TW?‚yҾ诼o´P¾•-¬?l£–?R®5¿iºÊ?Håõ?OFJ¾V‚?<3F>sš?X´Ø?_‡é?3«>¼¤)X?>¼'?Îáè?]Jp<·¤<C2B7>?X!M=	Ù ¾{«?îÞô?$!U¿uqN¿„·»¿…»„?ßD‹?^´H½Ã»
 ¾i?:)>í½y~ü¿<C3BC>0Å?UêË>»…à¾eƒ ¿q˜ý½kÏ@?cD?;;Œ?p€Š>ê²Ú½náÜ?'ž<>¿ƒÍ?A8Ƚµ¶½¼k?Ð?5ö¿‡Nn?P>à?|åï?áºA½‡‡r¿<72>Eh:m—¿<>©ƒ?j²X?8;b¿‚Ïò?™š½à1ä¾V®M=´T?RÖÞ<þ^X@+ÑS<ÃÃÀ?,¡R¿z ?Râ4¿}–B
ÅÎB<42>e@Ò³°?bÉ<62>½ï讽9~p¿&SP;´¢À?3ÞX½”Áú¾nÆ>½¨Cn¿šµ¿HU½ÁÏŽ?+2 ?SË<?O¿R½hG¼¦dø¾,©¸½ÁÁø?@
Ü¿9Á·?M‹^½<>àÈ?åÛ = Ø¿ Xh?JrÝ¿ŒK\½æÀ´?KÿÝ?dëѾ`<Y?3•X¾‘¸š¿i~¿‹<C2BF>~?îRo¾2~@½§yX?‚(¿ƒ²¾2)?cÞ¿‹6»?éKz?Bº`½I<9¦¤½€Ô¿œ¼?*Yä½Ì˜ ½Îë~?ZJ”½·vp½»y^½Ô…’?,•ú?]¦<>¾«l=d(@¾tr˜?JÍ|?Îý¿‘€„¾UXç¾Ò~–¾dTÞ>
 jþ?T8E?yJ¾d¿<>)‚¾›z<ÔÚp¾<70>À½EGD?O½c=GÜÀ?<®þÀ€>¾Óö½ÎZ‚½ÓŒ¶?v[f>^>¿”KÔ@aP¿p¤!¿Y(=,£¾K
Û?|´Ú½,<2C>Ì<ÇÞH¾è–½
¿™¢o¾·Åœ¿%*2<šØ?:™r?YÜ4?¢ú?7Ø™?',
?P:ξA%Ø¿ŠIľ‰ùø?i}æ¾¢_…=þÎÊ?D¼J¾~£?6ÝZ?hçš?<
T¾€†$? ðß¼sv€¾=Ó?cùè¿”…b?Pòç¾x$,>6¤ ?#%J¿ƒþâ¿…g%?F?Î"‚¿¢—<¾;Z½u¡Ü¾Hœã?} £¾1úE=÷¤?Aïؾ# ¾'Ö÷½!ô?)OG?^ã¾w$û½pƒø¾gœ¼ùÒ?m.[½¯À>¥Ãn¿~?7¹ª=è<½<>qX½)ù„?HP¿‚Ëh?Î(X½·D¿—²¾4<C2BE>R½é½l¾Î“¾+þ#¾"ì翆$é¾Æ|Þ½<C39E>™Ö?7²”¾œV?QÜʾ(ñ¨¾Í";‡u¾„qp?Y²½¤ïÄ?Fl`?H—‰½êQJ>ÒÌÈ=²Ñv?áçý?€×²?Áé,¾
šÕ?GŽÌ?q÷ø¾S=½3¾QUä½
p¾4×A¾J<C2BE>ú@+ìA€Æ{@µ·ë¿‚SI½ãŒ¿…™Ä?a}3?GêA?CÃ.¾L<C2BE>b½”\?LøÄ¿”§%½›)X¾|7\½ãǾ¾§°&½оSh¨?ð:b?>â÷½Æ‹,¾*ˆ»¾·À?éïq?œq¬?7;¨¾dV¿ªä¾G›Ú?4ÁB?c6l¾w-)?ðÇæ?Í5r½CD\¾0@â½^ª¾ûÙ?tPc?Jj¸?êU¿¾›5?Ds>½½<C2BD>Ð?ƒXú½$ú0À~¿’r?.§m¿…?vž6¾<36>G?:–?#8™<¾P¾`v?D‘?=Jq?e¸¾dåÓ½¹Áü¼;¥<>?zž˜¾(Ã4½§‘ྫྷ
ν4•p?1<>Ý=šà¾I<C2BE>²=ö´´¿Œç†?#@ö½ÉÂܽ<C39C>?Ö?Iú¾€Ê?F¶3¿OŸk¿™|J?_õ
?[i\=Xd¸½ò‰r½—ÉνœÅ¤¿“'~?ÛzQ½Õø˜?ï•¢?q‹?Kñ?c?9ÈtÀ
®¿‚‘
@@ -1622,7 +1622,7 @@ rL
 9¾mµ˜?Ca`¾wnœ?ëÌ<C3AB>¾*Ò|?qV®? Q?u±<¿¡ü7=–pþ¾<C3BE>ëj½Mg(¿ˆÆ=?w<>µ?Û^†?_ÚM½¿ž?Lô	?-hS?^‰X¿†ú™=;4?à+t¾8Ј¾w¶È¿pÑ×¾1[ÿ½ÞT„¾9¶?yÏ!¾ohn?Qéð?Nl½ÂêÜ?²;u?RâȾ
±"½p^¾ÕQ½Ä0?U°¼Ù`>ÞD¥¿”…ž¿†(?cÿ¾lx¿<>~‘¾®Ã?kÑú?Œt?W†;¿šÃ¼>•	n¾£H„½šŒ.¾•pB¦ÛB’?N Á¾…;¿…ÊÖ?/U¾-/„¾¼ôD?`ç¾ 9~À
-„?`?>+ù?L.[?TP@¿­ÐL¾GpR¾uÃm¾0Ì̾Cw?gƾ=¢¿­Ù½¿Á½µL½Òq&?+í@¾£½»EȽç!ô½›ˆ"¾œÏz?bŒ½þ9
 ¾¾Å‹¾,D?$%=?.•ø?LµÙ?Ý.¼fæ0?JÒ_¿”Ž¾8˜@½¯	¼¿‘Q¿Ž¿<>fݾ`ÖJ@ xT?K3¾
 Vf¾Åš¨>Q÷Ô¾L%á¾D–¿<>È?@›õ<Þµ€?+
º?2u£¾
-Í?j[&?ÖⱿ”‘,?10æ½iX?2k–?'Üq¾À¾%0$¾h¾ä=4ä@‘Áž?3
+Í?j[&?ÖⱿ”‘,?10æ½iX?2k–?'Üq¾À¾%0$¾h¾ä=4ä@‘Áž?3
 >¾ß˽ç®?>!f¼¾DH¾cÑì¾›Œ?Da½Äƒ?ᡨ¿É5@?Hu+:è^?ÚýL½`Bè¾GÀ‡½ŽçÚ¾ðF?c‚ì¾òª½éDr¾qu»?]à¾4Z½Ö•¾¿{òÔ¼ŒØà?â¼Í@¶F?=&½¥Ój?äΙ?7Þ.¾ÈƾXQa¾g½Â¼T ¾<”Q?f¯0?\_"½0JX?A
À?`éÔ?YÄÀ¾“ò¿ŒPž
 Ý“?$†½<0C>”¾3罪" ¿gw?fÓž¾-69?Þ/Þ?
æÓ?ñM¿“ùz?E
 <EFBFBD>¾ÁÀÀ?ášd¾Y$­?d±¸¾)’n?k®+?Mbñ?cª’?(Gâ?ZS¶?×¼Z?LP?Í$ÿ˜ýš¿ŒtM=—è¾f¿Ä¿<C384>´q¾)¾90<?åi_?_î¾)ŒË½.È=¢ô@¾?0™¿<E284A2> Û?9€X?DyŸ½²¨¾Í'Ͻ‹º?D¼È?`ì?6<>z¿„é

test/test_conversion.py

@@ -237,6 +237,15 @@ class TestConversion(unittest.TestCase):
         self.assertEqual(y.bands, 1)
         self.assertEqual(x.avg(), y.avg())
 
+        x = self.mono.bandfold(factor = 2)
+        self.assertEqual(x.width, self.mono.width / 2)
+        self.assertEqual(x.bands, 2)
+
+        y = x.bandunfold(factor = 2)
+        self.assertEqual(y.width, self.mono.width)
+        self.assertEqual(y.bands, 1)
+        self.assertEqual(x.avg(), y.avg())
+
     def test_byteswap(self):
         x = self.mono.cast("ushort")
         y = x.byteswap().byteswap()