Skip to content

Commit 5b0847d

Browse files
jcupittjcupitt
committed
Merge branch 'master' into nip3
2 parents 4f95e3d + c924df0 commit 5b0847d

File tree

509 files changed

+99922
-453
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

509 files changed

+99922
-453
lines changed

‎.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
INSTALL
12
test-driver
23
test/test-suite.log
34
test/test_all.sh.log
@@ -7,6 +8,7 @@ nip2-*.tar.gz
78
*.o
89
.*.swp
910
TAGS
11+
tags
1012
Makefile
1113
scan
1214
Makefile.in
@@ -28,12 +30,10 @@ po/POTFILES
2830
fred
2931
po/Makefile.in.in
3032
src/.deps/
31-
src/dummy.c
3233
src/gtksheet-marshal.c
3334
src/gtksheettypebuiltins.c
3435
src/lex.c
3536
src/nip2
36-
src/nip2-icon.rc
3737
src/parse.c
3838
src/parse.h
3939
stamp-h1

‎.snapcraft.yaml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
name: vips-nip2
2+
icon: share/nip2/data/vips-128.png
3+
version: 'master'
4+
summary: An image-processing spreadsheet.
5+
description: |
6+
nip2 is half-way between a spreadsheet and a paint program.
7+
It's terrible for retouching photographs, but very handy for automating image
8+
processing tasks.
9+
10+
It can process multi-gigabyte images efficiently. It has good support for
11+
scientific image formats. It's much faster and more flexible than tools like
12+
ImageJ.
13+
14+
This snap is git master nip2 built with git master libvips.
15+
16+
grade: devel
17+
confinement: strict
18+
19+
apps:
20+
nip2:
21+
command: desktop-launch nip2
22+
desktop: share/applications/nip2.desktop
23+
plugs: [x11, home, gsettings]
24+
25+
parts:
26+
vips-part:
27+
source: https://github.com/jcupitt/libvips
28+
source-branch: master
29+
source-type: git
30+
plugin: autotools
31+
build-packages:
32+
- gtk-doc-tools
33+
- gobject-introspection
34+
- intltool
35+
- libgirepository1.0-dev
36+
- libglib2.0-dev
37+
- libfftw3-dev
38+
- libexpat1-dev
39+
- libxml2-dev
40+
- libjpeg-turbo8-dev
41+
- libtiff5-dev
42+
- libopenslide-dev
43+
- libopenexr-dev
44+
- libcfitsio-dev
45+
- libmatio-dev
46+
- libgif-dev
47+
- libpoppler-dev
48+
- librsvg2-dev
49+
- libmagickcore-6.q16-dev
50+
- libexif-dev
51+
- libgsf-1-dev
52+
- liblcms2-dev
53+
- libpng12-dev
54+
- libfontconfig1-dev
55+
- libgdk-pixbuf2.0-dev
56+
- libfreetype6-dev
57+
- libxft-dev
58+
- libcairo2-dev
59+
- libpango1.0-dev
60+
- liborc-0.4-dev
61+
- libwebp-dev
62+
63+
nip2-part:
64+
source: https://github.com/jcupitt/nip2
65+
source-branch: master
66+
source-type: git
67+
plugin: autotools
68+
build-packages:
69+
- gobject-introspection
70+
- intltool
71+
- libgirepository1.0-dev
72+
- libglib2.0-dev
73+
- libgtk2.0-dev
74+
- libx11-dev
75+
- libxml2-dev
76+
- flex
77+
- bison
78+
- libfftw3-dev
79+
- libgoffice-0.8-dev
80+
- libgsl-dev
81+
- libgvc6
82+
after: [desktop-gtk2, vips-part]
83+

