Skip to content

Commit fe22f80

Browse files
jcupittjcupitt
committed
Merge branch 'master' of github.com:libvips/libvips
2 parents b0f38b5 + 7553f60 commit fe22f80

16 files changed

+385
-343
lines changed

‎configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ EXTRA_LIBS_USED=""
304304
# Checks for header files.
305305
AC_HEADER_DIRENT
306306
AC_HEADER_STDC
307-
AC_CHECK_HEADERS([errno.h math.h fcntl.h limits.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h sys/mman.h sys/types.h sys/stat.h unistd.h io.h direct.h windows.h])
307+
AC_CHECK_HEADERS([sys/file.h sys/param.h sys/mman.h unistd.h io.h direct.h])
308308

309309
# Checks for typedefs, structures, and compiler characteristics.
310310
AC_C_RESTRICT

‎libvips/colour/icc_transform.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,7 @@ vips_icc_is_compatible_profile( VipsImage *image,
14371437
return( TRUE );
14381438
}
14391439

1440-
#endif /*HAVE_LCMS*/
1440+
#endif /*HAVE_LCMS2*/
14411441

14421442
/**
14431443
* vips_icc_import: (method)

‎libvips/conversion/conversion.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,6 @@ vips_conversion_operation_init( void )
402402
extern GType vips_subsample_get_type( void );
403403
extern GType vips_msb_get_type( void );
404404
extern GType vips_byteswap_get_type( void );
405-
#ifdef HAVE_PANGOFT2
406-
extern GType vips_text_get_type( void );
407-
#endif /*HAVE_PANGOFT2*/
408405
extern GType vips_xyz_get_type( void );
409406
extern GType vips_falsecolour_get_type( void );
410407
extern GType vips_gamma_get_type( void );
@@ -454,9 +451,6 @@ vips_conversion_operation_init( void )
454451
vips_subsample_get_type();
455452
vips_msb_get_type();
456453
vips_byteswap_get_type();
457-
#ifdef HAVE_PANGOFT2
458-
vips_text_get_type();
459-
#endif /*HAVE_PANGOFT2*/
460454
vips_xyz_get_type();
461455
vips_falsecolour_get_type();
462456
vips_gamma_get_type();

0 commit comments

Comments
 (0)