remove deprecated macros

Author: jcupitt

meson.build

@@ -1,6 +1,6 @@
 project('nip4', 'c',
   # ie. a major after nip2 8.9 for workspace save file versioning
-  version: '9.0.1-5',
+  version: '9.0.2-2',
   license: 'GPL',
   meson_version: '>=0.64',
   default_options: [

src/class.c

@@ -1066,7 +1066,7 @@ class_get_member_int(PElement *instance, const char *name, int *out)
 	if (!class_get_member_check(instance, name, "real",
 			(ClassGetFn) heap_get_real, &d))
 		return FALSE;
-	*out = VIPS_RINT(d);
+	*out = rint(d);
 
 	return TRUE;
 }

src/colour.c

@@ -270,9 +270,9 @@ colour_edit(GtkWidget *parent, Model *model)
 	double rgb[3];
 	colour_get_rgb(colour, rgb);
 	GdkRGBA initial_color = {
-		.red = VIPS_RINT(rgb[0] / 255.0),
-		.green = VIPS_RINT(rgb[1] / 255.0),
-		.blue = VIPS_RINT(rgb[2] / 255.0),
+		.red = rint(rgb[0] / 255.0),
+		.green = rint(rgb[1] / 255.0),
+		.blue = rint(rgb[2] / 255.0),
 		.alpha = 1.0
 	};
 

src/imageinfo.c

@@ -922,7 +922,7 @@ imageinfo_set_rgb(Imageinfo *imageinfo, double rgb[3])
 	 */
 	VipsPel value8[3];
 	for (int i = 0; i < 3; i++)
-		value8[i] = VIPS_RINT(rgb[i]);
+		value8[i] = rint(rgb[i]);
 	vips_image_init_fields(in->image, 1, 1, 3,
 		VIPS_FORMAT_UCHAR, VIPS_CODING_NONE,
 		VIPS_INTERPRETATION_sRGB, 1.0, 1.0);

src/infobar.c

@@ -278,7 +278,7 @@ infobar_status_update(Infobar *infobar)
 	vips_buf_rewind(&buf);
 
 	double zoom = imagewindow_get_zoom(infobar->win);
-	vips_buf_appendf(&buf, "Magnification %d%%", (int) VIPS_RINT(zoom * 100));
+	vips_buf_appendf(&buf, "Magnification %d%%", (int) rint(zoom * 100));
 	gtk_label_set_text(GTK_LABEL(infobar->mag), vips_buf_all(&buf));
 
 	// queue bg update of pixel value (this must be off the GUI thread)

src/plotwindow.c

@@ -132,7 +132,7 @@ plotwindow_motion(GtkEventControllerMotion *self,
 	double data_x, data_y;
 	if (plotdisplay_gtk_to_data(plotdisplay, x, y, &data_x, &data_y)) {
 		Plot *plot = plotwindow->plot;
-		int index = VIPS_RINT(data_x);
+		int index = rint(data_x);
 
 		set_glabel(plotwindow->x, "%9.1f", data_x);
 		set_glabel(plotwindow->y, "%9.1f", data_y);

src/workspaceview.c

@@ -162,11 +162,13 @@ workspaceview_tick(GtkWidget *widget, GdkFrameClock *frame_clock,
 		wview->row_shadow_elapsed += dt;
 
 		// 0-1 progress in animation
-		double duration = wview->should_animate ? workspaceview_animation_duration : wview->row_shadow_elapsed;
-		double t = VIPS_CLIP(0, ease_out_cubic(wview->row_shadow_elapsed / duration), 1);
+		double duration = wview->should_animate ?
+			workspaceview_animation_duration : wview->row_shadow_elapsed;
+		double t = VIPS_CLIP(0,
+			ease_out_cubic(wview->row_shadow_elapsed / duration), 1);
 
 		workspaceview_set_row_shadow_height(wview,
-			VIPS_RINT(t * wview->max_row_shadow_height));
+			rint(t * wview->max_row_shadow_height));
 
 		if (t != 1.0)
 			finished = FALSE;
@@ -1106,8 +1108,8 @@ workspaceview_drag_update(GtkEventControllerMotion *self,
 
 			// don't let x/y go -ve (layout hates it)
 			columnview_animate_to(wview->drag_cview,
-				VIPS_CLIP(0, VIPS_RINT(obj_x), wview->width - w),
-				VIPS_CLIP(0, VIPS_RINT(obj_y), wview->height - h));
+				VIPS_CLIP(0, rint(obj_x), wview->width - w),
+				VIPS_CLIP(0, rint(obj_y), wview->height - h));
 
 			// top, since we want the titlebar to be visible
 			view_scrollto(VIEW(wview->drag_cview), MODEL_SCROLL_TOP);