‎ChangeLog

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,75 @@
1+
started 8.9.0 10/4/20
2+
- add find_trim
3+
4+
started 8.7.1 13/11/18
5+
- fix uint status bar pixels >2**31 [Rob Erdmann]
6+
- fix crash on redhat [bgilbert]
7+
8+
started 8.7.0 22/5/18
9+
- added vips7compat.h include for libvips 8.7
10+
- more output for -V to help debugging CLI mode
11+
- revised Text widget
12+
- added Canny
13+
- Sobel uses the new vips_sobel() operator
14+
- add mitchell kernel
15+
- add 8.6 compat
16+
17+
started 8.6.1 1/5/18
18+
- better enum display in header
19+
20+
started 8.6.0 16/8/17
21+
- add scRGB support
22+
- improve radiance support
23+
- add composite to alpha menu
24+
- add Image / Select / Fill
25+
- add combine mode to indexed histogram
26+
- better compat handling
27+
28+
started 8.5.1 22/1/17
29+
- fix a crash bug
30+
- make separate Image / Alpha menu, add Add, Extract, Drop
31+
32+
started 8.5 24/1/17
33+
- add max_slope to lhist
34+
- gaussnoise goes via vips8 now
35+
- add snake option to array join [Joe Padfield]
36+
- parse_float was broken for numbers starting "0."
37+
- add alpha section to Image / Band menu ... Flatten, Premultiply,
38+
Unpremultiply, Blend
39+
- add Entropy to hist menu
40+
41+
started 8.4.1 25/9/16
42+
- simplify nip2-icon.rc build, bgilbert
43+
44+
started 8.4
45+
- added Perlin and Worley menu items
46+
47+
started 8.3.1 on 19/5/16
48+
- disable debug by default, thanks Benjamin
49+
- configure changes to help win64
50+
- improve middle-drag in ws and image view
51+
- be more careful about the name of the image file we remove on close
52+
- simpler system for positioning new columns
53+
- rename boostrap.sh as autogen to help snapcraft
54+
55+
started 8.3.0 on 28/3/16
56+
- move path search stuff into _convert from _magick
57+
- added autotrace menu item
58+
- resize now uses vips_resize() behind the scenes
59+
- added Kernel type for picking interpolators
60+
61+
started 8.2.1 on 4/12/16
62+
- tiny improvement to idle handling
63+
- added R2 to linreg and linregw
64+
- fixed vips_call for image array args
65+
- changed default unsharp settings to be less brutal and to ban -ve sharpness
66+
67+
started 8.2 on 4/11/15
68+
- version bump to match vips
69+
- fix icc_import with RGBA images
70+
- added mapim and Image / Transform / Map
71+
- added Filter / Coordinate Transform ... polar and rect in there
72+
173
started 8.0 on 3/5/15
274
- version bump for vips-8.0 release
375
- fix a race in Makefile.am, thanks nieder

‎Makefile.am

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,33 @@ SUBDIRS = \
66
po
77

88
EXTRA_DIST = \
9-
bootstrap.sh \
9+
autogen.sh \
1010
doc \
1111
proj \
1212
m4 \
13-
nip2.desktop.in \
14-
nip2.xml \
15-
nip2.appdata.xml
13+
screenshot.png \
14+
nip3.desktop.in \
15+
nip3.xml \
16+
nip3.appdata.xml
1617

17-
nip2appdir = $(datadir)/applications
18+
nip3appdir = $(datadir)/applications
1819

19-
nip2mimedir = $(datadir)/mime/packages
20+
nip3mimedir = $(datadir)/mime/packages
2021

21-
nip2appdatadir = $(datadir)/appdata
22+
nip3appdatadir = $(datadir)/appdata
2223

23-
nip2app_DATA = nip2.desktop
24+
nip3app_DATA = nip3.desktop
2425

25-
nip2mime_DATA = nip2.xml
26+
nip3mime_DATA = nip3.xml
2627

27-
nip2appdata_DATA = nip2.appdata.xml
28+
nip3appdata_DATA = nip3.appdata.xml
2829

2930
install-exec-hook:
30-
-rm -rf ${DESTDIR}$(datadir)/doc/nip2
31-
$(mkinstalldirs) ${DESTDIR}$(datadir)/doc/nip2
32-
-cp -r ${top_srcdir}/doc/html ${top_srcdir}/doc/pdf ${DESTDIR}$(datadir)/doc/nip2
33-
-rm -rf ${DESTDIR}$(datadir)/doc/nip2/html/CVS
34-
-rm -rf ${DESTDIR}$(datadir)/doc/nip2/pdf/CVS
31+
-rm -rf ${DESTDIR}$(datadir)/doc/nip3
32+
$(mkinstalldirs) ${DESTDIR}$(datadir)/doc/nip3
33+
-cp -r ${top_srcdir}/doc/html ${top_srcdir}/doc/pdf ${DESTDIR}$(datadir)/doc/nip3
34+
-rm -rf ${DESTDIR}$(datadir)/doc/nip3/html/CVS
35+
-rm -rf ${DESTDIR}$(datadir)/doc/nip3/pdf/CVS
3536

3637
if UPDATE_DESKTOP
3738
install-data-hook:
@@ -47,7 +48,7 @@ dist-hook:
4748

