Permalink
Browse files

Merge remote-tracking branch 'origin/7.28'

Conflicts:
	ChangeLog
	configure.in
  • Loading branch information...
2 parents 5ea29ba + 16996d8 commit f211ef1baf4a753fcf649c7f282c6d4ba6917926 @jcupitt committed Apr 17, 2012
Showing with 12 additions and 3 deletions.
  1. +5 −1 ChangeLog
  2. +1 −1 src/ip.h
  3. +5 −0 src/main.c
  4. +1 −1 src/mainw.c
View
@@ -1,9 +1,13 @@
started 7.29.0, 9/3/12
-- version bump
+
+started 7.28.3, 17/4/12
+- up max size of user defs, lets you work with larger groups
started 7.28.2, 10/4/12
- complex constant divided by real constant was wrong
- more self-tests
+- disable the libvips operation cache, it doesn't know about invalidate and
+ breaks various things
started 7.28.1, 12/3/12
- oop, add Array to private Type decoder (thanks MvGulik)
View
@@ -186,7 +186,7 @@ extern int statfs();
#define MAX_SYSTEM (50) /* Max number of args we allow */
#define MAX_BANDS (64) /* Max number of bands in image */
#define MAX_CSTACK (10) /* Max number of cursors we stack */
-#define MAX_STRSIZE (32768) /* Size of text for user defs */
+#define MAX_STRSIZE (100000) /* Size of text for user defs */
#define MAX_TRACE (1024) /* Biggest thing we print in trace */
#define MAX_SSTACK (40) /* Scope stack for parser */
#define VIPS_HOMEPAGE "http://www.vips.ecs.soton.ac.uk"
View
@@ -1053,6 +1053,11 @@ main( int argc, char *argv[] )
if( im_init_world( main_argv0 ) )
error_exit( "unable to start VIPS" );
+ /* We don't want the vips operation cache: it doesn't know about
+ * invalidate and breaks various things.
+ */
+ vips_cache_set_max( 0 );
+
/* Init i18n ... get catalogues from $VIPSHOME/share/locale so we're
* relocatable.
*/
View
@@ -991,7 +991,7 @@ mainw_open_done_cb( iWindow *iwnd, void *client,
return;
}
- /* If there's nothing left to load (we only had workspaes to load and
+ /* If there's nothing left to load (we only had workspaces to load and
* we've loaded them all) and the current workspace is smpty, we can
* junk it.
*/

0 comments on commit f211ef1

Please sign in to comment.