[Wavelet-commit] Wavelet MagickInter.cc, 1.3, 1.4 Makefile.in, 1.13, 1.14 config.guess, 1.12, 1.13
Status: Beta
Brought to you by:
herbert
Menu
▾
▴
[Wavelet-commit] Wavelet MagickInter.cc, 1.3, 1.4 Makefile.in, 1.13, 1.14 config.guess, 1.12, 1.13 config.sub, 1.12, 1.13 configure, 1.5, 1.6 configure.in, 1.5, 1.6 wave_version.h, 1.6, 1.7
|
From: Herbert M. D. <he...@us...> - 2009-10-16 11:08:58
|
Update of /cvsroot/wavelet/Wavelet In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2644 Modified Files: MagickInter.cc Makefile.in config.guess config.sub configure configure.in wave_version.h Log Message: graphics magick support added Index: configure =================================================================== RCS file: /cvsroot/wavelet/Wavelet/configure,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure 17 Apr 2008 07:27:34 -0000 1.5 --- configure 16 Oct 2009 11:08:48 -0000 1.6 *************** *** 1,59 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.61. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ! # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ! ## --------------------- ## ! ## M4sh Initialization. ## [...8862 lines suppressed...] + # configure is writing to config.log, and then calls config.status. *************** *** 6318,6322 **** # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. ! $ac_cs_success || { (exit 1); exit 1; } fi --- 5892,5900 ---- # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. ! $ac_cs_success || as_fn_exit $? ! fi ! if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then ! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 ! $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi Index: configure.in =================================================================== RCS file: /cvsroot/wavelet/Wavelet/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure.in 17 Apr 2008 07:27:34 -0000 1.5 --- configure.in 16 Oct 2009 11:08:48 -0000 1.6 *************** *** 124,128 **** AC_LANG_PUSH(C++) ! AC_CHECK_HEADER(Magick++/Image.h, MAGICK_INTER_DEF="-DMAGICK_INTER" MAGICK_INTER_LIB="-lMagick++", --- 124,135 ---- AC_LANG_PUSH(C++) ! AC_CHECK_HEADER(GraphicsMagick/Magick++.h, ! MAGICK_INTER_DEF="-I/usr/include/GraphicsMagick -DMAGICK_INTER" ! MAGICK_INTER_LIB="-lGraphicsMagick++", ! MAGICK_INTER_DEF="" ! MAGICK_INTER_LIB="" ! ) ! if test -z "$MAGICK_INTER_DEF"; then ! AC_CHECK_HEADER(Magick++.h, MAGICK_INTER_DEF="-DMAGICK_INTER" MAGICK_INTER_LIB="-lMagick++", *************** *** 130,133 **** --- 137,141 ---- MAGICK_INTER_LIB="" ) + fi AC_LANG_POP AC_SUBST(MAGICK_INTER_DEF) *************** *** 215,219 **** gcc*|g++*|c++*|*-g++) if test -z "$CXXWARN"; then ! CXXWARN="-Wall -Werror -ansi -pedantic" fi HAS_MM="yes" --- 223,228 ---- gcc*|g++*|c++*|*-g++) if test -z "$CXXWARN"; then ! CXXWARN="-Wall -Werror" ! CXXWARN2="-ansi -pedantic" fi HAS_MM="yes" *************** *** 224,227 **** --- 233,237 ---- AC_SUBST(PRELINK) AC_SUBST(CXXWARN) + AC_SUBST(CXXWARN2) VERSION=`grep WAVE_VERSION wave_version.h | sed "s/.*\"\(.*\)\"/\1/"` Index: Makefile.in =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Makefile.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.in 1 Sep 2009 12:54:18 -0000 1.13 --- Makefile.in 16 Oct 2009 11:08:48 -0000 1.14 *************** *** 123,130 **** CXXOPT = @CXXOPT@ CXXWARN = @CXXWARN@ ! CXXMISC = LDFLAGS = -L. @LDFLAGS@ @PFI_LIB@ @JPEG_LIB@ -lm ! CXXFLAGS = $(CPPFLAGS) $(CXXSHARED) $(CXXOPT) $(CXXDEBUG) $(CXXWARN) $(CXXMISC) ! CFLAGS = $(CPPFLAGS) $(CXXSHARED) $(CXXOPT) $(CXXDEBUG) $(CXXMISC) # --- 123,131 ---- CXXOPT = @CXXOPT@ CXXWARN = @CXXWARN@ ! CXXMISC = @CXXWARN2@ LDFLAGS = -L. @LDFLAGS@ @PFI_LIB@ @JPEG_LIB@ -lm ! BASECXXFLAGS = $(CPPFLAGS) $(CXXSHARED) $(CXXOPT) $(CXXDEBUG) $(CXXWARN) ! CXXFLAGS = $(BASECXXFLAGS) $(CXXMISC) ! CFLAGS = $(CPPFLAGS) $(CXXSHARED) $(CXXOPT) $(CXXDEBUG) # *************** *** 272,275 **** --- 273,282 ---- # + # GraphicsMagick's API uses long long, thus no -ansi -pedantic + # + MagickInter$O: MagickInter.cc WImage/MagickInter.hh + $(CXX) -c $(BASECXXFLAGS) $< -o $@ + + # # Automatic targets and rules: # Index: config.guess =================================================================== RCS file: /cvsroot/wavelet/Wavelet/config.guess,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** config.guess 1 Sep 2009 12:54:18 -0000 1.12 --- config.guess 16 Oct 2009 11:08:48 -0000 1.13 *************** *** 2,9 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. ! timestamp='2009-04-27' # This file is free software; you can redistribute it and/or modify it --- 2,9 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. ! timestamp='2009-06-10' # This file is free software; you can redistribute it and/or modify it *************** *** 171,175 **** eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ ! | grep __ELF__ >/dev/null then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). --- 171,175 ---- eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ ! | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). *************** *** 657,661 **** if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ! grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" --- 657,661 ---- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ! grep -q __LP64__ then HP_ARCH="hppa2.0w" *************** *** 823,826 **** --- 823,829 ---- echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? *************** *** 883,920 **** echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; ! mips:Linux:*:*) ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #undef CPU ! #undef mips ! #undef mipsel ! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mipsel ! #else ! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips ! #else ! CPU= ! #endif ! #endif ! EOF ! eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ! /^CPU/{ ! s: ::g ! p ! }'`" ! test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ! ;; ! mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU ! #undef mips64 ! #undef mips64el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mips64el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips64 #else CPU= --- 886,900 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; ! mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU ! #undef ${UNAME_MACHINE} ! #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=${UNAME_MACHINE} #else CPU= *************** *** 948,952 **** EV68*) UNAME_MACHINE=alphaev68 ;; esac ! objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} --- 928,932 ---- EV68*) UNAME_MACHINE=alphaev68 ;; esac ! objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} *************** *** 1002,1013 **** TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; esac # Determine whether the default compiler is a.out or elf --- 982,985 ---- *************** *** 1075,1079 **** echo ${UNAME_MACHINE}-pc-syllable exit ;; ! i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; --- 1047,1051 ---- echo ${UNAME_MACHINE}-pc-syllable exit ;; ! i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; *************** *** 1183,1187 **** echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; ! PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; --- 1155,1159 ---- echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; ! PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; Index: config.sub =================================================================== RCS file: /cvsroot/wavelet/Wavelet/config.sub,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** config.sub 1 Sep 2009 12:54:18 -0000 1.12 --- config.sub 16 Oct 2009 11:08:48 -0000 1.13 *************** *** 2,9 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. ! timestamp='2009-04-17' # This file is (in principle) common to ALL GNU software. --- 2,9 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. ! timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. *************** *** 154,157 **** --- 154,160 ---- basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= *************** *** 468,471 **** --- 471,478 ---- os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray *************** *** 1261,1265 **** # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ ! | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -kopensolaris* \ --- 1268,1272 ---- # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ ! | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -kopensolaris* \ *************** *** 1614,1618 **** vendor=sun ;; ! -aix*) vendor=ibm ;; --- 1621,1625 ---- vendor=sun ;; ! -cnk*|-aix*) vendor=ibm ;; Index: wave_version.h =================================================================== RCS file: /cvsroot/wavelet/Wavelet/wave_version.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wave_version.h 17 Apr 2008 11:29:04 -0000 1.6 --- wave_version.h 16 Oct 2009 11:08:48 -0000 1.7 *************** *** 12,16 **** #define __VERSION_H ! #define WAVE_VERSION "1.2" #endif --- 12,16 ---- #define __VERSION_H ! #define WAVE_VERSION "1.3pre" #endif Index: MagickInter.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/MagickInter.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MagickInter.cc 1 Sep 2009 12:54:17 -0000 1.3 --- MagickInter.cc 16 Oct 2009 11:08:47 -0000 1.4 *************** *** 13,19 **** #include <iostream> #include <cerrno> ! #include <Magick++/Image.h> ! #include <Magick++/Color.h> ! #include <Magick++/Geometry.h> using MagickLib::Quantum; --- 13,17 ---- #include <iostream> #include <cerrno> ! #include <Magick++.h> using MagickLib::Quantum; *************** *** 129,133 **** { static Magick::ColorRGB color; ! color.alphaQuantum (QuantumRange); color.red (transparencyBackground == MagickInter::WHITE? 1.0: 0.0); color.green (transparencyBackground == MagickInter::WHITE? 1.0: 0.0); --- 127,131 ---- { static Magick::ColorRGB color; ! color.alphaQuantum (MaxRGB); color.red (transparencyBackground == MagickInter::WHITE? 1.0: 0.0); color.green (transparencyBackground == MagickInter::WHITE? 1.0: 0.0); |