4849
uninstall-hook:
4950
# make sure we have write permission for 'rm'
50-
-chmod -R u+w ${DESTDIR}$(datadir)/doc/nip2
51-
-rm -rf ${DESTDIR}$(datadir)/doc/nip2
51+
-chmod -R u+w ${DESTDIR}$(datadir)/doc/nip3
52+
-rm -rf ${DESTDIR}$(datadir)/doc/nip3
5253
-$(UPDATE_MIME_DATABASE) ${DESTDIR}$(datadir)/mime
5354
-$(UPDATE_DESKTOP_DATABASE) ${DESTDIR}$(datadir)/applications

‎README.md

Lines changed: 37 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,57 @@
1-
# nip2 - a user interface for the VIPS image processing library
1+
# nip2 --- a user interface for libvips
22

3-
nip2 is a GUI for the [VIPS image processing
4-
library](http://www.vips.ecs.soton.ac.uk). It's a little like a spreadsheet:
3+
[![Snap
4+
Status](https://build.snapcraft.io/badge/jcupitt/nip2.svg)](https://build.snapcraft.io/user/jcupitt/nip2)
5+
6+
nip2 is a GUI for the [libvips image processing
7+
library](https://libvips.github.io/libvips). It's a little like a spreadsheet:
58
you create a set of formula connecting your objects together, and on a change
69
nip2 recalculates.
710

8-
# Building nip2 from source
9-
10-
In the nip2 directory you should just be able to do:
11-
12-
$ ./configure
13-
$ make
14-
$ sudo make install
11+
[![Screenshot](screenshot.png)](screenshot.png)
1512

16-
By default this will install files to `/usr/local`.
13+
## Installing
1714

18-
See the Dependencies section below for a list of the things that
19-
nip2 needs in order to be able to build.
15+
You can probably install nip2 via your package manager. For
16+
Windows and OS X, you can download a binary from the [nip2 releases
17+
page](https://github.com/libvips/nip2/releases). If you have to build from
18+
source, see the section below.
2019

21-
We have detailed guides on the wiki for [building on
22-
Windows](http://www.vips.ecs.soton.ac.uk/index.php?title=Build_on_windows)
23-
and [building on OS
24-
X](http://www.vips.ecs.soton.ac.uk/index.php?title=Build_on_OS_X).
25-
26-
If you downloaded from GIT you'll need:
20+
## Documentation
2721

28-
$ ./bootstrap.sh
22+
nip2 comes with a 50-page manual --- press F1 or Help / Contents in the
23+
program to view it.
2924

30-
first to build the configure system.
31-
32-
# Dependencies
33-
34-
nip2 needs vips, gtk2 and libxml2 at runtime and flex/bison at compile time.
25+
## Building nip2 from source
3526

36-
If you have fftw3, gsl, goffice, libgvc you get extra optional, but useful,
37-
features.
27+
In the nip2 directory you should just be able to do the usual:
3828

39-
# Tips
29+
```
30+
./configure
31+
make
32+
sudo make install
33+
```
4034

41-
production build with
35+
By default this will install files to `/usr/local`. Check the summary at the
36+
end of `configure` and make sure you have all of the features you want.
4237

43-
./configure --prefix=/home/john/vips
44-
45-
debug build with
46-
47-
CFLAGS="-g -Wall" ./configure --prefix=/home/john/vips
48-
49-
(--enable-debug turns on and off automatically with development / production
50-
minor version numbers)
51-
52-
leak check
53-
54-
export G_DEBUG=gc-friendly
55-
export G_SLICE=always-malloc
56-
valgrind --suppressions=/home/john/nip2.supp \
57-
--leak-check=yes \
58-
nip2 ... > nip2-vg.log 2>&1
38+
If you downloaded from GIT you'll need:
5939

60-
memory access check
40+
```
41+
./autogen.sh
42+
```
6143

62-
valgrind --suppressions=/home/john/nip2.supp \
63-
--leak-check=no --db-attach=yes \
64-
nip2 ... > nip2-vg.log 2>&1
44+
first to build the configure system.
6545

66-
or put "--suppressions=/home/john/nip2.supp" into ~/.valgrindrc
46+
nip2 needs vips, gtk2 and libxml2 at runtime and flex/bison at compile time.
47+
If you have fftw3, gsl, goffice, libgvc you get extra features.
6748

68-
profiling
49+
### snapcraft
6950

70-
valgrind --tool=callgrind \
71-
--suppressions=/home/john/nip2.supp \
72-
nip2 ... > nip2-vg.log 2>&1
51+
Rebuild snap with:
7352

74-
Disclaimer: No guarantees of performance accompany this software, nor is any
75-
responsibility assumed on the part of the authors. Please read the licence
76-
agreement.
53+
```
54+
snapcraft cleanbuild
55+
```
7756

57+
Though it's done automatically on a push.

0 commit comments

Comments
 (0)