[Wavelet-commit] Wavelet MagickInter.cc, 1.2, 1.3 Makefile.in, 1.12, 1.13 config.guess, 1.11, 1.12
Status: Beta
Brought to you by:
herbert
Menu
▾
▴
[Wavelet-commit] Wavelet MagickInter.cc, 1.2, 1.3 Makefile.in, 1.12, 1.13 config.guess, 1.11, 1.12 config.sub, 1.11, 1.12
|
From: Herbert M. D. <he...@us...> - 2009-09-01 12:54:28
|
Update of /cvsroot/wavelet/Wavelet In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv415 Modified Files: MagickInter.cc Makefile.in config.guess config.sub Log Message: Added option to automatically set the color of transparent pixels to either black of white in MagickInter. Index: Makefile.in =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Makefile.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.in 17 Apr 2008 07:27:34 -0000 1.12 --- Makefile.in 1 Sep 2009 12:54:18 -0000 1.13 *************** *** 150,154 **** Makefile.in Makefile.msc Makefile.watcomc Makefile.mdd Doxyfile.in \ tools/Makefile.in tools/Makefile.msc tools/Makefile.watcomc \ ! test/Makefile.in test/Makefile.msc test/Makefile.watcomc $(MAKE) clean tar -C .. -czvpf $@ $(addprefix Wavelet/, $^) --- 150,155 ---- Makefile.in Makefile.msc Makefile.watcomc Makefile.mdd Doxyfile.in \ tools/Makefile.in tools/Makefile.msc tools/Makefile.watcomc \ ! test/Makefile.in test/Makefile.msc test/Makefile.watcomc debian ! dh_clean 2>/dev/null || true $(MAKE) clean tar -C .. -czvpf $@ $(addprefix Wavelet/, $^) Index: MagickInter.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/MagickInter.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MagickInter.cc 23 Feb 2009 17:26:41 -0000 1.2 --- MagickInter.cc 1 Sep 2009 12:54:17 -0000 1.3 *************** *** 27,30 **** --- 27,32 ---- #include <fcntl.h> + #define MAX_PPM_DEPTH 8 + static std::string tempFilePrefixFromEnv (std::string paddern, std::string delim); *************** *** 121,124 **** --- 123,150 ---- } + static void + fixTransparency (Magick::Image &image, + const MagickInter::TransparencyBackground + &transparencyBackground) + { + 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); + color.blue (transparencyBackground == MagickInter::WHITE? 1.0: 0.0); + for (unsigned r = 0; r < image.rows (); ++r) + { + for (unsigned c = 0; c < image.columns (); ++c) + { + Magick::Color colorInFrame = image.pixelColor (c, r); + + if (colorInFrame.alphaQuantum () != 0) + { + image.pixelColor (c, r, color); + } + + } + } + } Magick::Image *************** *** 214,218 **** std::auto_ptr<ColorImage> ! MagickInter::obtainColorImage (const std::string &inFile) { std::auto_ptr<ColorImage> img (NEW (ColorImage ())); --- 240,246 ---- std::auto_ptr<ColorImage> ! MagickInter::obtainColorImage (const std::string &inFile, ! const TransparencyBackground ! &transparencyBackground) { std::auto_ptr<ColorImage> img (NEW (ColorImage ())); *************** *** 228,233 **** --- 256,267 ---- { Magick::Image fallBack (inFile); + if (fallBack.matte () && transparencyBackground != NONE) + { + fixTransparency(fallBack, transparencyBackground); + } try { + fallBack.modifyImage (); + fallBack.depth (MAX_PPM_DEPTH); fallBack.write (tmp); } Index: config.guess =================================================================== RCS file: /cvsroot/wavelet/Wavelet/config.guess,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** config.guess 17 Apr 2008 09:47:17 -0000 1.11 --- config.guess 1 Sep 2009 12:54:18 -0000 1.12 *************** *** 5,9 **** # Free Software Foundation, Inc. ! timestamp='2008-01-23' # This file is free software; you can redistribute it and/or modify it --- 5,9 ---- # Free Software Foundation, Inc. ! timestamp='2009-04-27' # This file is free software; you can redistribute it and/or modify it *************** *** 325,328 **** --- 325,331 ---- sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` *************** *** 332,336 **** exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ! echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) --- 335,352 ---- exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ! eval $set_cc_for_build ! SUN_ARCH="i386" ! # If there is a compiler, see if it is configured for 64-bit objects. ! # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ! # This test works for both compilers. ! if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ! if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ! (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ! grep IS_64BIT_ARCH >/dev/null ! then ! SUN_ARCH="x86_64" ! fi ! fi ! echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) *************** *** 797,801 **** echo i586-pc-interix${UNAME_RELEASE} exit ;; ! EM64T | authenticamd) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; --- 813,817 ---- echo i586-pc-interix${UNAME_RELEASE} exit ;; ! EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; *************** *** 936,939 **** --- 952,958 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level *************** *** 986,992 **** echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or --- 1005,1008 ---- *************** *** 1103,1108 **** # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about ! # the processor, so we play safe by assuming i386. ! echo i386-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) --- 1119,1127 ---- # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about ! # the processor, so we play safe by assuming i586. ! # Note: whatever this is, it MUST be the same as what config.sub ! # prints for the "djgpp" host, or else GDB configury will decide that ! # this is a cross-build. ! echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) *************** *** 1142,1145 **** --- 1161,1174 ---- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} *************** *** 1217,1220 **** --- 1246,1252 ---- echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} *************** *** 1325,1328 **** --- 1357,1363 ---- echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac Index: config.sub =================================================================== RCS file: /cvsroot/wavelet/Wavelet/config.sub,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** config.sub 17 Apr 2008 09:47:17 -0000 1.11 --- config.sub 1 Sep 2009 12:54:18 -0000 1.12 *************** *** 5,9 **** # Free Software Foundation, Inc. ! timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. --- 5,9 ---- # Free Software Foundation, Inc. ! timestamp='2009-04-17' # This file is (in principle) common to ALL GNU software. *************** *** 123,126 **** --- 123,127 ---- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os *************** *** 250,260 **** | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ! | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ ! | mips64vr | mips64vrel \ | mips64orion | mips64orionel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ --- 251,264 ---- | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ! | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ ! | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ *************** *** 269,272 **** --- 273,277 ---- | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ *************** *** 278,282 **** | pyramid \ | score \ ! | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ --- 283,287 ---- | pyramid \ | score \ ! | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ *************** *** 287,291 **** | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ! | z8k) basic_machine=$basic_machine-unknown ;; --- 292,296 ---- | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ! | z8k | z80) basic_machine=$basic_machine-unknown ;; *************** *** 330,341 **** | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ ! | mips64vr-* | mips64vrel-* \ | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ --- 335,349 ---- | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ ! | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ *************** *** 359,363 **** | pyramid-* \ | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ --- 367,371 ---- | pyramid-* \ | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ *************** *** 365,369 **** | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ ! | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ --- 373,377 ---- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ ! | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ *************** *** 372,376 **** | xstormy16-* | xtensa*-* \ | ymp-* \ ! | z8k-*) ;; # Recognize the basic CPU types without company name, with glob match. --- 380,384 ---- | xstormy16-* | xtensa*-* \ | ymp-* \ ! | z8k-* | z80-*) ;; # Recognize the basic CPU types without company name, with glob match. *************** *** 440,443 **** --- 448,455 ---- os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple *************** *** 460,463 **** --- 472,479 ---- os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex *************** *** 527,530 **** --- 543,550 ---- os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc *************** *** 1129,1132 **** --- 1149,1156 ---- os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none *************** *** 1167,1171 **** basic_machine=we32k-att ;; ! sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; --- 1191,1195 ---- basic_machine=we32k-att ;; ! sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; *************** *** 1239,1244 **** | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ! | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ --- 1263,1269 ---- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ! | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ *************** *** 1249,1253 **** | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ! | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- 1274,1278 ---- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ! | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ *************** *** 1389,1392 **** --- 1414,1420 ---- os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; |
