Skip to content

Commit

Permalink
remove cimg and gmic
Browse files Browse the repository at this point in the history
move this to a plugin, it's too big for the core library
  • Loading branch information
jcupitt committed Oct 8, 2014
1 parent ca2ae68 commit 927b2d7
Show file tree
Hide file tree
Showing 14 changed files with 11 additions and 262,949 deletions.
2 changes: 1 addition & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
- better extra band handling by colour, again
- move zoomify ImageProperties file, now a better match to the offical tool
- rename VIPS_ANGLE_180 as VIPS_ANGLE_D180 etc. to help python
- update cimg, add gmic, plus a configure option to turn it on
- remove cimg support, we have a gmic plugin now instead

8/9/14 started 7.40.10
- icc_import and icc_transform checks the input profile for compatibility
Expand Down
17 changes: 1 addition & 16 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -665,19 +665,6 @@ if test x"$with_pangoft2" != "xno"; then
])
fi

# g'mic ... embedding the gmic interpreter needs a C++ compiler and a lot of
# patience. And tolerance for huge object files.
AC_ARG_WITH([gmic],
AS_HELP_STRING([--with-gmic], [build with gmic (default: no)]))

if test x"$with_gmic" == "xyes"; then
AC_DEFINE(HAVE_GMIC,1,[define to enable the gmic interpreter.])
AM_CONDITIONAL(ENABLE_GMIC, true)
else
AM_CONDITIONAL(ENABLE_GMIC, false)
with_gmic=no
fi

# hmm, these don't have .pc files on ubuntu 5.10, how odd
FIND_ZIP(
[with_zip=yes],
Expand Down Expand Up @@ -815,7 +802,6 @@ AC_OUTPUT([
libvips/include/vips/Makefile
libvips/Makefile
libvips/arithmetic/Makefile
libvips/cimg/Makefile
libvips/colour/Makefile
libvips/conversion/Makefile
libvips/convolution/Makefile
Expand Down Expand Up @@ -882,5 +868,4 @@ file import/export with libjpeg: $with_jpeg
image pyramid export: $with_gsf
(requires libgsf-1 1.14.27 or later)
use libexif to load/save JPEG metadata: $with_libexif
build Python binding: $with_python
embed gmic interpreter: $with_gmic])
build Python binding: $with_python])
11 changes: 1 addition & 10 deletions libvips/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@ OPTIONAL_COMPILE_DIR =
OPTIONAL_DIST_DIR =
OPTIONAL_LIB =

# only build in the cimg dir if C++ is enabled
if ENABLE_CXX
OPTIONAL_COMPILE_DIR += cimg
OPTIONAL_LIB += cimg/libcimg.la
else
OPTIONAL_DIST_DIR += cimg
endif

# same for deprecated
if ENABLE_DEPRECATED
OPTIONAL_COMPILE_DIR += deprecated
OPTIONAL_LIB += deprecated/libdeprecated.la
Expand Down Expand Up @@ -47,7 +38,7 @@ libvips_la_SOURCES =
# sadly the if/endif isn't enough to stop automake detecting a c++ link even
# when c++ is disabled ... comment out this line if you have linking problems
if ENABLE_CXX
nodist_EXTRA_libvips_la_SOURCES = cimg/dummy2.cc
nodist_EXTRA_libvips_la_SOURCES = resample/dummy2.cc
endif

# DLLs need dependant libs there too ... put @VIPS_LIBS@ at the end
Expand Down
Loading

0 comments on commit 927b2d7

Please sign in to comment.