Permalink
Browse files

remove vips7 stuff from API

You must now include vips7 support explicitly with

	#include <vips/vips7compat.h>

in your code just after including `vips.h`.

The old vips7 names, such as `Rect`, were starting to cause problems
with other packages like opencv.
  • Loading branch information...
jcupitt committed May 16, 2018
1 parent fd7b04f commit b085908558236fdd404ee7e089755391e0f40b07
Showing with 274 additions and 198 deletions.
  1. +1 −0 ChangeLog
  2. +0 −1 configure.ac
  3. +1 −3 libvips/Makefile.am
  4. +1 −1 libvips/arithmetic/stats.c
  5. +1 −1 libvips/convolution/convasep.c
  6. +3 −3 libvips/convolution/convf.c
  7. +2 −0 libvips/deprecated/Makefile.am
  8. +1 −0 libvips/deprecated/arith_dispatch.c
  9. +1 −0 libvips/deprecated/cimg_dispatch.c
  10. +1 −0 libvips/deprecated/colour_dispatch.c
  11. +1 −0 libvips/deprecated/conver_dispatch.c
  12. +1 −0 libvips/deprecated/convol_dispatch.c
  13. +1 −0 libvips/deprecated/cooc_funcs.c
  14. +1 −0 libvips/deprecated/deprecated_dispatch.c
  15. +1 −0 libvips/deprecated/dispatch_types.c
  16. +1 −0 libvips/deprecated/fits.c
  17. +1 −0 libvips/deprecated/format.c
  18. +1 −0 libvips/deprecated/format_dispatch.c
  19. +1 −0 libvips/deprecated/freq_dispatch.c
  20. +1 −0 libvips/deprecated/glds_funcs.c
  21. +1 −0 libvips/deprecated/hist_dispatch.c
  22. +1 −0 libvips/deprecated/im_align_bands.c
  23. +1 −0 libvips/deprecated/im_analyze2vips.c
  24. +1 −0 libvips/deprecated/im_benchmark.c
  25. +1 −0 libvips/deprecated/im_bernd.c
  26. +1 −0 libvips/deprecated/im_clamp.c
  27. +1 −0 libvips/deprecated/im_cmulnorm.c
  28. +1 −0 libvips/deprecated/im_convsub.c
  29. +1 −0 libvips/deprecated/im_csv2vips.c
  30. +1 −0 libvips/deprecated/im_debugim.c
  31. +1 −0 libvips/deprecated/im_dif_std.c
  32. +1 −0 libvips/deprecated/im_exr2vips.c
  33. +1 −0 libvips/deprecated/im_fav4.c
  34. +1 −0 libvips/deprecated/im_freq_mask.c
  35. +1 −0 libvips/deprecated/im_gadd.c
  36. +1 −0 libvips/deprecated/im_gaddim.c
  37. +1 −0 libvips/deprecated/im_gfadd.c
  38. +1 −0 libvips/deprecated/im_gradcor.c
  39. +1 −0 libvips/deprecated/im_jpeg2vips.c
  40. +1 −0 libvips/deprecated/im_lab_morph.c
  41. +1 −0 libvips/deprecated/im_line.c
  42. +1 −0 libvips/deprecated/im_linreg.c
  43. +1 −0 libvips/deprecated/im_litecor.c
  44. +1 −0 libvips/deprecated/im_magick2vips.c
  45. +1 −0 libvips/deprecated/im_mask2vips.c
  46. +1 −0 libvips/deprecated/im_matcat.c
  47. +1 −0 libvips/deprecated/im_matinv.c
  48. +1 −0 libvips/deprecated/im_matmul.c
  49. +1 −0 libvips/deprecated/im_mattrn.c
  50. +1 −0 libvips/deprecated/im_maxpos_avg.c
  51. +1 −0 libvips/deprecated/im_maxpos_subpel.c
  52. +1 −0 libvips/deprecated/im_measure.c
  53. +1 −0 libvips/deprecated/im_openslide2vips.c
  54. +1 −0 libvips/deprecated/im_png2vips.c
  55. +1 −0 libvips/deprecated/im_point_bilinear.c
  56. +1 −0 libvips/deprecated/im_ppm2vips.c
  57. +1 −0 libvips/deprecated/im_print.c
  58. +1 −0 libvips/deprecated/im_printlines.c
  59. +1 −0 libvips/deprecated/im_resize_linear.c
  60. +1 −0 libvips/deprecated/im_setbox.c
  61. +1 −0 libvips/deprecated/im_simcontr.c
  62. +1 −0 libvips/deprecated/im_slice.c
  63. +1 −0 libvips/deprecated/im_spatres.c
  64. +1 −0 libvips/deprecated/im_stretch3.c
  65. +1 −0 libvips/deprecated/im_thresh.c
  66. +1 −0 libvips/deprecated/im_tiff2vips.c
  67. +1 −0 libvips/{video → deprecated}/im_video_test.c
  68. +1 −0 libvips/deprecated/im_vips2csv.c
  69. +1 −0 libvips/deprecated/im_vips2dz.c
  70. +1 −0 libvips/deprecated/im_vips2jpeg.c
  71. +1 −0 libvips/deprecated/im_vips2mask.c
  72. +1 −0 libvips/deprecated/im_vips2png.c
  73. +1 −0 libvips/deprecated/im_vips2ppm.c
  74. +1 −0 libvips/deprecated/im_vips2tiff.c
  75. +1 −0 libvips/deprecated/im_vips2webp.c
  76. +1 −0 libvips/deprecated/im_webp2vips.c
  77. +1 −0 libvips/deprecated/im_zerox.c
  78. +1 −0 libvips/deprecated/inplace_dispatch.c
  79. +1 −0 libvips/deprecated/lazy.c
  80. +1 −0 libvips/deprecated/mask_dispatch.c
  81. +1 −0 libvips/deprecated/matalloc.c
  82. +1 −0 libvips/deprecated/matlab.c
  83. +1 −0 libvips/deprecated/morph_dispatch.c
  84. +1 −0 libvips/deprecated/mosaicing_dispatch.c
  85. +1 −0 libvips/deprecated/other_dispatch.c
  86. +1 −0 libvips/deprecated/package.c
  87. +1 −0 libvips/deprecated/radiance.c
  88. +1 −0 libvips/deprecated/raw.c
  89. +1 −0 libvips/deprecated/rename.c
  90. +1 −0 libvips/deprecated/resample_dispatch.c
  91. +1 −0 libvips/deprecated/rotmask.c
  92. +1 −0 libvips/deprecated/rw_mask.c
  93. +1 −0 libvips/deprecated/tone.c
  94. +1 −0 libvips/{video → deprecated}/video_dispatch.c
  95. +18 −0 libvips/deprecated/vips7compat.c
  96. +5 −7 libvips/foreign/exif.c
  97. +1 −1 libvips/foreign/webp2vips.c
  98. +108 −150 libvips/histogram/hist_plot.c
  99. +7 −0 libvips/include/vips/internal.h
  100. +2 −14 libvips/include/vips/vips.h
  101. +9 −9 libvips/include/vips/vips7compat.h
  102. +1 −0 libvips/iofuncs/init.c
  103. +1 −0 libvips/morphology/hitmiss.c
  104. +1 −0 libvips/morphology/morph.c
  105. +1 −1 libvips/morphology/rank.c
  106. +1 −0 libvips/mosaicing/global_balance.c
  107. +1 −0 libvips/mosaicing/im_avgdxdy.c
  108. +1 −0 libvips/mosaicing/im_chkpair.c
  109. +1 −0 libvips/mosaicing/im_clinear.c
  110. +1 −0 libvips/mosaicing/im_improve.c
  111. +1 −0 libvips/mosaicing/im_initialize.c
  112. +1 −0 libvips/mosaicing/im_lrcalcon.c
  113. +1 −0 libvips/mosaicing/im_lrmerge.c
  114. +1 −0 libvips/mosaicing/im_lrmosaic.c
  115. +1 −0 libvips/mosaicing/im_remosaic.c
  116. +1 −0 libvips/mosaicing/im_tbcalcon.c
  117. +1 −0 libvips/mosaicing/im_tbmerge.c
  118. +1 −0 libvips/mosaicing/im_tbmosaic.c
  119. +1 −0 libvips/mosaicing/match.c
  120. +1 −0 libvips/mosaicing/merge.c
  121. +1 −0 libvips/mosaicing/mosaic.c
  122. +1 −0 libvips/mosaicing/mosaic1.c
  123. +0 −7 libvips/video/Makefile.am
  124. +1 −0 libvipsCC/VDisplay.cc
  125. +1 −0 libvipsCC/VError.cc
  126. +1 −0 libvipsCC/VImage.cc
  127. +1 −0 libvipsCC/VMask.cc
  128. +1 −0 swig/vipsCC/VImage.i
  129. +1 −0 tools/vips.c
  130. +1 −0 tools/vipsedit.c
