sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,421 Commits 1 Branch 0 Tags 76 MiB
8891d6dc29
Commit Graph

252 Commits

Author SHA1 Message Date
John Cupitt
feca00958c seems to be sort-of working! 2016-08-16 18:33:48 +01:00
John Cupitt
eb49347abb start adding better filename handling 2016-08-16 16:22:38 +01:00
John Cupitt
039997780b bump API version for new function 
thanks Benjamin
 2016-08-05 08:52:50 +01:00
John Cupitt
40f01fdb2b Merge branch 'master' into add-magick7 2016-08-04 14:15:46 +01:00
John Cupitt
b0e3035590 small cleanups to svgz support 2016-08-01 14:28:35 +01:00
John Cupitt
fe615af233 Merge branch 'add-svgload-svgz-detection' of https://github.com/felixbuenemann/libvips into felixbuenemann-add-svgload-svgz-detection 2016-08-01 12:09:35 +01:00
John Cupitt
b5781a5760 Merge branch '8.3' 2016-07-30 10:57:40 +01:00
John Cupitt
88148318eb fix performance regression 
the extra check on bandfmt in sizeof() in 8.3.2 was causing some performance
problems ... move the check to file read, so we only do it once
per image, not once per pixel or scanline

thanks Lovell!
 2016-07-30 10:51:54 +01:00
John Cupitt
12a32b23f1 Merge branch 'master' into add-magick7 2016-07-25 12:40:43 +01:00
John Cupitt
23d9bad581 doc improvements 2016-07-13 09:24:41 +01:00
John Cupitt
40f8a8af85 add autoconf stuff 
todo:

- copypaste magick2vips into magick7load

- move to magick7 API

- test with magick6 and GM too, of course

see https://github.com/jcupitt/libvips/issues/480
 2016-07-08 10:45:29 +01:00
Felix Bünemann
5ab0001ec6 Add configure check for zlib with inflateInit2 
and replace old unused and poorly named FIND_ZIP. The new code prefers
pkgconfig and only falls back to manual detection if needed.

This also prioritizes detected zlib flags and includes to be preferred
over the ones that are added by pkgconfig for libpng, tifflib etc. which
would otherwise have caused the system default zlib to be used.
 2016-06-27 03:03:45 +02:00
John Cupitt
98bceec23f small dzsave cleanups 
- rename compression_level as deflate_level to match libgsf convention
- use libgsf enums for GSF_ZIP_STORED, etc.
- configure-time checks for zip64 and deflate-level
- off-topic: rename NEED_TYPE_INIT as HAVE_TYPE_INIT for consistency
 2016-06-09 09:36:37 +01:00
Felix Bünemann
8b598d5b77 Run python tests without make install 
In order to do this, we need to add some stub gi module init files which
allow us to extend the gi overrides path.
 2016-06-02 23:10:14 +02:00
Felix Bünemann
ffa4f6b720 Lower librsvg version requirement to 2.34 
This is the first version that works properly with gtk3. Lowering the
requirement enables SVG support on older Linux distributions like
Ubuntu Precise LTS or Debian Wheezy.
 2016-05-27 00:55:32 +02:00
John Cupitt
91aa288a44 break up acinclude.m4 
it's now in a more maintainable set of .m4 files in m4-safe
 2016-05-18 10:41:05 +01:00
John Cupitt
7ec63c4451 more vips image read fixing 
thanks AFL!
 2016-05-18 09:00:30 +01:00
Felix Bünemann
c5dfc1f840 Fix VIPS_LIBDIR being "NONE" without --prefix 
If the --prefix switch is not given to configure, the prefix variable is
NONE, so we need to the the default value from ac_default_prefix first.
 2016-05-18 04:28:59 +02:00
