diff --git a/.gitignore b/.gitignore index 7d60d1db..c6433cc5 100644 --- a/.gitignore +++ b/.gitignore @@ -123,4 +123,6 @@ doc/reference/scan-build.stamp doc/reference/sgml-build.stamp doc/reference/sgml.stamp doc/reference/xml/ +doc/html +doc/pdf diff --git a/ChangeLog b/ChangeLog index 6241016d..a1cd9b3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +26/7/11 started 7.26.0 +- version bunp for 7.26 + 6/12/10 started 7.25.0 - attach the jpeg thumbnail and multiscan fields (thanks Mike) - faster tiff read for some common cases diff --git a/configure.in b/configure.in index 52562cde..4d7c05ba 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_CONFIG_MACRO_DIR(m4) # user-visible library versioning m4_define([vips_major_version], [7]) -m4_define([vips_minor_version], [25]) +m4_define([vips_minor_version], [26]) m4_define([vips_micro_version], [0]) m4_define([vips_version], [vips_major_version.vips_minor_version.vips_micro_version]) @@ -603,8 +603,8 @@ AC_SUBST(PACKAGES_USED) # vips-$VIPS_MAJOR_VERSION.$VIPS_MINOR_VERSION.pc # in AC_OUTPUT, but that seems to break for some combinations of sh/m4 AC_OUTPUT([ - vips-7.25.pc - vipsCC-7.25.pc + vips-7.26.pc + vipsCC-7.26.pc Makefile libvips/include/vips/version.h libvips/include/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 48e54f82..bc9fa58d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,3 @@ -libvips/acquire/im_clamp.c libvips/arithmetic/im_deviate.c libvips/arithmetic/im_point_bilinear.c libvips/arithmetic/im_linreg.c @@ -9,7 +8,9 @@ libvips/arithmetic/im_maxpos.c libvips/arithmetic/im_maxpos_avg.c libvips/arithmetic/im_maxpos_vec.c libvips/arithmetic/im_invert.c +libvips/arithmetic/arithmetic.c libvips/arithmetic/im_sign.c +libvips/arithmetic/add.c libvips/arithmetic/round.c libvips/arithmetic/im_measure.c libvips/arithmetic/math.c @@ -21,8 +22,8 @@ libvips/arithmetic/im_divide.c libvips/arithmetic/im_bandmean.c libvips/arithmetic/im_lintra.c libvips/arithmetic/im_remainder.c +libvips/arithmetic/binary.c libvips/arithmetic/power.c -libvips/arithmetic/im_add.c libvips/arithmetic/im_avg.c libvips/arithmetic/im_multiply.c libvips/boolean/boolean.c @@ -93,6 +94,7 @@ libvips/conversion/im_subsample.c libvips/conversion/im_rot270.c libvips/conversion/im_gbandjoin.c libvips/convolution/im_contrast_surface.c +libvips/convolution/im_aconvsep.c libvips/convolution/im_gradcor.c libvips/convolution/im_compass.c libvips/convolution/im_conv.c @@ -102,24 +104,8 @@ libvips/convolution/im_conv_f.c libvips/convolution/im_addgnoise.c libvips/convolution/im_spcor.c libvips/convolution/im_sharpen.c -libvips/deprecated/im_fav4.c -libvips/deprecated/im_setbox.c -libvips/deprecated/im_convsub.c -libvips/deprecated/im_cmulnorm.c -libvips/deprecated/im_thresh.c -libvips/deprecated/deprecated_dispatch.c -libvips/deprecated/im_resize_linear.c -libvips/deprecated/im_gadd.c -libvips/deprecated/im_gfadd.c -libvips/deprecated/im_printlines.c -libvips/deprecated/im_bernd.c -libvips/deprecated/im_slice.c -libvips/deprecated/im_litecor.c -libvips/deprecated/rename.c -libvips/deprecated/im_gaddim.c -libvips/deprecated/im_debugim.c -libvips/deprecated/im_print.c -libvips/deprecated/im_line.c +libvips/convolution/im_aconv.c +libvips/dummy.c libvips/format/im_tile_cache.c libvips/format/im_ppm2vips.c libvips/format/format.c @@ -184,51 +170,32 @@ libvips/inplace/im_draw_line.c libvips/inplace/im_draw_circle.c libvips/inplace/im_draw_mask.c libvips/inplace/inplace_dispatch.c -libvips/iofuncs/check.c libvips/iofuncs/sink.c libvips/iofuncs/rect.c libvips/iofuncs/semaphore.c libvips/iofuncs/memory.c +libvips/iofuncs/vips.c +libvips/iofuncs/generate.c libvips/iofuncs/region.c -libvips/iofuncs/im_setbuf.c -libvips/iofuncs/callback.c -libvips/iofuncs/im_wrapmany.c -libvips/iofuncs/im_guess_prefix.c -libvips/iofuncs/im_generate.c libvips/iofuncs/init.c +libvips/iofuncs/image.c libvips/iofuncs/sinkscreen.c libvips/iofuncs/vector.c -libvips/iofuncs/im_mapfile.c -libvips/iofuncs/package.c -libvips/iofuncs/debug.c -libvips/iofuncs/im_init_world.c -libvips/iofuncs/im_partial.c -libvips/iofuncs/meta.c -libvips/iofuncs/im_setupout.c +libvips/iofuncs/mapfile.c libvips/iofuncs/base64.c -libvips/iofuncs/time.c -libvips/iofuncs/im_histlin.c libvips/iofuncs/object.c -libvips/iofuncs/im_image.c -libvips/iofuncs/im_cp_desc.c libvips/iofuncs/buf.c +libvips/iofuncs/pool.c libvips/iofuncs/util.c -libvips/iofuncs/im_prepare.c -libvips/iofuncs/im_binfile.c +libvips/iofuncs/enumtypes.c +libvips/iofuncs/operation.c libvips/iofuncs/header.c libvips/iofuncs/sinkmemory.c libvips/iofuncs/window.c libvips/iofuncs/sinkdisc.c -libvips/iofuncs/im_demand_hint.c libvips/iofuncs/buffer.c -libvips/iofuncs/im_open.c libvips/iofuncs/error.c -libvips/iofuncs/dispatch_types.c libvips/iofuncs/threadpool.c -libvips/iofuncs/im_writeline.c -libvips/iofuncs/im_open_vips.c -libvips/iofuncs/im_unmapfile.c -libvips/iofuncs/im_close.c libvips/mask/im_matcat.c libvips/mask/rw_mask.c libvips/mask/im_matinv.c @@ -265,25 +232,18 @@ libvips/mosaicing/match.c libvips/mosaicing/mosaic1.c libvips/mosaicing/im_clinear.c libvips/mosaicing/im_lrmosaic.c -libvips/other/im_simcontr.c -libvips/other/glds_funcs.c -libvips/other/cooc_funcs.c libvips/other/im_grey.c libvips/other/other_dispatch.c libvips/other/im_benchmark.c -libvips/other/im_meanstd.c libvips/other/im_zone.c libvips/other/im_sines.c libvips/other/im_eye.c -libvips/other/im_spatres.c libvips/other/im_make_xy.c -libvips/other/im_dif_std.c libvips/relational/im_ifthenelse.c libvips/relational/relational_dispatch.c libvips/relational/relational.c libvips/relational/im_blend.c libvips/resample/im_affine.c -libvips/resample/im_stretch3.c libvips/resample/transform.c libvips/resample/im_shrink.c libvips/resample/resample_dispatch.c @@ -292,25 +252,20 @@ libvips/resample/im_rightshift_size.c libvips/video/video_dispatch.c libvips/video/im_video_test.c libvips/video/im_video_v4l1.c -tools/iofuncs/vips.c -tools/iofuncs/edvips.c -tools/iofuncs/vipsthumbnail.c -tools/iofuncs/header.c -tools/mosaicing/find_mosaic.c -tools/mosaicing/mergeup.c -tools/other/simcontr.c -tools/other/squares.c -tools/other/sines.c -tools/other/glds_features.c -tools/other/glds.c -tools/other/spatres.c -tools/other/cooc.c -tools/other/cooc_features.c +tools/edvips.c +tools/find_mosaic.c +tools/header.c +tools/mergeup.c +tools/vips.c +tools/vipsthumbnail.c libvipsCC/VDisplay.cc libvipsCC/VError.cc libvipsCC/VImage.cc libvipsCC/vipsc++.cc libvipsCC/VMask.cc +libvips/dummy2.cc +libvips/arithmetic/binary.h +libvips/arithmetic/arithmetic.h libvipsCC/include/vips/VDisplay.h libvipsCC/include/vips/VImage.h libvipsCC/include/vips/vipscpp.h @@ -320,9 +275,10 @@ libvipsCC/include/vips/vipsc++.h libvips/cimg/CImg.h libvips/format/dbh.h libvips/include/vips/type.h -libvips/include/vips/struct.h +libvips/include/vips/operation.h libvips/include/vips/deprecated.h libvips/include/vips/image.h +libvips/include/vips/pool.h libvips/include/vips/mosaicing.h libvips/include/vips/freq_filt.h libvips/include/vips/buf.h @@ -346,6 +302,7 @@ libvips/include/vips/rect.h libvips/include/vips/semaphore.h libvips/include/vips/disp.h libvips/include/vips/colour.h +libvips/include/vips/enumtypes.h libvips/include/vips/vector.h libvips/include/vips/intl.h libvips/include/vips/region.h @@ -353,15 +310,13 @@ libvips/include/vips/morphology.h libvips/include/vips/format.h libvips/include/vips/internal.h libvips/include/vips/interpolate.h -libvips/include/vips/check.h libvips/include/vips/memory.h -libvips/include/vips/meta.h libvips/include/vips/transform.h libvips/include/vips/error.h libvips/include/vips/convolution.h -libvips/include/vips/callback.h libvips/include/vips/mask.h libvips/include/vips/vips.h +libvips/include/vips/vips7compat.h libvips/include/vips/debug.h libvips/include/vips/histograms_lut.h libvips/include/vips/thread.h @@ -369,6 +324,7 @@ libvips/include/vips/relational.h libvips/include/vips/video.h libvips/include/vips/arithmetic.h libvips/inplace/draw.h +libvips/iofuncs/sink.h libvips/iofuncs/base64.h libvips/mosaicing/mosaic.h libvips/mosaicing/merge.h diff --git a/tools/Makefile.am b/tools/Makefile.am index 3eb90691..787305cf 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -26,7 +26,7 @@ bin_SCRIPTS = \ batch_image_convert \ batch_rubber_sheet \ batch_crop \ - vips-7.25 + vips-7.26 EXTRA_DIST = \ light_correct.in \ diff --git a/tools/vips-7.25 b/tools/vips-7.26 similarity index 100% rename from tools/vips-7.25 rename to tools/vips-7.26 diff --git a/vips-7.25.pc.in b/vips-7.26.pc.in similarity index 100% rename from vips-7.25.pc.in rename to vips-7.26.pc.in diff --git a/vipsCC-7.25.pc.in b/vipsCC-7.26.pc.in similarity index 100% rename from vipsCC-7.25.pc.in rename to vipsCC-7.26.pc.in