Merge branch 'master' into nip4

jcupitt · jcupitt · commit fcc56913c2b3 · 2023-10-17T09:34:12.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+started 8.9.1 15/2/23
+- fix build with --std=c99 [Schamschula]
+
 started 8.9.0 10/4/20
 - add find_trim
 
diff --git a/README.md b/README.md
@@ -6,7 +6,15 @@ Status](https://build.snapcraft.io/badge/jcupitt/nip2.svg)](https://build.snapcr
 nip2 is a GUI for the [libvips image processing 
 library](https://libvips.github.io/libvips). It's a little like a spreadsheet:
 you create a set of formula connecting your objects together, and on a change
-nip2 recalculates.
+nip2 will recalculate. This makes it convenient for developing image processing
+systems since you can watch pixels change as you adjust your equations.
+
+Because nip2 uses libvips as the image processing engine it can handle very
+large images and only needs a little memory. It scales to fairly complex
+workflows: I've used it to develop systems with more than 10,000 cells,
+analyzing images of many tens of gigabytes. It has a batch mode, so you
+can run any image processing system you develop from the command-line and
+without a GUI.
 
 [![Screenshot](screenshot.png)](screenshot.png)
 
diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([nip4], [8.9.0], [vipsip@jiscmail.ac.uk])
+AC_INIT([nip2], [8.9.1], [vipsip@jiscmail.ac.uk])
 
 # foreign stops complaints about a missing README (we use README.md instead)
 # and missing INSTALL (the standard Gnu INSTALL is not very useful)
@@ -17,7 +17,7 @@ dnl
 
 m4_define([nip_major_version], [8])
 m4_define([nip_minor_version], [9])
-m4_define([nip_micro_version], [0])
+m4_define([nip_micro_version], [1])
 m4_define([nip_version],
           [nip_major_version.nip_minor_version.nip_micro_version])
 
diff --git a/src/compile.c b/src/compile.c
@@ -788,7 +788,7 @@ compile_graph( Compile *compile, ParseNode *pn, PElement *out )
 			break;
 
 		case PARSE_CONST_BOOL:
-			PEPUTP( out, ELEMENT_BOOL, pn->con.val.bool );
+			PEPUTP( out, ELEMENT_BOOL, pn->con.val.bol );
 			break;
 
 		case PARSE_CONST_ELIST:
@@ -2496,7 +2496,7 @@ compile_pattern_condition( Compile *compile,
 	int i;
 
 	n.type = PARSE_CONST_BOOL;
-	n.val.bool = TRUE;
+	n.val.bol = TRUE;
 	node = tree_const_new( compile, n );
 
 	for( i = depth - 1; i >= 0; i-- ) {
diff --git a/src/ip.h b/src/ip.h
@@ -202,7 +202,7 @@ extern int statfs();
 #define IP_NAME PACKAGE "-" VERSION
 #define MAX_LINELENGTH (120)	/* Max chars we display of value */
 #define MAX_RECENT (10)		/* Number of recent items in file menu */
-#define NIP_COPYRIGHT "%s: &#0169;2018 Imperial College, London"
+#define NIP_COPYRIGHT "%s: &#0169;2023 libvips.org"
 
 /* Our stock_ids.
  */
diff --git a/src/lex.l b/src/lex.l
@@ -207,7 +207,7 @@ TRUE {
 	BEGIN BINARY;
 
 	yylval.yy_const.type = PARSE_CONST_BOOL;
-	yylval.yy_const.val.bool = TRUE;
+	yylval.yy_const.val.bol = TRUE;
 
 	return( TK_CONST );
 }
@@ -216,7 +216,7 @@ FALSE {
 	BEGIN BINARY;
 
 	yylval.yy_const.type = PARSE_CONST_BOOL;
-	yylval.yy_const.val.bool = FALSE;
+	yylval.yy_const.val.bol = FALSE;
 
 	return( TK_CONST );
 }
diff --git a/src/tree.h b/src/tree.h
@@ -126,7 +126,7 @@ struct _ParseConst {
 	union {
 		double num;
 		char *str;
-		gboolean bool;
+		gboolean bol;
 		int ch;
 	} val;
 };

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ TRUE {`
`207`	`207`	`BEGIN BINARY;`
`208`	`208`
`209`	`209`	`yylval.yy_const.type = PARSE_CONST_BOOL;`
`210`		`- yylval.yy_const.val.bool = TRUE;`
	`210`	`+ yylval.yy_const.val.bol = TRUE;`
`211`	`211`
`212`	`212`	`return( TK_CONST );`
`213`	`213`	`}`
`@@ -216,7 +216,7 @@ FALSE {`
`216`	`216`	`BEGIN BINARY;`
`217`	`217`
`218`	`218`	`yylval.yy_const.type = PARSE_CONST_BOOL;`
`219`		`- yylval.yy_const.val.bool = FALSE;`
	`219`	`+ yylval.yy_const.val.bol = FALSE;`
`220`	`220`
`221`	`221`	`return( TK_CONST );`
`222`	`222`	`}`