Skip to content

Commit 55e577a

Browse files
jcupittjcupitt
committed
rename nearest as fill_nearest
avoid a clash with the nearest-neighbour interpolator
1 parent cdc286e commit 55e577a

File tree

7 files changed

+334
-333
lines changed

7 files changed

+334
-333
lines changed

‎ChangeLog

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
- added vips_value_set_blob_free()
3333
- "--size Nx" to vipsthumbnail was broken, thanks jrochkind
3434
- fix build with gcc 7
35-
- add vips_nearest() ... fill pixels with nearest colour
35+
- add vips_fill_nearest() ... fill pixels with nearest colour
3636

3737
29/8/17 started 8.5.9
3838
- make --fail stop jpeg read on any libjpeg warning, thanks @mceachen

‎libvips/include/vips/enumtypes.h

+46-47
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,32 @@
55
#define VIPS_ENUM_TYPES_H
66

77
G_BEGIN_DECLS
8-
8+
/* enumerations from "../../../libvips/include/vips/resample.h" */
9+
GType vips_kernel_get_type (void) G_GNUC_CONST;
10+
#define VIPS_TYPE_KERNEL (vips_kernel_get_type())
11+
GType vips_size_get_type (void) G_GNUC_CONST;
12+
#define VIPS_TYPE_SIZE (vips_size_get_type())
13+
/* enumerations from "../../../libvips/include/vips/foreign.h" */
14+
GType vips_foreign_flags_get_type (void) G_GNUC_CONST;
15+
#define VIPS_TYPE_FOREIGN_FLAGS (vips_foreign_flags_get_type())
16+
GType vips_saveable_get_type (void) G_GNUC_CONST;
17+
#define VIPS_TYPE_SAVEABLE (vips_saveable_get_type())
18+
GType vips_foreign_webp_preset_get_type (void) G_GNUC_CONST;
19+
#define VIPS_TYPE_FOREIGN_WEBP_PRESET (vips_foreign_webp_preset_get_type())
20+
GType vips_foreign_tiff_compression_get_type (void) G_GNUC_CONST;
21+
#define VIPS_TYPE_FOREIGN_TIFF_COMPRESSION (vips_foreign_tiff_compression_get_type())
22+
GType vips_foreign_tiff_predictor_get_type (void) G_GNUC_CONST;
23+
#define VIPS_TYPE_FOREIGN_TIFF_PREDICTOR (vips_foreign_tiff_predictor_get_type())
24+
GType vips_foreign_tiff_resunit_get_type (void) G_GNUC_CONST;
25+
#define VIPS_TYPE_FOREIGN_TIFF_RESUNIT (vips_foreign_tiff_resunit_get_type())
26+
GType vips_foreign_png_filter_get_type (void) G_GNUC_CONST;
27+
#define VIPS_TYPE_FOREIGN_PNG_FILTER (vips_foreign_png_filter_get_type())
28+
GType vips_foreign_dz_layout_get_type (void) G_GNUC_CONST;
29+
#define VIPS_TYPE_FOREIGN_DZ_LAYOUT (vips_foreign_dz_layout_get_type())
30+
GType vips_foreign_dz_depth_get_type (void) G_GNUC_CONST;
31+
#define VIPS_TYPE_FOREIGN_DZ_DEPTH (vips_foreign_dz_depth_get_type())
32+
GType vips_foreign_dz_container_get_type (void) G_GNUC_CONST;
33+
#define VIPS_TYPE_FOREIGN_DZ_CONTAINER (vips_foreign_dz_container_get_type())
934
/* enumerations from "../../../libvips/include/vips/arithmetic.h" */
1035
GType vips_operation_math_get_type (void) G_GNUC_CONST;
1136
#define VIPS_TYPE_OPERATION_MATH (vips_operation_math_get_type())
@@ -23,14 +48,6 @@ GType vips_operation_complex2_get_type (void) G_GNUC_CONST;
2348
#define VIPS_TYPE_OPERATION_COMPLEX2 (vips_operation_complex2_get_type())
2449
GType vips_operation_complexget_get_type (void) G_GNUC_CONST;
2550
#define VIPS_TYPE_OPERATION_COMPLEXGET (vips_operation_complexget_get_type())
26-
/* enumerations from "../../../libvips/include/vips/basic.h" */
27-
GType vips_precision_get_type (void) G_GNUC_CONST;
28-
#define VIPS_TYPE_PRECISION (vips_precision_get_type())
29-
/* enumerations from "../../../libvips/include/vips/colour.h" */
30-
GType vips_intent_get_type (void) G_GNUC_CONST;
31-
#define VIPS_TYPE_INTENT (vips_intent_get_type())
32-
GType vips_pcs_get_type (void) G_GNUC_CONST;
33-
#define VIPS_TYPE_PCS (vips_pcs_get_type())
3451
/* enumerations from "../../../libvips/include/vips/conversion.h" */
3552
GType vips_extend_get_type (void) G_GNUC_CONST;
3653
#define VIPS_TYPE_EXTEND (vips_extend_get_type())
@@ -48,33 +65,9 @@ GType vips_interesting_get_type (void) G_GNUC_CONST;
4865
#define VIPS_TYPE_INTERESTING (vips_interesting_get_type())
4966
GType vips_blend_mode_get_type (void) G_GNUC_CONST;
5067
#define VIPS_TYPE_BLEND_MODE (vips_blend_mode_get_type())
51-
/* enumerations from "../../../libvips/include/vips/convolution.h" */
52-
GType vips_combine_get_type (void) G_GNUC_CONST;
53-
#define VIPS_TYPE_COMBINE (vips_combine_get_type())
54-
/* enumerations from "../../../libvips/include/vips/draw.h" */
55-
GType vips_combine_mode_get_type (void) G_GNUC_CONST;
56-
#define VIPS_TYPE_COMBINE_MODE (vips_combine_mode_get_type())
57-
/* enumerations from "../../../libvips/include/vips/foreign.h" */
58-
GType vips_foreign_flags_get_type (void) G_GNUC_CONST;
59-
#define VIPS_TYPE_FOREIGN_FLAGS (vips_foreign_flags_get_type())
60-
GType vips_saveable_get_type (void) G_GNUC_CONST;
61-
#define VIPS_TYPE_SAVEABLE (vips_saveable_get_type())
62-
GType vips_foreign_webp_preset_get_type (void) G_GNUC_CONST;
63-
#define VIPS_TYPE_FOREIGN_WEBP_PRESET (vips_foreign_webp_preset_get_type())
64-
GType vips_foreign_tiff_compression_get_type (void) G_GNUC_CONST;
65-
#define VIPS_TYPE_FOREIGN_TIFF_COMPRESSION (vips_foreign_tiff_compression_get_type())
66-
GType vips_foreign_tiff_predictor_get_type (void) G_GNUC_CONST;
67-
#define VIPS_TYPE_FOREIGN_TIFF_PREDICTOR (vips_foreign_tiff_predictor_get_type())
68-
GType vips_foreign_tiff_resunit_get_type (void) G_GNUC_CONST;
69-
#define VIPS_TYPE_FOREIGN_TIFF_RESUNIT (vips_foreign_tiff_resunit_get_type())
70-
GType vips_foreign_png_filter_get_type (void) G_GNUC_CONST;
71-
#define VIPS_TYPE_FOREIGN_PNG_FILTER (vips_foreign_png_filter_get_type())
72-
GType vips_foreign_dz_layout_get_type (void) G_GNUC_CONST;
73-
#define VIPS_TYPE_FOREIGN_DZ_LAYOUT (vips_foreign_dz_layout_get_type())
74-
GType vips_foreign_dz_depth_get_type (void) G_GNUC_CONST;
75-
#define VIPS_TYPE_FOREIGN_DZ_DEPTH (vips_foreign_dz_depth_get_type())
76-
GType vips_foreign_dz_container_get_type (void) G_GNUC_CONST;
77-
#define VIPS_TYPE_FOREIGN_DZ_CONTAINER (vips_foreign_dz_container_get_type())
68+
/* enumerations from "../../../libvips/include/vips/util.h" */
69+
GType vips_token_get_type (void) G_GNUC_CONST;
70+
#define VIPS_TYPE_TOKEN (vips_token_get_type())
7871
/* enumerations from "../../../libvips/include/vips/image.h" */
7972
GType vips_demand_style_get_type (void) G_GNUC_CONST;
8073
#define VIPS_TYPE_DEMAND_STYLE (vips_demand_style_get_type())
@@ -88,23 +81,29 @@ GType vips_coding_get_type (void) G_GNUC_CONST;
8881
#define VIPS_TYPE_CODING (vips_coding_get_type())
8982
GType vips_access_get_type (void) G_GNUC_CONST;
9083
#define VIPS_TYPE_ACCESS (vips_access_get_type())
84+
/* enumerations from "../../../libvips/include/vips/colour.h" */
85+
GType vips_intent_get_type (void) G_GNUC_CONST;
86+
#define VIPS_TYPE_INTENT (vips_intent_get_type())
87+
GType vips_pcs_get_type (void) G_GNUC_CONST;
88+
#define VIPS_TYPE_PCS (vips_pcs_get_type())
89+
/* enumerations from "../../../libvips/include/vips/operation.h" */
90+
GType vips_operation_flags_get_type (void) G_GNUC_CONST;
91+
#define VIPS_TYPE_OPERATION_FLAGS (vips_operation_flags_get_type())
92+
/* enumerations from "../../../libvips/include/vips/convolution.h" */
93+
GType vips_combine_get_type (void) G_GNUC_CONST;
94+
#define VIPS_TYPE_COMBINE (vips_combine_get_type())
9195
/* enumerations from "../../../libvips/include/vips/morphology.h" */
9296
GType vips_operation_morphology_get_type (void) G_GNUC_CONST;
9397
#define VIPS_TYPE_OPERATION_MORPHOLOGY (vips_operation_morphology_get_type())
98+
/* enumerations from "../../../libvips/include/vips/draw.h" */
99+
GType vips_combine_mode_get_type (void) G_GNUC_CONST;
100+
#define VIPS_TYPE_COMBINE_MODE (vips_combine_mode_get_type())
101+
/* enumerations from "../../../libvips/include/vips/basic.h" */
102+
GType vips_precision_get_type (void) G_GNUC_CONST;
103+
#define VIPS_TYPE_PRECISION (vips_precision_get_type())
94104
/* enumerations from "../../../libvips/include/vips/object.h" */
95105
GType vips_argument_flags_get_type (void) G_GNUC_CONST;
96106
#define VIPS_TYPE_ARGUMENT_FLAGS (vips_argument_flags_get_type())
97-
/* enumerations from "../../../libvips/include/vips/operation.h" */
98-
GType vips_operation_flags_get_type (void) G_GNUC_CONST;
99-
#define VIPS_TYPE_OPERATION_FLAGS (vips_operation_flags_get_type())
100-
/* enumerations from "../../../libvips/include/vips/resample.h" */
101-
GType vips_kernel_get_type (void) G_GNUC_CONST;
102-
#define VIPS_TYPE_KERNEL (vips_kernel_get_type())
103-
GType vips_size_get_type (void) G_GNUC_CONST;
104-
#define VIPS_TYPE_SIZE (vips_size_get_type())
105-
/* enumerations from "../../../libvips/include/vips/util.h" */
106-
GType vips_token_get_type (void) G_GNUC_CONST;
107-
#define VIPS_TYPE_TOKEN (vips_token_get_type())
108107
G_END_DECLS
109108

110109
#endif /*VIPS_ENUM_TYPES_H*/

‎libvips/include/vips/morphology.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ int vips_countlines( VipsImage *in, double *nolines,
5757
__attribute__((sentinel));
5858
int vips_labelregions( VipsImage *in, VipsImage **mask, ... )
5959
__attribute__((sentinel));
60-
int vips_nearest( VipsImage *in, VipsImage **out, ... )
60+
int vips_fill_nearest( VipsImage *in, VipsImage **out, ... )
6161
__attribute__((sentinel));
6262

6363
#ifdef __cplusplus

0 commit comments

Comments
 (0)