@@ -21,6 +21,7 @@
- tiffload, pdfload, magickload set VIPS_META_N_PAGES "n-pages" metadata item
- add fontfile option to vips_text() [fangqiao]
- add vips_transpose3d() -- swap major dimensions in a volumetric image
- remove vips7 stuff from default API ... you must now #include it explicitly
12/3/18 started 8.6.4
- better fitting of fonts with overhanging edges [Adrià]
@@ -1278,7 +1278,6 @@ AC_OUTPUT([
libvips/mosaicing/Makefile
libvips/create/Makefile
libvips/resample/Makefile
libvips/video/Makefile
libvipsCC/include/Makefile
libvipsCC/include/vips/Makefile
libvipsCC/Makefile
@@ -24,8 +24,7 @@ SUBDIRS = \
iofuncs \
morphology \
mosaicing \
create \
video \
create
.
lib_LTLIBRARIES = libvips.la
@@ -52,7 +51,6 @@ libvips_la_LIBADD = \
morphology/libmorphology.la \
mosaicing/libmosaicing.la \
create/libcreate.la \
video/libvideo.la \
@VIPS_LIBS@
libvips_la_LDFLAGS = \
@@ -409,7 +409,7 @@ vips_stats_class_init( VipsStatsClass *class )
gobject_class->get_property = vips_object_get_property;
object_class->nickname = "stats";
object_class->description = _( "find image average" );
object_class->description = _( "find many image stats" );
object_class->build = vips_stats_build;
sclass->start = vips_stats_start;
@@ -372,7 +372,7 @@ vips_convasep_stop( void *vseq, void *a, void *b )
static void *
vips_convasep_start( VipsImage *out, void *a, void *b )
{
VipsImage *in = (IMAGE *) a;
VipsImage *in = (VipsImage *) a;
VipsConvasep *convasep = (VipsConvasep *) b;
VipsConvasepSeq *seq;
@@ -176,7 +176,7 @@ vips_convf_start( VipsImage *out, void *a, void *b )
/* Convolve!
*/
static int
vips_convf_gen( REGION *or, void *vseq, void *a, void *b, gboolean *stop )
vips_convf_gen( VipsRegion *or, void *vseq, void *a, void *b, gboolean *stop )
{
VipsConvfSequence *seq = (VipsConvfSequence *) vseq;
VipsConvf *convf = (VipsConvf *) b;
@@ -337,8 +337,8 @@ vips_convf_build( VipsObject *object )
/* Prepare output. Consider a 7x7 mask and a 7x7 image --- the output
* would be 1x1.
*/
if( vips_bandfmt_isint( in->BandFmt ) )
convolution->out->BandFmt = IM_BANDFMT_FLOAT;
if( vips_band_format_isint( in->BandFmt ) )
convolution->out->BandFmt = VIPS_FORMAT_FLOAT;
convolution->out->Xsize -= M->Xsize - 1;
convolution->out->Ysize -= M->Ysize - 1;
@@ -1,6 +1,8 @@
noinst_LTLIBRARIES = libdeprecated.la
libdeprecated_la_SOURCES = \
video_dispatch.c \
im_video_test.c \
cimg_dispatch.c \
inplace_dispatch.c \
tone.c \
@@ -38,6 +38,7 @@
#include <stdio.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/* One image in, one out.
*/
@@ -36,6 +36,7 @@
#include <stdio.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
static int
greyc_vec( im_object *argv )
@@ -38,6 +38,7 @@
#include <stdio.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/* One image in, one out.
*/
@@ -36,6 +36,7 @@
#include <vips/intl.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
static int
system_vec( im_object *argv )
@@ -38,6 +38,7 @@
#include <stdio.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/* One image in, one out.
*/
@@ -75,6 +75,7 @@
#include <math.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
static
int im_cooc_sym(IMAGE *im, IMAGE *m, int xpos, int ypos, int xsize, int ysize, int dx, int dy)
@@ -36,6 +36,7 @@
#include <stdio.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#include <vips/internal.h>
/* One image in, one out.
@@ -47,6 +47,7 @@
#include <string.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#include <vips/internal.h>
/* String containing each of the characters which can be used within a
@@ -41,6 +41,7 @@
#include <string.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#include <vips/internal.h>
#include <vips/debug.h>
@@ -36,6 +36,7 @@
#include <stdio.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#include <vips/internal.h>
/* To iterate over supported formats, we build a temp list of subclasses of
@@ -36,6 +36,7 @@
#include <stdio.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
static int
jpeg2vips_vec( im_object *argv )
@@ -41,6 +41,7 @@
#include <stdarg.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/* One image in, one out.
*/
@@ -72,6 +72,7 @@
#include <math.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/* Keep the greylevel difference matrix as a 256x1 double image */
@@ -38,6 +38,7 @@
#include <stdio.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/* One image in, one out.
*/
@@ -39,6 +39,7 @@
#include <vips/intl.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/**
* im_align_bands:
@@ -41,6 +41,7 @@
#include <vips/intl.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
static VipsFormatFlags
analyze_flags( const char *filename )
@@ -45,6 +45,7 @@
#include <math.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/*
@@ -52,6 +52,7 @@
#include <stdlib.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
static int
extract( IMAGE *in, int x, int y, int w, int h )
@@ -48,6 +48,7 @@
#include <stdlib.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#include <vips/internal.h>
int
@@ -47,6 +47,7 @@
#include <vips/intl.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#include <stdio.h>
#include <stdlib.h>
@@ -55,6 +55,7 @@
#include <stdlib.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#include <vips/internal.h>
/* Create multiplication luts for all non zero elements of the original mask;
@@ -43,6 +43,7 @@
#include <stdlib.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#include "../foreign/pforeign.h"
@@ -57,6 +57,7 @@
#include <stdio.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
int
im_debugim( IMAGE *in )
@@ -45,6 +45,7 @@
#include <math.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#include <vips/internal.h>
static int
@@ -46,6 +46,7 @@
#include <string.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#include <vips/thread.h>
#include <vips/internal.h>
@@ -38,6 +38,7 @@ Copyright (C) 1992, Kirk Martinez, History of Art Dept, Birkbeck College
#include <string.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#define ARGS "fav4: frame average 4 frames\nARGS: im1 im2 im3 im4 outfile"
#define NFRAMES 4
@@ -46,6 +46,7 @@
#include <stdarg.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#include <vips/internal.h>
/* Make a mask image.
@@ -57,6 +57,7 @@
#include <assert.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
int im_gfadd(double a, IMAGE *in1, double b, IMAGE *in2, double c, IMAGE *out);
int im_gaddim(double a, IMAGE *in1, double b, IMAGE *in2, double c, IMAGE *out);
@@ -58,6 +58,7 @@
#include <math.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/* This function works on either mmaped files or on images in buffer
*/
@@ -61,6 +61,7 @@
#include <math.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/* uchar char ushort short uint int float double */
static int array[8][8] = {
@@ -47,6 +47,7 @@
#include <stdlib.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/** LOCAL TYPES **/
@@ -47,6 +47,7 @@
#include <setjmp.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#include "../foreign/pforeign.h"
@@ -45,6 +45,7 @@
#include <stdlib.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#include <vips/internal.h>
int
@@ -52,6 +52,7 @@
#include <math.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
int im_line(image, x1, y1, x2, y2, pelval)
IMAGE *image;
@@ -50,6 +50,7 @@
#include <stdlib.h>
#include <math.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/** TYPES **/
@@ -66,6 +66,7 @@
#include <stdlib.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/* If maximum output is > 255 scale output between minout and maxout,
* by normalising maxout to 255.
@@ -41,6 +41,7 @@
#include <vips/intl.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
#include "../foreign/pforeign.h"
@@ -45,6 +45,7 @@
#include <stdlib.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/**
* im_mask2vips:
@@ -42,6 +42,7 @@
#include <string.h>
#include <vips/vips.h>
#include <vips/vips7compat.h>
/**
* im_matcat:
Oops, something went wrong.

0 comments on commit b085908

Please sign in to comment.