[Wavelet-commit] Wavelet Image.cc, 1.25, 1.26 PyramidTransform.cc, 1.6, 1.7 configure, 1.3, 1.4 con
Status: Beta
Brought to you by:
herbert
Menu
▾
▴
[Wavelet-commit] Wavelet Image.cc, 1.25, 1.26 PyramidTransform.cc, 1.6, 1.7 configure, 1.3, 1.4 configure.in, 1.3, 1.4
|
From: Herbert M. D. <he...@us...> - 2007-08-15 13:14:03
|
Update of /cvsroot/wavelet/Wavelet In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16604 Modified Files: Image.cc PyramidTransform.cc configure configure.in Log Message: Crash fix in waveppm, bugfix in Image::variance(), minor polishin on imageresizer test. Index: configure =================================================================== RCS file: /cvsroot/wavelet/Wavelet/configure,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure 7 Aug 2007 17:00:59 -0000 1.3 --- configure 15 Aug 2007 13:13:57 -0000 1.4 *************** *** 1284,1289 **** --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ! --disable-pfi Turn off pfi support --enable-debug Turn on debugging Some influential environment variables: --- 1284,1290 ---- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ! --enable-pfi-check Turn on/off pfi support (on by default) --enable-debug Turn on debugging + --enable-trace Turn on excessive tracing messages Some influential environment variables: *************** *** 4344,4350 **** CHECK_PFI="yes" ! # Check whether --enable-debug was given. ! if test "${enable_debug+set}" = set; then ! enableval=$enable_debug; CHECK_PFI="no" else CHECK_PFI="yes" --- 4345,4351 ---- CHECK_PFI="yes" ! # Check whether --enable-pfi-check was given. ! if test "${enable_pfi_check+set}" = set; then ! enableval=$enable_pfi_check; CHECK_PFI="$enableval" else CHECK_PFI="yes" *************** *** 4353,4356 **** --- 4354,4358 ---- + if test $CHECK_PFI = yes; then if test "${ac_cv_header_pfi_h+set}" = set; then { echo "$as_me:$LINENO: checking for pfi.h" >&5 *************** *** 4546,4564 **** ! ! test "$CHECK_PFI" = "no" && PFI_DEF="" ! test "$CHECK_PFI" = "no" && PFI_LIB="" # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then ! enableval=$enable_debug; CXXDEBUG="-g -DDEBUG" test -z "$CXXOPT" && CXXOPT="" else - CXXDEBUG="-DDPRINTF" test -z "$CXXOPT" && CXXOPT="-O3" fi --- 4548,4582 ---- ! else ! PFI_DEF="" ! PFI_LIB="" ! fi + DEBUG="no" # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then ! enableval=$enable_debug; DEBUG="$enableval" ! fi ! ! ! if test $DEBUG = yes; then ! CXXDEBUG="-g -DDEBUG" test -z "$CXXOPT" && CXXOPT="" else test -z "$CXXOPT" && CXXOPT="-O3" + fi + + TRACE="no" + # Check whether --enable-trace was given. + if test "${enable_trace+set}" = set; then + enableval=$enable_trace; TRACE="$enableval" + fi + + if test $TRACE = no; then + CPPFLAGS="$CPPFLAGS -DDPRINTF" fi *************** *** 4569,4572 **** --- 4587,4591 ---- + GENERATE_LATEX=NO USE_PDFLATEX=NO Index: configure.in =================================================================== RCS file: /cvsroot/wavelet/Wavelet/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.in 7 Aug 2007 17:00:59 -0000 1.3 --- configure.in 15 Aug 2007 13:13:57 -0000 1.4 *************** *** 99,108 **** CHECK_PFI="yes" dnl Checks if we are going to enable the pfi library ! AC_ARG_ENABLE(debug, ! [--disable-pfi Turn off pfi support], ! CHECK_PFI="no", CHECK_PFI="yes" ) dnl Checks for pfi header. AC_CHECK_HEADER(pfi.h, --- 99,109 ---- CHECK_PFI="yes" dnl Checks if we are going to enable the pfi library ! AC_ARG_ENABLE(pfi-check, ! [--enable-pfi-check Turn on/off pfi support (on by default)], ! CHECK_PFI="$enableval", CHECK_PFI="yes" ) + if test $CHECK_PFI = yes; then dnl Checks for pfi header. AC_CHECK_HEADER(pfi.h, *************** *** 114,132 **** PFI_LIB="" ) ! ! test "$CHECK_PFI" = "no" && PFI_DEF="" ! test "$CHECK_PFI" = "no" && PFI_LIB="" AC_SUBST(PFI_DEF) AC_SUBST(PFI_LIB) dnl Checks if we are going to enable debugging AC_ARG_ENABLE(debug, [--enable-debug Turn on debugging], CXXDEBUG="-g -DDEBUG" ! test -z "$CXXOPT" && CXXOPT="", ! CXXDEBUG="-DDPRINTF" test -z "$CXXOPT" && CXXOPT="-O3" ! ) AC_SUBST(CXXOPT) AC_SUBST(CXXDEBUG) --- 115,150 ---- PFI_LIB="" ) ! else ! PFI_DEF="" ! PFI_LIB="" ! fi AC_SUBST(PFI_DEF) AC_SUBST(PFI_LIB) + DEBUG="no" dnl Checks if we are going to enable debugging AC_ARG_ENABLE(debug, [--enable-debug Turn on debugging], + DEBUG="$enableval") + + if test $DEBUG = yes; then CXXDEBUG="-g -DDEBUG" ! test -z "$CXXOPT" && CXXOPT="" ! else test -z "$CXXOPT" && CXXOPT="-O3" ! fi ! ! TRACE="no" ! dnl Checks if we are going to enable debugging ! AC_ARG_ENABLE(trace, ! [--enable-trace Turn on excessive tracing messages], ! TRACE="$enableval") ! ! if test $TRACE = no; then ! CPPFLAGS="$CPPFLAGS -DDPRINTF" ! fi ! ! AC_SUBST(CXXOPT) AC_SUBST(CXXDEBUG) Index: PyramidTransform.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/PyramidTransform.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PyramidTransform.cc 7 Aug 2007 17:00:59 -0000 1.6 --- PyramidTransform.cc 15 Aug 2007 13:13:57 -0000 1.7 *************** *** 120,124 **** } } ! DELETE (vSize); ! DELETE (hSize); } --- 120,124 ---- } } ! DELETEAR (vSize); ! DELETEAR (hSize); } Index: Image.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Image.cc,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Image.cc 10 Aug 2007 17:55:45 -0000 1.25 --- Image.cc 15 Aug 2007 13:13:57 -0000 1.26 *************** *** 161,165 **** coeff avg = abs? this->aaverage (fromY, fromX, lower, right) : this->saverage (fromY, fromX, lower, right); ! return variance (fromY, fromX, toY, toX, abs, avg); } --- 161,165 ---- coeff avg = abs? this->aaverage (fromY, fromX, lower, right) : this->saverage (fromY, fromX, lower, right); ! return variance (fromY, fromX, toY, toX, avg, abs); } |
