Skip to content

Commit

Permalink
Merge branch 'master' of github.com:libvips/nip2 into fix-marshal-types
Browse files Browse the repository at this point in the history
  • Loading branch information
jcupitt committed Jan 7, 2019
2 parents 3caba99 + 1b204c9 commit 3668f02
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
@@ -1,3 +1,6 @@
started 8.7.1 13/11/18
- fix uint status bar pixels >2**31 [Rob Erdmann]

started 8.7.0 22/5/18
- added vips7compat.h include for libvips 8.7
- more output for -V to help debugging CLI mode
Expand Down
5 changes: 5 additions & 0 deletions README.md
Expand Up @@ -13,6 +13,11 @@ Windows and OS X, you can download a binary from the [nip2 releases
area](https://github.com/libvips/nip2/releases). Only read on if you want to
compile yourself from source.

# Documentation

nip2 comes with a 50-page manual --- press F1 or Help / Contents in the
program to view it.

# Building nip2 from source

In the nip2 directory you should just be able to do:
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.

AC_INIT([nip2], [8.7.0], [vipsip@jiscmail.ac.uk])
AC_INIT([nip2], [8.7.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)
Expand All @@ -17,7 +17,7 @@ dnl

m4_define([nip_major_version], [8])
m4_define([nip_minor_version], [7])
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])

Expand Down
2 changes: 1 addition & 1 deletion src/statusview.c
Expand Up @@ -402,7 +402,7 @@ statusview_mouse_band( StatusviewBand *svb, void *e )
break;

case IM_BANDFMT_UINT:
set_glabel( svb->val, "%d",
set_glabel( svb->val, "%u",
((unsigned int *)e)[svb->bandno] );
break;

Expand Down

0 comments on commit 3668f02

Please sign in to comment.