Simplify @background initialization

kleisauke · Jan 23, 2025 · 4cd6885 · 4cd6885
1 parent aa6db76
commit 4cd6885
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/libvips/conversion/arrayjoin.c b/libvips/conversion/arrayjoin.c
@@ -64,7 +64,7 @@ typedef struct _VipsArrayjoin {
 	VipsArrayImage *in;
 	int across;
 	int shim;
-	VipsArea *background;
+	VipsArrayDouble *background;
 	VipsAlign halign;
 	VipsAlign valign;
 	int hspacing;
@@ -224,7 +224,7 @@ vips_arrayjoin_build(VipsObject *object)
 	 */
 	band = (VipsImage **) vips_object_local_array(object, n);
 	if (vips__bandalike_vec(class->nickname,
-			in, band, n, join->background->n))
+			in, band, n, VIPS_AREA(join->background)->n))
 		return -1;
 	in = band;
 
@@ -452,9 +452,7 @@ vips_arrayjoin_init(VipsArrayjoin *join)
 {
 	/* Init our instance fields.
 	 */
-	join->background =
-		vips_area_new_array(G_TYPE_DOUBLE, sizeof(double), 1);
-	((double *) (join->background->data))[0] = 0.0;
+	join->background = vips_array_double_newv(1, 0.0);
 }
 
 static int

diff --git a/libvips/conversion/join.c b/libvips/conversion/join.c
@@ -81,7 +81,7 @@ typedef struct _VipsJoin {
 	VipsDirection direction;
 	gboolean expand;
 	int shim;
-	VipsArea *background;
+	VipsArrayDouble *background;
 	VipsAlign align;
 } VipsJoin;
 
@@ -286,9 +286,7 @@ vips_join_init(VipsJoin *join)
 {
 	/* Init our instance fields.
 	 */
-	join->background =
-		vips_area_new_array(G_TYPE_DOUBLE, sizeof(double), 1);
-	((double *) (join->background->data))[0] = 0.0;
+	join->background = vips_array_double_newv(1, 0.0);
 }
 
 /**