Remove the finalize() member function from Input.

[movit] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7f1bfb42844af1805a90f3141dcad0df3d32d757..030140f9648c94a6fb0a0c43e853e104f55fc35a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,8 +13,9 @@ CC=@CC@
 CXX=@CXX@
 CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@
 LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread
 CXX=@CXX@
 CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@
 LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread

-DEMO_LDFLAGS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
-LIBTOOL=@LIBTOOL@
+DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@
+SHELL=@SHELL@
+LIBTOOL=@LIBTOOL@ --tag=CXX

 RANLIB=ranlib
 INSTALL=install
 MKDIR=mkdir
 RANLIB=ranlib
 INSTALL=install
 MKDIR=mkdir


@@ -53,11 +54,11 @@ TESTED_EFFECTS += resample_effect
 TESTED_EFFECTS += dither_effect
 TESTED_EFFECTS += deconvolution_sharpen_effect
 TESTED_EFFECTS += fft_pass_effect
 TESTED_EFFECTS += dither_effect
 TESTED_EFFECTS += deconvolution_sharpen_effect
 TESTED_EFFECTS += fft_pass_effect

+TESTED_EFFECTS += vignette_effect

 
 UNTESTED_EFFECTS = sandbox_effect
 UNTESTED_EFFECTS += mirror_effect
 UNTESTED_EFFECTS += resize_effect
 
 UNTESTED_EFFECTS = sandbox_effect
 UNTESTED_EFFECTS += mirror_effect
 UNTESTED_EFFECTS += resize_effect

-UNTESTED_EFFECTS += vignette_effect

 UNTESTED_EFFECTS += multiply_effect
 
 EFFECTS = $(TESTED_EFFECTS) $(UNTESTED_EFFECTS)
 UNTESTED_EFFECTS += multiply_effect
 
 EFFECTS = $(TESTED_EFFECTS) $(UNTESTED_EFFECTS)


@@ -125,7 +126,7 @@ check: $(TESTS)
 # You need to build with COVERAGE=1 to use this target.
 coverage: check
        lcov -d . -c -o movit.info
 # You need to build with COVERAGE=1 to use this target.
 coverage: check
        lcov -d . -c -o movit.info

-       lcov --remove movit.info '*_test.cpp' '*/test_util.{cpp,h}' -o movit.info
+       lcov --remove movit.info '*_test.cpp' 'test_util.*' 'sandbox_effect.*' widgets.cpp -o movit.info

        genhtml -o coverage movit.info
 
 HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h
        genhtml -o coverage movit.info
 
 HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h