Felix Bünemann
dcbd8397a5 Warn if the gi module could not be loaded 2016-05-18 04:28:58 +02:00
Felix Bünemann
e24334beb2 Disable vips7 SWIG bindings for python3 
because they cause a compile error (see issue #334).
 2016-05-18 04:28:58 +02:00
Felix Bünemann
6956bcf8a4 Fix several problems with gi path warnings 
* Do not warn when the prefix appears to be a homebrew cellar.
* Fix configure errors when python is not detected
* Fix configure errors when pygobject is installed in prefix but
  not present in the python `sys.path`.
* Use the actual overrides path, instead of the gi module path.
 2016-05-18 04:28:58 +02:00
Felix Bünemann
f0a5ac5bbc Vendor python.m4 to fix wrong multiarch exec paths 
The python.m4 that ships with automake hardcodes the library path for
platfrom dependent files to `lib`, which is wrong for multiarch systems.

Instead we import the `m4/python.m4` from pygobject, which does not have
this problem and also ensures we have the same behavior as pygobject
which we are depending on for pyvips8.

Due to this change some minor changes to how the `bootstrap.sh` script
clean up the `m4` folder where needed.

The python search order has been modified to prefer the default python
over python2 over python3.
 2016-05-18 04:28:58 +02:00
John Cupitt
77c9616952 oh argh last change 2016-05-17 13:56:16 +01:00
John Cupitt
9057328208 reword config messages 2016-05-17 13:55:37 +01:00
John Cupitt
8b592585d7 try to py install help 
at the end of configure, vips now tries to suggest typelib and overrides
install hints
 2016-05-17 10:52:11 +01:00
John Cupitt
8ed8515c49 Merge pull request #439 from felixbuenemann/fix-minimum-required-poppler-version 
Fix poppler version requirement, add loader check
 2016-05-09 10:17:16 +01:00
John Cupitt
d307e38863 add FIND_LIBWEBP 
some platforms are missing a .pc file for libwebp ... add a FIND_LIBWEBP
macro as a fallback

see https://github.com/jcupitt/libvips/issues/440
 2016-05-09 09:51:05 +01:00
Felix Bünemann
bec6b174c9 Fix poppler version requirement, add loader check 
This fixes the poppler-glib version requirement to version 0.16, which
is the lowest version that compiles and works properly with pdfload.

Also added a check for pdfload and enabled testing on Travis CI.
 2016-05-09 00:16:48 +02:00
John Cupitt
48ef215479 tiny fixups for the webp commit 
just small formatting changes, plus an unneeded var

see

	https://github.com/jcupitt/libvips/pull/430
 2016-05-02 09:55:16 +01:00
John Cupitt
c88b94cb29 Merge pull request #430 from felixbuenemann/use-webp-advanced-encoding-api 
Use WebP Advanced Encoding API and make it tunable
 2016-05-01 19:51:12 +01:00
John Cupitt
73080bb4a5 try to improve mozjpeg test 
save LIBS around test, test for ABI not header

see https://github.com/jcupitt/libvips/issues/431
 2016-04-26 10:41:04 +01:00
John Cupitt
d11a7960b7 add support for giflib5 
gifload.c now works with giflib5, and well as giflib4 ... forced by
ubuntu's switch to giflib5 in 16.04

see https://github.com/jcupitt/libvips/issues/407
 2016-04-25 09:29:25 +01:00
Felix Bünemann
874cc8b31b Restore webpsave libwebp-0.1.3 compatility 
* Add configure check for libwebp >= 0.1.3
* Add custom memory writer using GNOME memory allocation
* Add various ABI checks and warnings for unsupported features:
** smart_subsample and near_lossless require 0.5.0
** lossless requires at least 0.1.99
 2016-04-24 18:28:53 +02:00
John Cupitt
23eaf93867 fix build with graphicsmagick 
GM is still using the old page interface of subimage/subrange, IM has
deprecated that in favour of scene/number_scenes

we were accidentally just supporting the new IM system ... this change
adds support for GM as well, plus a configure test to pick one

see https://github.com/jcupitt/libvips/issues/423
 2016-04-18 15:21:11 +01:00
John Cupitt
3517037f1e try and only look for giflib4 
see https://github.com/jcupitt/libvips/issues/407
 2016-04-18 12:34:40 +01:00
John Cupitt
78c8a8f99f Merge pull request #421 from bgilbert/poppler-version 
Fix required poppler-glib version in AC_MSG_WARN()
 2016-04-15 08:45:50 +01:00
John Cupitt
1e44ab5d39 version bump for 8.3.1 2016-04-15 08:42:36 +01:00
Benjamin Gilbert
2025b36958 fix required poppler-glib version in AC_MSG_WARN() 2016-04-14 17:38:54 -04:00
John Cupitt
6368ab0649 add switches to disable rad, analyze and ppm 
vips has built-in support for rad, analyze and ppm ... add configure
switches to disable these readers

useful to reduce the attack surface in some applications
 2016-03-12 16:48:27 +00:00
John Cupitt
d79407f285 almost there 
not unpacking correctly though
 2016-02-11 08:35:29 +00:00
John Cupitt
153886d2eb add svgload 
load from bubffer is not working though, strange ... it seems to be
generating a 16-biit image?
 2016-02-09 11:01:12 +00:00
John Cupitt
8da4e706dd start adding poppler support 2016-02-07 23:33:43 +00:00
John Cupitt
67f3ecfd8d wire up to resize / similarity 
still need tests
 2016-01-29 15:23:00 +00:00
John Cupitt
65930cf866 version bump 2016-01-26 16:45:56 +00:00
John Cupitt
52384606dd bump version for new C++ patch 2016-01-12 17:12:46 +00:00
John Cupitt
e6cbdbb516 add a stub for compat 
see https://github.com/jcupitt/libvips/issues/361
 2016-01-01 10:58:53 +00:00
John Cupitt
a57cccbf0f fix with orc-0.4.11 2015-12-08 15:33:57 +00:00
John Cupitt
40173838d1 use atan2 and hypot more 
might be a little quicker
 2015-11-19 14:34:03 +00:00
John Cupitt
b853012787 add memory.h to Python API 
this makes the memory high water visible to Python, handy for testing
 2015-11-04 10:09:06 +00:00
John Cupitt
4d95f4512c Merge branch '8.1' 
Conflicts:
	ChangeLog
	configure.ac
	doc/libvips-docs.xml
 2015-10-13 14:47:37 +01:00
John Cupitt
2b2ac1b077 rename vips-8.0 as vips-8.1 
also bump configure version

thanks Danilo!
 2015-10-13 08:55:54 +01:00
John Cupitt
3e16302701 bump version to 8.2 for the next cycle 2015-10-07 14:55:28 +01:00
John Cupitt
7aebe94b9e remove odd/even debug rule 
we had debugging auto-enable in odd minor releases, get rid of this
 2015-07-10 13:41:12 +01:00
John Cupitt
90a47b0cad start 8.1 2015-05-07 18:15:07 +01:00
John Cupitt
8ba680605a soname bump, test suite improvements 
test suite now tests load from buffer and save to buffer

test suite adapts for differences in newer libMagick

bump soname for safety
 2015-05-05 09:40:29 +01:00
John Cupitt
dbdcf91171 remove some stray decls 
see https://github.com/jcupitt/libvips/issues/288

version bump as well
 2015-05-04 19:41:08 +01:00
John Cupitt
6c6d0d6b78 fix some compiler warnings 2015-04-25 17:39:16 +01:00
John Cupitt
d484161c05 bump libtool version number 2015-04-24 14:07:35 +01:00
Lovell Fuller
00e27def8e Expose new/forthcoming features of mozjpeg/libjpeg-turbo 
Runtime detection via JPEG extension parameters
Compile-time detection via J_BOOLEAN_PARAM of jpeglib.h
 2015-04-14 20:24:31 +01:00
John Cupitt
8f7c2c7110 sort out alpha going to and from 16-bit 
rewritten sRGB <-> scRGB so that 16-bit alpha is scaled to float 8
 2015-02-12 17:50:38 +00:00
John Cupitt
244ab301f7 start final push for vips 8 2015-02-11 17:01:02 +00:00
John Cupitt
346a9e70c0 remove --disable-cxx flag 
it was getting too hard to support :( automake now generates libtool
lines before configure runs, so it can't know we don't want a C++ link

see https://github.com/jcupitt/libvips/issues/231
 2015-02-07 10:37:13 +00:00
John Cupitt
3d902d2feb improvements to python configure 2015-02-06 14:54:52 +00:00
John Cupitt
9d11c02e35 version bump 2015-02-06 13:39:39 +00:00
John Cupitt
1ddd7faa01 fix up pygobject tests 
again
 2015-01-12 13:03:51 +00:00
John Cupitt
32625146db cpp can set enums from strings 
eg.

	set("extend", "copy")->
 2014-12-30 11:27:04 +00:00
John Cupitt
e93e27cd6e bump pygobject version check 
now asks for >=3.12 since we seem to fail on 3.10

see https://github.com/jcupitt/libvips/issues/199
 2014-12-27 09:58:51 +00:00
John Cupitt
01b409bdba soname bump 
to reflect changes in vips8 API, see

https://github.com/jcupitt/libvips/issues/211
 2014-12-26 16:53:11 +00:00
John Cupitt
366e7e3a5e add gobject to Requires: line 
vips C and C++ programs can link directly against things in gobject
without appearing to, for example:

	a = VIPS_OBJECT( b );

the macro will expand to include a g_type_check_instance_is_a(). So we
have to have gobject-2.0 in the link line of things like:

	g++ -g -Wall hello8.cc `pkg-config vips-cpp --cflags --libs`

see also

	https://github.com/jcupitt/libvips/issues/196
 2014-12-24 10:10:14 +00:00
John Cupitt
1b86de44f4 "make check" works uninstalled 
and skips tests for missing features
 2014-12-22 10:35:26 +00:00
John Cupitt
abdd98409d add configure option for pyvips8 
it tests for pygobject as well
 2014-12-18 09:15:58 +00:00
John Cupitt
71bb0e81d1 better Vips.py install 
more work on test_convolution
 2014-12-15 18:12:47 +00:00
John Cupitt
7f34722f9f update gtk-doc Makefile.am 
"make check" now works in docs
 2014-12-12 15:51:07 +00:00
John Cupitt
dbc404ed66 fix nip2 build on win 
we have to statically link on win if we are using cfitsio ... make sure
-ljpeg gets into the link line, it doesn't have a .pc

https://github.com/jcupitt/libvips/issues/196
 2014-11-29 14:32:08 +00:00
John Cupitt
ee4416040b make a test suite 
put the python and non-nip2 bits of the nip2 suite together

some test images too
 2014-11-19 15:01:28 +00:00
John Cupitt
8267dd2621 naming improvements 
and test_overloads.cpp has started working
 2014-11-05 14:04:46 +00:00
John Cupitt
bbf49be063 cleanup and bump to 7.42 2014-11-03 12:01:53 +00:00
John Cupitt
4f588ce908 package up new vips8 C++ API 2014-10-27 13:41:44 +00:00
John Cupitt
b2de6d983c add build rules for new py binding 2014-10-14 14:56:49 +01:00
John Cupitt
e50c7f4a93 oops 2014-10-14 10:48:27 +01:00
John Cupitt
927b2d7954 remove cimg and gmic 
move this to a plugin, it's too big for the core library
 2014-10-08 17:51:07 +01:00
John Cupitt
ca2ae681cd add --with-gmic configure option 2014-10-07 14:54:53 +01:00
John Cupitt
4eeacd3c1f fix intro header list 2014-09-11 19:28:17 +01:00
John Cupitt
b746984318 Merge branch '7.40' 
Conflicts:
	ChangeLog
	configure.ac
 2014-09-08 19:49:09 +01:00
John Cupitt
a8becfc9d4 bump version to 7.40.8 2014-09-08 19:47:01 +01:00
Lovell Fuller
a620170362 Prevent empty else block in configure 
Enables libvips to compile on RHEL/Centos 6
 2014-09-08 18:56:51 +01:00
John Cupitt
6f8b5c6745 bring the rest of the API into python 2014-09-05 23:18:16 +01:00
John Cupitt
180142b2b1 Merge branch '7.40' 
Conflicts:
	ChangeLog
	configure.ac
 2014-08-27 14:00:54 +01:00
John Cupitt
a75ddfbd5a fix matlab load 
oops, width and height were swapped
 2014-08-21 22:01:40 +01:00
John Cupitt
b24cbb492c Merge remote-tracking branch 'origin/7.40' 
Conflicts:
	ChangeLog
	TODO
	configure.ac
	libvips/foreign/vipspng.c
 2014-08-12 13:41:52 +01:00
John Cupitt
2f72a9925f more docs work 2014-08-12 13:37:16 +01:00
John Cupitt
32a8fe117e start working on --disable-deprecated 
need to move im_conv() etc to classes to finish this
 2014-07-25 18:06:52 +01:00
John Cupitt
a338a48c63 fix a race in im_maxpos_avg() 2014-07-25 13:52:36 +01:00
John Cupitt
c2ae9f30c6 fix vips_rawsave_fd() 
see https://github.com/jcupitt/libvips/issues/143

thanks aferrero2707
 2014-07-04 13:58:47 +01:00
John Cupitt
8c82ffb865 fix interlaced thumbnails 
we need to cache the thumbnail before we write it in case the writer
needs to make several passes

see https://github.com/jcupitt/libvips/issues/140
 2014-06-30 12:07:00 +01:00
John Cupitt
a44fd6f72f oops 2014-06-28 10:02:20 +01:00
John Cupitt
1ad9d246fe bump soname 
see https://github.com/jcupitt/libvips/issues/139
 2014-06-28 09:42:56 +01:00
John Cupitt
04d130828f add --enable-docs configure option 
so you can now stop all docs installing, freebsd likes this
 2014-06-27 14:56:11 +01:00
John Cupitt
243c86f405 small fixes to help freebsd 2014-06-27 13:11:57 +01:00
John Cupitt
a02deb3ac9 stop dzsave zip write at 4gb 
see https://github.com/jcupitt/libvips/issues/138

not great, but better than producing a corrupt file
 2014-06-25 14:34:13 +01:00
John Cupitt
9ad0942062 update man pages 
oops, forgot to update man pages for header -> vipsheader rename
 2014-06-24 14:19:57 +01:00
John Cupitt
da77b68d3e bump version to 7.40 
and rename header and edvips as vipsheader and vipsedit

remove mergeup and find_mosaic
 2014-06-23 20:22:50 +01:00
John Cupitt
1d74aaecc3 require libgsf-1 1.14.27 or later 
1.14.21 is known bad, 1.14.27 is fine, not sure about inbetween versions

1.14.30 works too
 2014-06-10 14:14:44 +01:00
John Cupitt
25f2193992 oops 2014-05-09 13:22:57 +01:00
John Cupitt
f6de1e7cb9 make libgsf-1 an optional dependency 
dzsave vanishes if you don't have it, but you can still build vips
 2014-05-09 13:13:18 +01:00
John Cupitt
6ab49a9af3 Merge remote-tracking branch 'origin/master' into dzsave-gsf 
Conflicts:
	ChangeLog
 2014-04-24 18:35:33 +01:00
John Cupitt
35cea5dbf8 fix for new ubuntu 2014-04-20 10:16:34 +01:00
John Cupitt
325f3b9451 dzsave will write a zip file 
but see the TODO in dzsave.c

- no way to pick a tile format, always jpeg
- no way to pick a container format, always zip
- needs testing
- examine memuse, how well do we work for large zips
- can we make a zip over 4gb?
 2014-04-19 15:15:25 +01:00
John Cupitt
998634060a tiny fixes 2014-03-23 12:26:06 +00:00
John Cupitt
28b6602683 Merge remote-tracking branch 'origin/7.38' 
Conflicts:
	ChangeLog
	configure.ac
 2014-03-06 16:03:33 +00:00
John Cupitt
62307d18ef fix to vips_grey() --uchar 2014-03-06 13:56:12 +00:00
John Cupitt
af8cecde1a Merge branch '7.38' 
Conflicts:
	ChangeLog
	configure.ac
	libvips/foreign/jpeg2vips.c
 2014-02-24 21:56:42 +00:00
John Cupitt
d843521f77 jpeg load from buffer shouldn't modify buffer 
fill_input_buffer() could write to the input buffer

see: https://github.com/jcupitt/libvips/pull/107

thanks Lovell
 2014-02-24 17:10:07 +00:00
John Cupitt
ba75a0c0ad Merge remote-tracking branch 'origin/7.38' into draw 
Conflicts:
	ChangeLog
	configure.ac
 2014-02-13 16:10:52 +00:00
John Cupitt
e4f0b4b469 version bump 2014-02-13 14:28:43 +00:00
John Cupitt
7ef49c2f2d Merge remote-tracking branch 'origin/master' into draw 2014-02-04 09:22:18 +00:00
John Cupitt
0509249c16 Merge remote-tracking branch 'origin/7.38' 
Conflicts:
	ChangeLog
	configure.ac
 2014-02-04 09:21:59 +00:00
John Cupitt
de0448b53d undeprecate VIPS_MASK_* 
ruby-vips was using them, thanks ahacking
 2014-02-04 09:11:43 +00:00
John Cupitt
54f2ea772c almost compiling 2014-02-04 08:49:17 +00:00
Benjamin Gilbert
ebf4fb807b use openslide_detect_vendor() on OpenSlide 3.4.0 
It is much more efficient than openslide_open().  It also fixes a bug:

If openslide_open() failed, we had no way of knowing whether it was an
interesting failure (for relevant slide formats) or an uninteresting
one (for a generic TIFF).  So, the is_a method would always return false
in this case.  This could cause unexpected results; for example, on MIRAX
slides, VIPS would open the .mrxs file itself (a JPEG thumbnail) and the
user would be left wondering where all their pixels went.  Now, if there
is an interesting failure, is_a will succeed but header/load will fail.
 2014-01-25 02:56:27 -05:00
John Cupitt
bf9fc7f855 auto-unpack RAD in affine 2014-01-22 10:02:38 +00:00
John Cupitt
c8c532a068 version bump for new cycle 2014-01-21 19:34:40 +00:00
John Cupitt
11339f29b5 bump soname 
oops, thanks benjamin
 2014-01-19 15:11:06 +00:00
John Cupitt
fd617aa520 version bump for 7.38 
and fix a few dist problems
 2014-01-18 12:44:28 +00:00
John Cupitt
9f150e3063 rename freq_filt package as freqfilt 2014-01-03 17:19:45 +00:00
John Cupitt
c12349ae97 remove old v4l1 code 
removed video4linux 1 video grabber

bring it back some day with a v4l2 rewrite

https://github.com/jcupitt/libvips/issues/90
 2013-12-30 16:26:56 +00:00
John Cupitt
693ed09edd add --vips-profile 
only added a few gates so far, try a visualiser next
 2013-11-18 18:31:49 +00:00
John Cupitt
7dfab19bb0 Merge remote-tracking branch 'origin/rot45' 2013-10-29 10:14:34 +00:00
John Cupitt
ebae3f7ed3 use g_mkdir() 
we had our own compat stuff, use the g_() one instead
 2013-10-28 21:21:19 +00:00
John Cupitt
67dff74b2c rot45 works 2013-10-19 18:26:46 +01:00
John Cupitt
ece34465f0 fix compiler warnings 
13.10 produces a few new ones
 2013-10-18 09:13:24 +01:00
John Cupitt
a1ffdbf7c5 version bump 2013-10-15 13:58:54 +01:00
John Cupitt
6c0eced22c build fixes for OS X 
stupid libjpeg and their stupid bool type argh
 2013-10-04 11:54:01 +01:00
John Cupitt
8ef91f8df9 version bump ready for 7.36 2013-10-03 13:02:20 +01:00
John Cupitt
165e7c9717 basic webp load done 2013-08-06 15:51:23 +01:00
John Cupitt
1af06d5ac9 boilerplate for webp read 2013-08-06 10:01:50 +01:00
John Cupitt
8259da2b9c getting ready to rewrite hist stuff 2013-07-01 13:45:36 +01:00
John Cupitt
610f7aa0eb fix morph on non-uchar images 2013-06-28 14:50:39 +01:00
John Cupitt
4436e370c7 make a "create" package 
the old "other" package, plus move some of conversion in there
 2013-06-13 10:12:22 +01:00
John Cupitt
4c0c3f7063 don't call g_type_init() on newer glibs 
stops a warning message
 2013-06-11 15:22:02 +01:00
John Cupitt
3bffb2a7e3 Merge remote-tracking branch 'origin/7.32' 2013-06-11 09:54:21 +01:00
John Cupitt
c95dbe3dcd link against gthread on old glib 
if glib is ancient, link against gthread ... fixes centos5 build

thanks re-boot
 2013-06-09 17:09:21 +01:00
John Cupitt
ad258d9ad2 version bump 2013-06-07 09:53:22 +01:00
John Cupitt
cdb3c589dd Merge remote-tracking branch 'origin/7.32' 
Conflicts:
	ChangeLog
	configure.ac
 2013-05-14 09:40:16 +01:00
John Cupitt
d739a240eb fix a segv with icc import/export 
would segv for very wide images
 2013-05-14 09:38:59 +01:00
John Cupitt
891051abbe Merge remote-tracking branch 'origin/7.32' 
Conflicts:
	ChangeLog
	configure.ac
	po/vips7.32.pot
 2013-04-16 17:01:37 +01:00
John Cupitt
4c5772fe5f rename vips7.po as vips7.32.po 
helps Debian, where they need to be able to install versions in parallel
 2013-04-16 14:30:28 +01:00
John Cupitt
042d093df2 bump version for next cycle 2013-03-12 12:06:59 +00:00
John Cupitt
0f633da128 configure cleanup, version bump 
configure.ac had some left-over debugging code
 2013-03-12 08:56:25 +00:00
John Cupitt
58040423d2 fix --without-lcms 
oops! thanks speckins
 2013-03-06 17:33:25 +00:00