wavelet-commit Mailing List for Wavelet
Status: Beta
Brought to you by:
herbert
Menu
▾
▴
wavelet-commit
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(16) |
Aug
(16) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(5) |
Jun
|
Jul
|
Aug
(17) |
Sep
(3) |
Oct
|
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(10) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
(2) |
Mar
|
Apr
(12) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
(3) |
Oct
(5) |
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
|
From: Herbert M. D. <he...@us...> - 2011-11-17 20:05:54
|
Update of /cvsroot/wavelet/Wavelet/WTools
In directory vz-cvs-4.sog:/tmp/cvs-serv17474/WTools
Modified Files:
ImageComparison.hh
Log Message:
Small extension to ImageComparison: the L_q-related truncation functions now accept an optional parameter for the type of the 2-dimensional decomposition.
Index: ImageComparison.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WTools/ImageComparison.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ImageComparison.hh 15 Jul 2009 15:44:55 -0000 1.9
--- ImageComparison.hh 17 Nov 2011 20:05:51 -0000 1.10
***************
*** 21,24 ****
--- 21,26 ----
typedef enum { DRAWN = 0, SCANNED } imgtype;
+ /** The type of transform used for some operations. */
+ typedef enum { PYRAMID = 0, STANDARD } decomp;
/** A data structure for an $L^q$ norm. */
***************
*** 131,137 ****
* @param flt
* the filter to use
* @return an image of overall average and truncated coeffs */
! static Image *truncateForLq (const Image &image,
! double percent, FilterSet &flt);
/**
* Calculate an $L^q$ detail score for a greyscale image / single color
--- 133,141 ----
* @param flt
* the filter to use
+ * @param t
+ * the decomposition type to use (default: Standard)
* @return an image of overall average and truncated coeffs */
! static Image *truncateForLq (const Image &image, double percent,
! FilterSet &flt, const decomp t = STANDARD);
/**
* Calculate an $L^q$ detail score for a greyscale image / single color
***************
*** 174,180 ****
* @param flt
* the filter to use
* @return an image of overall average and truncated coeffs */
! static Image *truncateForLq (const Image &image,
! int nKeptCoeffs, FilterSet &flt);
/**
* Calculates a feature vector for the $L^q$ and $L^qd$ metrics.
--- 178,186 ----
* @param flt
* the filter to use
+ * @param t
+ * the decomposition type to use (default: Standard)
* @return an image of overall average and truncated coeffs */
! static Image *truncateForLq (const Image &image, int nKeptCoeffs,
! FilterSet &flt, const decomp t = STANDARD);
/**
* Calculates a feature vector for the $L^q$ and $L^qd$ metrics.
***************
*** 185,192 ****
* @param flt
* the filter to use
* @return an image information of overall average the n most significant
* coeffs sorted by absolute */
! static ImageInformation *imageInfoForLq (const Image &image,
! int nKeptCoeffs, FilterSet &flt);
/** The number of weights per colour channel. */
--- 191,200 ----
* @param flt
* the filter to use
+ * @param t
+ * the decomposition type to use (default: Standard)
* @return an image information of overall average the n most significant
* coeffs sorted by absolute */
! static ImageInformation *imageInfoForLq (const Image &image, int nKeptCoeffs,
! FilterSet &flt, const decomp t = STANDARD);
/** The number of weights per colour channel. */
|
|
From: Herbert M. D. <he...@us...> - 2011-11-17 20:05:53
|
Update of /cvsroot/wavelet/Wavelet
In directory vz-cvs-4.sog:/tmp/cvs-serv17474
Modified Files:
ImageComparison.cc MagickInter.cc
Log Message:
Small extension to ImageComparison: the L_q-related truncation functions now accept an optional parameter for the type of the 2-dimensional decomposition.
Index: MagickInter.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/MagickInter.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MagickInter.cc 27 May 2010 15:37:15 -0000 1.8
--- MagickInter.cc 17 Nov 2011 20:05:51 -0000 1.9
***************
*** 15,18 ****
--- 15,19 ----
#include <Magick++.h>
+ //using MagickLib::Quantum;
//using namespace MagickLib;
Index: ImageComparison.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/ImageComparison.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ImageComparison.cc 15 Jul 2009 15:44:54 -0000 1.12
--- ImageComparison.cc 17 Nov 2011 20:05:51 -0000 1.13
***************
*** 7,10 ****
--- 7,11 ----
*/
+ #include "Wave/PyramidTransform.hh"
#include "Wave/StandardTransform.hh"
#include "WTools/ImageComparison.hh"
***************
*** 249,256 ****
Image *
ImageComparison::truncateForLq (const Image &image, double percent,
! FilterSet &flt)
{
int nKeptCoeffs = (int)((double)(image.size () * percent) / 100.0);
! return truncateForLq (image, nKeptCoeffs, flt);
}
--- 250,257 ----
Image *
ImageComparison::truncateForLq (const Image &image, double percent,
! FilterSet &flt, const decomp t)
{
int nKeptCoeffs = (int)((double)(image.size () * percent) / 100.0);
! return truncateForLq (image, nKeptCoeffs, flt, t);
}
***************
*** 317,326 ****
Image *
! ImageComparison::truncateForLq (const Image &image,
! int nKeptCoeffs, FilterSet &flt)
{
Image *result = image.clone ();
! WaveletTransform *transform = NEW (StandardTransform (*result, flt));
transform->analysis (0);
DELETE (transform);
--- 318,329 ----
Image *
! ImageComparison::truncateForLq (const Image &image, int nKeptCoeffs,
! FilterSet &flt, const decomp t)
{
Image *result = image.clone ();
! WaveletTransform *transform = t == STANDARD
! ? (WaveletTransform*)NEW (StandardTransform (*result, flt))
! : (WaveletTransform*)NEW (PyramidTransform (*result, flt));
transform->analysis (0);
DELETE (transform);
***************
*** 360,369 ****
ImageInformation *
! ImageComparison::imageInfoForLq (const Image &image,
! int nKeptCoeffs, FilterSet &flt)
{
Image *tmp = image.clone ();
! WaveletTransform *transform = NEW (StandardTransform (*tmp, flt));
transform->analysis (0);
DELETE (transform);
--- 363,374 ----
ImageInformation *
! ImageComparison::imageInfoForLq (const Image &image, int nKeptCoeffs,
! FilterSet &flt, const decomp t)
{
Image *tmp = image.clone ();
! WaveletTransform *transform = t == STANDARD
! ? (WaveletTransform*)NEW (StandardTransform (*tmp, flt))
! : (WaveletTransform*)NEW (PyramidTransform (*tmp, flt));
transform->analysis (0);
DELETE (transform);
|
|
From: Herbert M. D. <he...@us...> - 2011-03-11 11:14:20
|
Update of /cvsroot/wavelet/Wavelet
In directory vz-cvs-4.sog:/tmp/cvs-serv9825
Modified Files:
avilib.h configure configure.in
Log Message:
MacOS Compat, better ImageMagick detection
Index: configure.in
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** configure.in 19 Oct 2009 12:37:01 -0000 1.7
--- configure.in 11 Mar 2011 11:14:18 -0000 1.8
***************
*** 125,132 ****
AC_LANG_PUSH(C++)
CPPFLAGS_ORG=$CPPFLAGS
! CPPFLAGS="-I/usr/include/GraphicsMagick $CPPFLAGS"
export CPPFLAGS
AC_CHECK_HEADER(GraphicsMagick/Magick++.h,
! MAGICK_INTER_DEF="-I/usr/include/GraphicsMagick -DMAGICK_INTER"
MAGICK_INTER_LIB="-lGraphicsMagick++",
MAGICK_INTER_DEF=""
--- 125,132 ----
AC_LANG_PUSH(C++)
CPPFLAGS_ORG=$CPPFLAGS
! CPPFLAGS="-I/usr/local/include/GraphicsMagick -I/usr/include/GraphicsMagick $CPPFLAGS"
export CPPFLAGS
AC_CHECK_HEADER(GraphicsMagick/Magick++.h,
! MAGICK_INTER_DEF="-I/usr/local/include/GraphicsMagick -I/usr/include/GraphicsMagick -DMAGICK_INTER"
MAGICK_INTER_LIB="-lGraphicsMagick++",
MAGICK_INTER_DEF=""
***************
*** 136,145 ****
unset CPPFLAGS
if test -z "$MAGICK_INTER_DEF"; then
AC_CHECK_HEADER(Magick++.h,
! MAGICK_INTER_DEF="-DMAGICK_INTER"
MAGICK_INTER_LIB="-lMagick++",
MAGICK_INTER_DEF=""
MAGICK_INTER_LIB=""
)
fi
AC_LANG_POP
--- 136,149 ----
unset CPPFLAGS
if test -z "$MAGICK_INTER_DEF"; then
+ CPPFLAGS="-I/usr/local/include/ImageMagick -I/usr/include/ImageMagick $CPPFLAGS"
+ export CPPFLAGS
AC_CHECK_HEADER(Magick++.h,
! MAGICK_INTER_DEF="-I/usr/local/include/ImageMagick -I/usr/include/ImageMagick -DMAGICK_INTER"
MAGICK_INTER_LIB="-lMagick++",
MAGICK_INTER_DEF=""
MAGICK_INTER_LIB=""
)
+ CPPFLAGS=$CPPFLAGS_ORG
+ unset CPPFLAGS
fi
AC_LANG_POP
Index: configure
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure 16 Oct 2009 11:08:48 -0000 1.6
--- configure 11 Mar 2011 11:14:18 -0000 1.7
***************
*** 1,80 ****
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.64.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
! # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
! # Foundation, Inc.
! #
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
[...9006 lines suppressed...]
# configure is writing to config.log, and then calls config.status.
***************
*** 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
--- 6468,6472 ----
# 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
Index: avilib.h
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/avilib.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** avilib.h 19 May 2010 11:42:36 -0000 1.9
--- avilib.h 11 Mar 2011 11:14:18 -0000 1.10
***************
*** 105,109 ****
#endif
! #ifdef SYS_LINUX
#include <stdint.h>
#endif
--- 105,109 ----
#endif
! #if defined(SYS_LINUX) || defined(SYS_APPLE)
#include <stdint.h>
#endif
|
|
From: Herbert M. D. <he...@us...> - 2010-05-27 15:37:23
|
Update of /cvsroot/wavelet/Wavelet In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15446 Modified Files: MagickInter.cc Log Message: enforce ppm P5 for tmp file in MagickInter::colorImageFromMagickImage Index: MagickInter.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/MagickInter.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MagickInter.cc 25 May 2010 08:31:23 -0000 1.7 --- MagickInter.cc 27 May 2010 15:37:15 -0000 1.8 *************** *** 223,226 **** --- 223,228 ---- try { + img.modifyImage (); + img.depth (MAX_PPM_DEPTH); img.write (tmp); std::auto_ptr<ColorImage> result (NEW (ColorImage ())); |
|
From: Herbert M. D. <he...@us...> - 2010-05-25 08:31:32
|
Update of /cvsroot/wavelet/Wavelet/debian In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27379/debian Modified Files: changelog Log Message: bugfix: remove temporary files after obtaining images via Magick++ Index: changelog =================================================================== RCS file: /cvsroot/wavelet/Wavelet/debian/changelog,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** changelog 19 May 2010 14:04:28 -0000 1.24 --- changelog 25 May 2010 08:31:23 -0000 1.25 *************** *** 1,2 **** --- 1,8 ---- + libwavelet (1.3.1) unstable; urgency=low + + * Bugfix: remove temporary files after obtaining images via Magick++ + + -- Martin Dietze <he...@sp...> Tue, 25 May 2010 10:31:02 +0100 + libwavelet (1.3) unstable; urgency=low |
|
From: Herbert M. D. <he...@us...> - 2010-05-25 08:31:32
|
Update of /cvsroot/wavelet/Wavelet In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27379 Modified Files: MagickInter.cc Log Message: bugfix: remove temporary files after obtaining images via Magick++ Index: MagickInter.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/MagickInter.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MagickInter.cc 19 May 2010 11:42:36 -0000 1.6 --- MagickInter.cc 25 May 2010 08:31:23 -0000 1.7 *************** *** 204,211 **** --- 204,213 ---- catch (const std::ios_base::failure &f) { + (void)remove (tmp.c_str ()); throw std::ios_base::failure (tmp + ": " + f.what ()); } catch (const std::exception &e) { + (void)remove (tmp.c_str ()); throw std::invalid_argument (tmp + ": " + e.what ()); } *************** *** 224,237 **** --- 226,243 ---- std::auto_ptr<ColorImage> result (NEW (ColorImage ())); result->read (tmp.c_str ()); + (void)remove (tmp.c_str ()); return result; } catch (const std::ios_base::failure &f) { + (void)remove (tmp.c_str ()); throw std::ios_base::failure (tmp + ": " + f.what ()); } catch (const std::exception &e) { + (void)remove (tmp.c_str ()); throw std::invalid_argument (tmp + ": " + e.what ()); } + (void)remove (tmp.c_str ()); throw std::invalid_argument (tmp + ": some other / unknown error."); } |
|
From: Herbert M. D. <he...@us...> - 2010-05-19 14:04:36
|
Update of /cvsroot/wavelet/Wavelet In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7139 Modified Files: config.guess config.sub Log Message: updated changelog for 1.3 release Index: config.guess =================================================================== RCS file: /cvsroot/wavelet/Wavelet/config.guess,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** config.guess 16 Oct 2009 11:08:48 -0000 1.13 --- config.guess 19 May 2010 14:04:28 -0000 1.14 *************** *** 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 --- 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, 2010 # Free Software Foundation, Inc. ! timestamp='2009-12-30' # This file is free software; you can redistribute it and/or modify it *************** *** 28,34 **** ! # Originally written by Per Bothner <pe...@bo...>. ! # Please send patches to <con...@gn...>. Submit a context ! # diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to --- 28,34 ---- ! # Originally written by Per Bothner. Please send patches (context ! # diff format) to <con...@gn...> and include a ChangeLog ! # entry. # # This script attempts to guess a canonical system name similar to *************** *** 36,41 **** # exits with 0. Otherwise, it exits with 1. # ! # The plan is that this can be called by configure scripts if you ! # don't specify an explicit build system type. me=`echo "$0" | sed -e 's,.*/,,'` --- 36,41 ---- # exits with 0. Otherwise, it exits with 1. # ! # You can get the latest version of this script from: ! # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD me=`echo "$0" | sed -e 's,.*/,,'` *************** *** 57,62 **** Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ! 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO --- 57,63 ---- Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ! 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free ! Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO *************** *** 334,337 **** --- 335,341 ---- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build *************** *** 808,817 **** echo ${UNAME_MACHINE}-pc-pw32 exit ;; ! *:Interix*:[3456]*) case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; ! EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; --- 812,821 ---- echo ${UNAME_MACHINE}-pc-pw32 exit ;; ! *:Interix*:*) case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; ! authenticamd | genuineintel | EM64T) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; *************** *** 855,858 **** --- 859,876 ---- echo ${UNAME_MACHINE}-pc-minix exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + 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} + exit ;; arm*:Linux:*:*) eval $set_cc_for_build *************** *** 877,880 **** --- 895,909 ---- echo frv-unknown-linux-gnu exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu *************** *** 902,910 **** #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; } ;; --- 931,935 ---- #endif EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; *************** *** 912,938 **** echo or32-unknown-linux-gnu exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - 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} - exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level --- 937,946 ---- echo or32-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level *************** *** 943,948 **** esac exit ;; ! parisc64:Linux:*:* | hppa64:Linux:*:*) ! echo hppa64-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) --- 951,959 ---- esac exit ;; ! ppc64:Linux:*:*) ! echo powerpc64-unknown-linux-gnu ! exit ;; ! ppc:Linux:*:*) ! echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) *************** *** 967,1022 **** echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <features.h> - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif - EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. --- 978,981 ---- *************** *** 1248,1251 **** --- 1207,1220 ---- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac Index: config.sub =================================================================== RCS file: /cvsroot/wavelet/Wavelet/config.sub,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** config.sub 16 Oct 2009 11:08:48 -0000 1.13 --- config.sub 19 May 2010 14:04:28 -0000 1.14 *************** *** 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. --- 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, 2010 # Free Software Foundation, Inc. ! timestamp='2010-01-22' # This file is (in principle) common to ALL GNU software. *************** *** 33,37 **** # Please send patches to <con...@gn...>. Submit a context ! # diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. --- 33,37 ---- # Please send patches to <con...@gn...>. Submit a context ! # diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. *************** *** 40,43 **** --- 40,46 ---- # Otherwise, we print the canonical config type on stdout and succeed. + # You can get the latest version of this script from: + # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases *************** *** 73,78 **** GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ! 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO --- 76,82 ---- GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ! 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free ! Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO *************** *** 150,154 **** -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ! -apple | -axis | -knuth | -cray) os= basic_machine=$1 --- 154,158 ---- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ! -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 *************** *** 285,288 **** --- 289,293 ---- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ *************** *** 292,295 **** --- 297,301 ---- | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ + | ubicom32 \ | v850 | v850e \ | we32k \ *************** *** 298,302 **** basic_machine=$basic_machine-unknown ;; ! m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown --- 304,308 ---- basic_machine=$basic_machine-unknown ;; ! m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown *************** *** 341,345 **** | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ --- 347,351 ---- | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ *************** *** 369,373 **** | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | 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-* \ --- 375,379 ---- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ ! | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ *************** *** 376,381 **** | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ ! | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ --- 382,389 ---- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ ! | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ! | tile-* | tilegx-* \ | tron-* \ + | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ *************** *** 727,730 **** --- 735,741 ---- os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc *************** *** 1077,1080 **** --- 1088,1096 ---- os=-coff ;; + # This must be matched before tile*. + tilegx*) + basic_machine=tilegx-unknown + os=-linux-gnu + ;; tile*) basic_machine=tile-unknown *************** *** 1248,1251 **** --- 1264,1270 ---- # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` *************** *** 1269,1274 **** -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ! | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ! | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ --- 1288,1293 ---- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ! | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ! | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ *************** *** 1291,1295 **** | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ! | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; --- 1310,1314 ---- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ! | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; *************** *** 1424,1427 **** --- 1443,1448 ---- os=-dicos ;; + -nacl*) + ;; -none) ;; |
|
From: Herbert M. D. <he...@us...> - 2010-05-19 14:04:36
|
Update of /cvsroot/wavelet/Wavelet/debian In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7139/debian Modified Files: changelog Log Message: updated changelog for 1.3 release Index: changelog =================================================================== RCS file: /cvsroot/wavelet/Wavelet/debian/changelog,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** changelog 16 Oct 2009 11:08:48 -0000 1.23 --- changelog 19 May 2010 14:04:28 -0000 1.24 *************** *** 1,2 **** --- 1,10 ---- + libwavelet (1.3) unstable; urgency=low + + * Legacy release + * Size limit for resizing images + * minor fixes for GraphicsMagick support + + -- Martin Dietze <he...@sp...> Wed, 19 May 2010 15:55:02 +0100 + libwavelet (1.3pre) unstable; urgency=low |
|
From: Herbert M. D. <he...@us...> - 2010-05-19 11:42:44
|
Update of /cvsroot/wavelet/Wavelet In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17092 Modified Files: ImageArray.cc ImageResizer.cc MagickInter.cc avilib.h Log Message: Set a limit to target sizes for image resizing. Index: MagickInter.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/MagickInter.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MagickInter.cc 19 Oct 2009 12:37:01 -0000 1.5 --- MagickInter.cc 19 May 2010 11:42:36 -0000 1.6 *************** *** 15,19 **** #include <Magick++.h> ! using MagickLib::Quantum; #ifdef WIN32 --- 15,19 ---- #include <Magick++.h> ! //using namespace MagickLib; #ifdef WIN32 Index: avilib.h =================================================================== RCS file: /cvsroot/wavelet/Wavelet/avilib.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** avilib.h 3 Nov 2004 14:19:48 -0000 1.8 --- avilib.h 19 May 2010 11:42:36 -0000 1.9 *************** *** 99,102 **** --- 99,103 ---- #include <stdio.h> #include <fcntl.h> + #include <stdint.h> #if !defined(COMP_MSC) Index: ImageResizer.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/ImageResizer.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ImageResizer.cc 21 Sep 2007 08:13:49 -0000 1.5 --- ImageResizer.cc 19 May 2010 11:42:36 -0000 1.6 *************** *** 95,100 **** /* now restore the old image's ratio for the one produced from the max * coefficients in the detail areas */ ! m_maxDetail->resize(m_maxDetail->rows() * oldY / tmp->rows(), ! m_maxDetail->cols() * oldX / tmp->cols()); m_colsMapping = m_image.cols () / m_maxDetail->cols (); m_rowsMapping = m_image.rows () / m_maxDetail->rows (); --- 95,102 ---- /* now restore the old image's ratio for the one produced from the max * coefficients in the detail areas */ ! int newY = m_maxDetail->rows () * oldY / tmp->rows (); ! int newX = m_maxDetail->cols () * oldX / tmp->cols (); ! ! m_maxDetail->resize (newY, newX); m_colsMapping = m_image.cols () / m_maxDetail->cols (); m_rowsMapping = m_image.rows () / m_maxDetail->rows (); Index: ImageArray.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/ImageArray.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ImageArray.cc 29 May 2009 10:25:13 -0000 1.9 --- ImageArray.cc 19 May 2010 11:42:35 -0000 1.10 *************** *** 18,25 **** #endif #include <stdexcept> #include "WImage/tools.h" template <class T> ! ImageArray<T>::ImageArray (void) { m_ar = NULL; --- 18,28 ---- #endif #include <stdexcept> + #include <cassert> + #include <climits> + #include <cstdio> #include "WImage/tools.h" template <class T> ! ImageArray<T>::ImageArray (void) { m_ar = NULL; *************** *** 31,35 **** template <class T> ! ImageArray<T>::ImageArray (int rows, int cols) { m_rows = NULL; --- 34,38 ---- template <class T> ! ImageArray<T>::ImageArray (int rows, int cols) { m_rows = NULL; *************** *** 50,54 **** template <class T> ! ImageArray<T>::~ImageArray (void) { DELETENOTNULLAR (m_ar); --- 53,57 ---- template <class T> ! ImageArray<T>::~ImageArray (void) { DELETENOTNULLAR (m_ar); *************** *** 56,66 **** } ! template <class T>void ImageArray<T>::resize (int rows, int cols) { ! int size = rows*cols; ! int ymin = MIN (rows, m_ysize); ! int xmin = MIN (cols, m_xsize); ! int x = 0, y = 0; if (rows < 0 || cols < 0) { --- 59,66 ---- } ! template <class T>void ImageArray<T>::resize (int rows, int cols) { ! static const int maxSize = INT_MAX / 10; if (rows < 0 || cols < 0) { *************** *** 73,78 **** --- 73,94 ---- "array size cannot be zero."); } + if (INT_MAX / rows < cols || rows * cols > maxSize) + { + char buf[512]; + snprintf (buf, sizeof buf - 1, + "resize: array size would be larger than " + "max allowed size of %d elements.", maxSize); + throw std::invalid_argument (buf); + } + int size = rows * cols; + int ymin = MIN (rows, m_ysize); + int xmin = MIN (cols, m_xsize); + int oldXySize = m_xysize; + int x = 0, y = 0; + //std::cout << "rows: " << rows << std::endl; + //std::cout << "cols: " << cols << std::endl; T *tmp = NEW (T[size]); + //std::cout << "size: " << size << std::endl; m_ysize = rows; *************** *** 85,89 **** //DPRINTF (("resize (%d, %d)\n", m_ysize, m_xsize)); ! for (y = 0; y < ymin; y++) { --- 101,105 ---- //DPRINTF (("resize (%d, %d)\n", m_ysize, m_xsize)); ! for (y = 0; y < ymin; y++) { *************** *** 92,97 **** for (x = 0; x < xmin; x++) { ! //DPRINTF (("tmp[%d+%d] = m_ar[%d+%d]: %d\n", // y1offs, x, y2offs, x, (int)m_ar[y2offs])); tmp[y1offs + x] = m_ar[y2offs + x]; } --- 108,117 ---- for (x = 0; x < xmin; x++) { ! //DPRINTF (("tmp[%d+%d] = m_ar[%d+%d]: %d\n", // y1offs, x, y2offs, x, (int)m_ar[y2offs])); + assert (y1offs + x >= 0); + assert (y2offs + x >= 0); + assert (y1offs + x < size); + assert (y2offs + x < oldXySize); tmp[y1offs + x] = m_ar[y2offs + x]; } *************** *** 102,106 **** } } ! for (; y < m_ysize; y++) { --- 122,126 ---- } } ! for (; y < m_ysize; y++) { *************** *** 118,122 **** } ! template <class T>void ImageArray<T>::import (int rows, int cols, T *array) { --- 138,142 ---- } ! template <class T>void ImageArray<T>::import (int rows, int cols, T *array) { *************** *** 144,148 **** template <class T>void ! ImageArray<T>::copy (ImageArray<T> &ia) { if (ia.size () == 0) --- 164,168 ---- template <class T>void ! ImageArray<T>::copy (ImageArray<T> &ia) { if (ia.size () == 0) *************** *** 167,171 **** ImageArray<T>::epsilons (ImageArray<T> &ia, T epsilon) const { ! if (!(ia.rows () == this->rows () && ia.cols () == this->cols () && ia.size () == this->size ())) --- 187,191 ---- ImageArray<T>::epsilons (ImageArray<T> &ia, T epsilon) const { ! if (!(ia.rows () == this->rows () && ia.cols () == this->cols () && ia.size () == this->size ())) *************** *** 200,206 **** int maxY = (toY < 0? rows (): toY); int maxX = (toX < 0? cols (): toX); ! max = at (fromY, fromX); ! for (int y = fromY; y < maxY; y++) { --- 220,226 ---- int maxY = (toY < 0? rows (): toY); int maxX = (toX < 0? cols (): toX); ! max = at (fromY, fromX); ! for (int y = fromY; y < maxY; y++) { *************** *** 224,230 **** int maxY = (toY < 0? rows (): toY); int maxX = (toX < 0? cols (): toX); ! min = at (fromY, fromX); ! for (int y = fromY; y < maxY; y++) { --- 244,250 ---- int maxY = (toY < 0? rows (): toY); int maxX = (toX < 0? cols (): toX); ! min = at (fromY, fromX); ! for (int y = fromY; y < maxY; y++) { *************** *** 248,255 **** int maxY = (toY < 0? rows (): toY); int maxX = (toX < 0? cols (): toX); ! max = at (fromY, fromX); max = (max < 0? -1*max: max); ! for (int y = fromY; y < maxY; y++) { --- 268,275 ---- int maxY = (toY < 0? rows (): toY); int maxX = (toX < 0? cols (): toX); ! max = at (fromY, fromX); max = (max < 0? -1*max: max); ! for (int y = fromY; y < maxY; y++) { *************** *** 274,281 **** int maxY = (toY < 0? rows (): toY); int maxX = (toX < 0? cols (): toX); ! min = at (fromY, fromX); min = (min < 0? -1*min : min); ! for (int y = fromY; y < maxY; y++) { --- 294,301 ---- int maxY = (toY < 0? rows (): toY); int maxX = (toX < 0? cols (): toX); ! min = at (fromY, fromX); min = (min < 0? -1*min : min); ! for (int y = fromY; y < maxY; y++) { *************** *** 309,313 **** } } ! return (nVals > 0)? ret / static_cast < T > (nVals): 0; } --- 329,333 ---- } } ! return (nVals > 0)? ret / static_cast < T > (nVals): 0; } *************** *** 330,334 **** } } ! return (nVals > 0)? ret / static_cast < T > (nVals): 0; } --- 350,354 ---- } } ! return (nVals > 0)? ret / static_cast < T > (nVals): 0; } *************** *** 336,340 **** ! template <class T>void ImageArray<T>::updateRowsArray (void) { --- 356,360 ---- ! template <class T>void ImageArray<T>::updateRowsArray (void) { |
|
From: Herbert M. D. <he...@us...> - 2010-03-05 09:03:21
|
Update of /cvsroot/wavelet/Wavelet In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13257 Modified Files: FileName.cc Log Message: Syntax fix for new v4 g++ compilers Index: FileName.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/FileName.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FileName.cc 8 Apr 2009 19:49:56 -0000 1.9 --- FileName.cc 5 Mar 2010 09:03:10 -0000 1.10 *************** *** 32,37 **** throw invalid_argument ("FileName: NULL reference to filename."); } ! char *dos = strrchr (name, '\\'); ! char *unx = strrchr (name, '/'); char const *extn = name; char const *base = name; --- 32,37 ---- throw invalid_argument ("FileName: NULL reference to filename."); } ! char const *dos = strrchr (name, '\\'); ! char const *unx = strrchr (name, '/'); char const *extn = name; char const *base = name; |
|
From: Herbert M. D. <he...@us...> - 2009-10-19 13:28:33
|
Update of /cvsroot/wavelet/Wavelet In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28789 Modified Files: MagickInter.cc avilib.c configure.in Log Message: Ubuntu fixes, repaired check for GraphicsMagick headers. Index: MagickInter.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/MagickInter.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MagickInter.cc 16 Oct 2009 11:08:47 -0000 1.4 --- MagickInter.cc 19 Oct 2009 12:37:01 -0000 1.5 *************** *** 425,429 **** } ! if ((fd = open (fname, O_CREAT | O_EXCL)) > 0) { break; --- 425,429 ---- } ! if ((fd = open (fname, O_CREAT | O_EXCL, S_IRWXU)) > 0) { break; Index: avilib.c =================================================================== RCS file: /cvsroot/wavelet/Wavelet/avilib.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** avilib.c 15 Aug 2005 16:24:23 -0000 1.8 --- avilib.c 19 Oct 2009 12:37:01 -0000 1.9 *************** *** 2445,2449 **** // read header ! fgets(data, 100, fd); if ( strncasecmp(data, "AVIIDX1", 7) != 0) { --- 2445,2449 ---- // read header ! (void)fgets(data, 100, fd); if ( strncasecmp(data, "AVIIDX1", 7) != 0) { *************** *** 2453,2457 **** // read comment ! fgets(data, 100, fd); f_pos = ftell(fd); while (fgets(data, 100, fd)) { --- 2453,2457 ---- // read comment ! (void)fgets(data, 100, fd); f_pos = ftell(fd); while (fgets(data, 100, fd)) { *************** *** 3604,3608 **** if ( (ret = avi_read(AVI->fdes,audbuf+nr,todo)) != todo) { ! fprintf(stderr, "XXX pos = %lld, ret = %lld, todo = %ld\n", pos, ret, todo); AVI_errno = AVI_ERR_READ; return -1; --- 3604,3608 ---- if ( (ret = avi_read(AVI->fdes,audbuf+nr,todo)) != todo) { ! fprintf(stderr, "XXX pos = %lld, ret = %lld, todo = %ld\n", (long long)pos, (long long)ret, todo); AVI_errno = AVI_ERR_READ; return -1; Index: configure.in =================================================================== RCS file: /cvsroot/wavelet/Wavelet/configure.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** configure.in 16 Oct 2009 11:08:48 -0000 1.6 --- configure.in 19 Oct 2009 12:37:01 -0000 1.7 *************** *** 124,127 **** --- 124,130 ---- AC_LANG_PUSH(C++) + CPPFLAGS_ORG=$CPPFLAGS + CPPFLAGS="-I/usr/include/GraphicsMagick $CPPFLAGS" + export CPPFLAGS AC_CHECK_HEADER(GraphicsMagick/Magick++.h, MAGICK_INTER_DEF="-I/usr/include/GraphicsMagick -DMAGICK_INTER" *************** *** 130,133 **** --- 133,138 ---- MAGICK_INTER_LIB="" ) + CPPFLAGS=$CPPFLAGS_ORG + unset CPPFLAGS if test -z "$MAGICK_INTER_DEF"; then AC_CHECK_HEADER(Magick++.h, |
|
From: Herbert M. D. <he...@us...> - 2009-10-16 11:09:13
|
Update of /cvsroot/wavelet/Wavelet/test In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2644/test Modified Files: Makefile.in Log Message: graphics magick support added Index: Makefile.in =================================================================== RCS file: /cvsroot/wavelet/Wavelet/test/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 17 Apr 2008 07:27:36 -0000 1.6 --- Makefile.in 16 Oct 2009 11:08:49 -0000 1.7 *************** *** 128,132 **** CXXDEBUG = @CXXDEBUG@ CXXOPT = @CXXOPT@ ! CXXWARN = @CXXWARN@ CXXMISC = LDFLAGS = @LDFLAGS@ @PFI_LIB@ @MAGICK_INTER_LIB@ @JPEG_LIB@ -lm --- 128,132 ---- CXXDEBUG = @CXXDEBUG@ CXXOPT = @CXXOPT@ ! CXXWARN = @CXXWARN@ @CXXWARN2@ CXXMISC = LDFLAGS = @LDFLAGS@ @PFI_LIB@ @MAGICK_INTER_LIB@ @JPEG_LIB@ -lm |
|
From: Herbert M. D. <he...@us...> - 2009-10-16 11:09:02
|
Update of /cvsroot/wavelet/Wavelet/debian In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2644/debian Modified Files: changelog Log Message: graphics magick support added Index: changelog =================================================================== RCS file: /cvsroot/wavelet/Wavelet/debian/changelog,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** changelog 17 Apr 2008 07:27:35 -0000 1.22 --- changelog 16 Oct 2009 11:08:48 -0000 1.23 *************** *** 1,2 **** --- 1,10 ---- + libwavelet (1.3pre) unstable; urgency=low + + * Various bugfixes + * Extended Magick++ support for use with GraphicsMagick + * Code is available in the CVS only + + -- Martin Dietze <he...@sp...> Wed, 16 Oct 2009 13:03:02 +0100 + libwavelet (1.2) unstable; urgency=low |
|
From: Herbert M. D. <he...@us...> - 2009-10-16 11:09:00
|
Update of /cvsroot/wavelet/Wavelet/tools In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2644/tools Modified Files: Makefile.in Log Message: graphics magick support added Index: Makefile.in =================================================================== RCS file: /cvsroot/wavelet/Wavelet/tools/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.in 19 Jun 2009 13:46:07 -0000 1.9 --- Makefile.in 16 Oct 2009 11:08:49 -0000 1.10 *************** *** 56,60 **** CXXOPT = @CXXOPT@ CXXMISC = ! CXXWARN = @CXXWARN@ LDFLAGS = -L.. -lwavelet @LDFLAGS@ @PFI_LIB@ @MAGICK_INTER_LIB@ @JPEG_LIB@ -lm CXXFLAGS = $(CPPFLAGS) $(CXXSHARED) $(CXXOPT) $(CXXDEBUG) $(CXXWARN) $(CXXMISC) --- 56,60 ---- CXXOPT = @CXXOPT@ CXXMISC = ! CXXWARN = @CXXWARN@ @CXXWARN2@ LDFLAGS = -L.. -lwavelet @LDFLAGS@ @PFI_LIB@ @MAGICK_INTER_LIB@ @JPEG_LIB@ -lm CXXFLAGS = $(CPPFLAGS) $(CXXSHARED) $(CXXOPT) $(CXXDEBUG) $(CXXWARN) $(CXXMISC) |
|
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); |
|
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) ;; |
|
From: Herbert M. D. <he...@us...> - 2009-09-01 12:54:28
|
Update of /cvsroot/wavelet/Wavelet/WImage In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv415/WImage Modified Files: MagickInter.hh Log Message: Added option to automatically set the color of transparent pixels to either black of white in MagickInter. Index: MagickInter.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/MagickInter.hh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MagickInter.hh 17 Apr 2008 07:27:35 -0000 1.1 --- MagickInter.hh 1 Sep 2009 12:54:18 -0000 1.2 *************** *** 15,19 **** #include <WImage/ColorImage.hh> ! #include <Magick++/Image.h> /** --- 15,22 ---- #include <WImage/ColorImage.hh> ! ! namespace Magick { ! class Image; ! } /** *************** *** 27,30 **** --- 30,39 ---- namespace MagickInter { + typedef enum { + NONE, + WHITE, + BLACK + } TransparencyBackground; + /** * Converts a ColorImage to a Magick::Image. *************** *** 73,79 **** /** ! * Creates a ColorImage object for an image in the file system using the Magick ! * classes. * @param inFile the input file name * @return an auto_ptr to the new ColorImage * @exception ios_base:failure if an I/O operation did not succeed (e.g. --- 82,90 ---- /** ! * Creates a ColorImage object for an image in the file system using the ! * Magick classes. * @param inFile the input file name + * @param transparencyBackground if not NONE, enforce WHITE or BLACK for + * pixels marked as transparent in the image * @return an auto_ptr to the new ColorImage * @exception ios_base:failure if an I/O operation did not succeed (e.g. *************** *** 82,86 **** * format etc.) */ ! std::auto_ptr<ColorImage> obtainColorImage (const std::string &inFile); /** --- 93,99 ---- * format etc.) */ ! std::auto_ptr<ColorImage> obtainColorImage (const std::string &inFile, ! const TransparencyBackground ! &transparencyBackground = NONE); /** |
|
From: Herbert M. D. <he...@us...> - 2009-09-01 12:54:28
|
Update of /cvsroot/wavelet/Wavelet/debian In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv415/debian Modified Files: control Log Message: Added option to automatically set the color of transparent pixels to either black of white in MagickInter. Index: control =================================================================== RCS file: /cvsroot/wavelet/Wavelet/debian/control,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** control 17 Apr 2008 11:29:05 -0000 1.7 --- control 1 Sep 2009 12:54:18 -0000 1.8 *************** *** 32,36 **** Section: libs Architecture: any ! Depends: libjpeg62, libmagick++9c2a,libpfi (>= 1.2) Description: Wavelet: a C++ class library for Wavelet transforms on images and videos. --- 32,36 ---- Section: libs Architecture: any ! Depends: libjpeg62, libmagick++10, libpfi (>= 1.2) Description: Wavelet: a C++ class library for Wavelet transforms on images and videos. |
|
From: Herbert M. D. <he...@us...> - 2009-07-15 15:45:03
|
Update of /cvsroot/wavelet/Wavelet In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3507 Modified Files: ImageComparison.cc Log Message: Reorganised weights for Lq metric in image comparision. Index: ImageComparison.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/ImageComparison.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ImageComparison.cc 19 Jun 2009 13:45:54 -0000 1.11 --- ImageComparison.cc 15 Jul 2009 15:44:54 -0000 1.12 *************** *** 22,27 **** #endif ! #define MAX_WEIGHT_IDX 5 ! static const float gl_weights[][MAX_WEIGHT_IDX + 1] = { { 4.04, 0.79, 0.45, 0.42, 0.41, 0.32 }, { 15.25, 0.92, 0.53, 0.26, 0.14, 0.07 }, --- 22,32 ---- #endif ! const float ImageComparison::m_scWeights[][N_WEIGHTS] = { ! { 5.00, 0.83, 1.01, 0.52, 0.47, 0.30 }, ! { 19.21, 1.26, 0.44, 0.53, 0.28, 0.14 }, ! { 34.47, 0.36, 0.45, 0.14, 0.18, 0.27 } ! }; ! ! const float ImageComparison::m_drWeights[][N_WEIGHTS] = { { 4.04, 0.79, 0.45, 0.42, 0.41, 0.32 }, { 15.25, 0.92, 0.53, 0.26, 0.14, 0.07 }, *************** *** 53,62 **** } ! for (int row = 0; row < 2; row++) { ! for (int col = 0; col < MAX_WEIGHT_IDX + 1; col++) ! { ! m_weights[row][col] = gl_weights[3 * row][col]; ! } } } --- 58,70 ---- } ! for (int col = 0; col < N_WEIGHTS; col++) { ! m_lqDWeights[0][col] = m_drWeights[0][col]; ! std::cout << "draw: " << m_lqDWeights[0][col] << std::endl; ! } ! for (int col = 0; col < N_WEIGHTS; col++) ! { ! m_lqDWeights[1][col] = m_scWeights[0][col]; ! std::cout << "scan: " << m_lqDWeights[0][col] << std::endl; } } *************** *** 131,135 **** m_images[i] = truncateForLq (*origs[i], percent, flt); } ! score.colors = m_weights[type][0] * fabs (m_images[0]->at (0, 0) - m_images[1]->at (0, 0)); --- 139,143 ---- m_images[i] = truncateForLq (*origs[i], percent, flt); } ! score.colors = m_lqDWeights[type][0] * fabs (m_images[0]->at (0, 0) - m_images[1]->at (0, 0)); *************** *** 190,194 **** int l1 = level (y); int l2 = y == x? l1: level (x); ! return m_weights [type][MIN (MAX (l1, l2), 5)]; } --- 198,202 ---- int l1 = level (y); int l2 = y == x? l1: level (x); ! return m_lqDWeights [type][MIN (MAX (l1, l2), 5)]; } *************** *** 257,262 **** // << std::setprecision (5) << std::setw (11) // << truncated2.at (0) << std::endl; ! return gl_weights[colorChannel][0] * ::fabs (truncated1.at (0) - ! truncated2.at (0)); } --- 265,270 ---- // << std::setprecision (5) << std::setw (11) // << truncated2.at (0) << std::endl; ! return m_scWeights[colorChannel][0] * ::fabs (truncated1.at (0) - ! truncated2.at (0)); } *************** *** 293,298 **** (int)floor (log ((double)cacheEntry) / log ((double)2)); } ! res -= gl_weights[colorChannel][MIN (indexCache[cacheEntry], ! MAX_WEIGHT_IDX)]; } else if (c1 != 0) --- 301,306 ---- (int)floor (log ((double)cacheEntry) / log ((double)2)); } ! res -= m_scWeights[colorChannel][MIN (indexCache[cacheEntry], ! N_WEIGHTS - 1)]; } else if (c1 != 0) *************** *** 353,357 **** ImageInformation * ImageComparison::imageInfoForLq (const Image &image, ! int nKeptCoeffs, FilterSet &flt) { --- 361,365 ---- ImageInformation * ImageComparison::imageInfoForLq (const Image &image, ! int nKeptCoeffs, FilterSet &flt) { *************** *** 388,389 **** --- 396,410 ---- return result; } + + const float * + ImageComparison::getWeights (const imgtype imgType, int channel) + { + switch (imgType) + { + case DRAWN: + return m_drWeights[channel]; + case SCANNED: + return m_scWeights[channel]; + } + throw std::invalid_argument ("unknown image type."); + } |
|
From: Herbert M. D. <he...@us...> - 2009-06-19 14:46:53
|
Update of /cvsroot/wavelet/Wavelet In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4434 Modified Files: ImageComparison.cc Log Message: added additional CLI tool ppmlq, added some more static methods to ImageComparison Index: ImageComparison.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/ImageComparison.cc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ImageComparison.cc 13 Apr 2009 19:29:38 -0000 1.10 --- ImageComparison.cc 19 Jun 2009 13:45:54 -0000 1.11 *************** *** 14,17 **** --- 14,19 ---- #include <cmath> #include <cassert> + #include <iomanip> + #include <iostream> #include "WImage/miscdefs.h" *************** *** 20,23 **** --- 22,32 ---- #endif + #define MAX_WEIGHT_IDX 5 + static const float gl_weights[][MAX_WEIGHT_IDX + 1] = { + { 4.04, 0.79, 0.45, 0.42, 0.41, 0.32 }, + { 15.25, 0.92, 0.53, 0.26, 0.14, 0.07 }, + { 22.62, 0.40, 0.73, 0.25, 0.15, 0.38 } + }; + ImageComparison::ImageComparison (const Image &img1, const Image &img2) { *************** *** 44,55 **** } - double defaults[][6] = { { 4.04, 0.78, 0.46, 0.42, 0.41, 0.32 }, - { 5.00, 0.83, 1.01, 0.52, 0.47, 0.30 }}; - for (int row = 0; row < 2; row++) { ! for (int col = 0; col < 6; col++) { ! m_weights[row][col] = defaults[row][col]; } } --- 53,61 ---- } for (int row = 0; row < 2; row++) { ! for (int col = 0; col < MAX_WEIGHT_IDX + 1; col++) { ! m_weights[row][col] = gl_weights[3 * row][col]; } } *************** *** 172,176 **** { m_lqcache[i].init = true; ! m_lqcache[i].val = (int)floor (log ((double)i) / log ((double)2)); } return m_lqcache[i].val; --- 178,182 ---- { m_lqcache[i].init = true; ! m_lqcache[i].val = 1 + (int)floor (log ((double)i) / log ((double)2)); } return m_lqcache[i].val; *************** *** 241,244 **** --- 247,311 ---- } + double + ImageComparison::calcLqAverageScore (const Image &truncated1, + const Image &truncated2, int colorChannel) + { + //std::cout.setf (std::ios::fixed, std::ios::floatfield); + //std::cout << "abs1: " + // << std::setprecision (5) << std::setw (11) + // << truncated1.at (0) << ", abs2: " + // << std::setprecision (5) << std::setw (11) + // << truncated2.at (0) << std::endl; + return gl_weights[colorChannel][0] * ::fabs (truncated1.at (0) - + truncated2.at (0)); + } + + double + ImageComparison::calcLqDetailScore (const Image &truncated1, + const Image &truncated2, int colorChannel) + { + double res = 0; + coeff c1, c2; + int indexCacheSize = MAX (truncated1.rows (), truncated1.cols ()); + int *indexCache = new int[indexCacheSize]; + for (int i = 0; i < indexCacheSize; ++i) + { + indexCache[i] = -1; + } + int cacheEntry = 0; + int misses = 0; + for (int y = 0; y < truncated1.rows (); ++y) + { + for (int x = 0; x < truncated1.cols (); ++x) + { + if (x == 0 && y == 0) + { + continue; + } + c1 = truncated1.at (y, x); + c2 = truncated2.at (y, x); + if ((c1 < 0 && c2 < 0) || (c1 > 0 && c2 > 0)) + { + cacheEntry = MAX (y, x); + if (indexCache[cacheEntry] < 0) + { + indexCache[cacheEntry] = 1 + + (int)floor (log ((double)cacheEntry) / log ((double)2)); + } + res -= gl_weights[colorChannel][MIN (indexCache[cacheEntry], + MAX_WEIGHT_IDX)]; + } + else if (c1 != 0) + { + ++misses; + } + } + } + //std::cout << "detail misses in color channel " << colorChannel + // << ": " << misses << std::endl; + DELETEAR (indexCache); + return res; + } + Image * ImageComparison::truncateForLq (const Image &image, |
|
From: Herbert M. D. <he...@us...> - 2009-06-19 14:46:50
|
Update of /cvsroot/wavelet/Wavelet/tools In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4434/tools Modified Files: Makefile.in Makefile.msc Makefile.watcomc Added Files: ppmlq.cc Log Message: added additional CLI tool ppmlq, added some more static methods to ImageComparison --- NEW FILE: ppmlq.cc --- /* * Calculate L^q distance on two colour images * * $Date: 2009/06/19 13:46:09 $ * $Revision: 1.1 $ * */ #include <WTools.hh> #include <cmath> #include <iomanip> #if !(defined __WATCOMC__ && __WATCOMC__ < 1230) using namespace std; #endif #define ROWS 128 #define COLS 128 #define KEPT 40 int main (int argc, char *argv[]) { if (argc != 3) { std::cerr << "Usage: ppmlq <file1> <file2>" << std::endl; return 1; } std::cout << "pgmcompare version " << WAVE_VERSION << " (c) 2001-2009 by Herbert" #ifdef PFI << " (pfi support enabled)" #endif << std::endl; ColorImage img1, img2; try { img1.read (argv[1]); } catch (const std::exception &e) { std::cerr << "Could not open first image for reading: " << argv[1] << ", " << e.what () << std::endl; return 1; } try { img2.read (argv[2]); } catch (const std::exception &e) { std::cerr << "Could not open second image for reading: " << argv[2] << ", " << e.what () << std::endl; return 2; } if (img1.colors () != img2.colors ()) { std::cerr << "Error, inconsisten number of colours: " << img1.colors () << " vs. " << img2.colors () << std::endl; return 1; } if (img1.colors () != 3 && img1.colors () != 1) { std::cerr << "Error, invalid number of colours: " << img1.colors () << " must be 1 or 3." << std::endl; return 1; } ColorImage *scaled1 = img1.fitInto (ROWS, COLS, ef_outerBorder); ColorImage *scaled2 = img2.fitInto (ROWS, COLS, ef_outerBorder); if (scaled1->colors () == 3) { scaled1->colormodel (cm_yuv); scaled2->colormodel (cm_yuv); } double detailScore = 0; double averageScore = 0; for (int i = 0; i < scaled1->colors (); ++i) { Image *c1 = ImageComparison::truncateForLq (scaled1->channel (i), KEPT, Haar); Image *c2 = ImageComparison::truncateForLq (scaled2->channel (i), KEPT, Haar); averageScore += ImageComparison::calcLqAverageScore (*c1, *c2, i); detailScore += ImageComparison::calcLqDetailScore (*c1, *c2, i); DELETE (c1); DELETE (c2); } DELETE (scaled1); DELETE (scaled2); std::cout.setf (std::ios::fixed, std::ios::floatfield); std::cout << "L^q: " << std::setprecision (5) << std::setw (11) << detailScore + averageScore << ", avg: " << std::setprecision (5) << std::setw (11) << averageScore << ", detail: " << std::setprecision (5) << std::setw (11) << detailScore << endl; return 0; } Index: Makefile.msc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/tools/Makefile.msc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.msc 9 Dec 2004 19:15:02 -0000 1.7 --- Makefile.msc 19 Jun 2009 13:46:09 -0000 1.8 *************** *** 27,34 **** OBJS = ppm2grey$O waveppm$O wavepgm$O pgmdiff$O pgmcompare$O pgmdenoise$O \ pgminmax$O pgmpixel$O pgmstats$O pgmhist$O pgmcount$O pgmscale$O \ ! vid2pgm$O video2grey$O imgconvert$O pgmequalize$O PROGRAMS = ppm2grey$E waveppm$E wavepgm$E pgmdiff$E pgmcompare$E pgmdenoise$E \ pgminmax$E pgmpixel$E pgmstats$E pgmhist$E pgmcount$E pgmscale$E \ ! vid2pgm$E video2grey$E imgconvert$E pgmequalize$E # --- 27,34 ---- OBJS = ppm2grey$O waveppm$O wavepgm$O pgmdiff$O pgmcompare$O pgmdenoise$O \ pgminmax$O pgmpixel$O pgmstats$O pgmhist$O pgmcount$O pgmscale$O \ ! vid2pgm$O video2grey$O imgconvert$O pgmequalize$O ppmlq$O PROGRAMS = ppm2grey$E waveppm$E wavepgm$E pgmdiff$E pgmcompare$E pgmdenoise$E \ pgminmax$E pgmpixel$E pgmstats$E pgmhist$E pgmcount$E pgmscale$E \ ! vid2pgm$E video2grey$E imgconvert$E pgmequalize$E ppmlq$E # *************** *** 60,63 **** --- 60,64 ---- pgmdiff$E: pgmdiff$O pgmcompare$E: pgmcompare$O + ppmlq$E: ppmlq$O pgminmax$E: pgminmax$O pgmpixel$E: pgmpixel$O Index: Makefile.in =================================================================== RCS file: /cvsroot/wavelet/Wavelet/tools/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.in 17 Apr 2008 07:27:36 -0000 1.8 --- Makefile.in 19 Jun 2009 13:46:07 -0000 1.9 *************** *** 44,48 **** OBJS = ppm2grey$O waveppm$O wavepgm$O pgmdiff$O pgmcompare$O pgmdenoise$O \ pgminmax$O pgmpixel$O pgmstats$O pgmhist$O pgmcount$O pgmscale$O \ ! vid2pgm$O video2grey$O imgconvert$O pgmequalize$O PROGRAMS = $(OBJS:$O=$E) DEPENDS = $(OBJS:$O=.dd) --- 44,48 ---- OBJS = ppm2grey$O waveppm$O wavepgm$O pgmdiff$O pgmcompare$O pgmdenoise$O \ pgminmax$O pgmpixel$O pgmstats$O pgmhist$O pgmcount$O pgmscale$O \ ! vid2pgm$O video2grey$O imgconvert$O pgmequalize$O ppmlq$O PROGRAMS = $(OBJS:$O=$E) DEPENDS = $(OBJS:$O=.dd) *************** *** 89,92 **** --- 89,95 ---- $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) + ppmlq$E: ppmlq$O + $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) + pgmcompare$E: pgmcompare$O $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) Index: Makefile.watcomc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/tools/Makefile.watcomc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.watcomc 25 Mar 2005 09:55:48 -0000 1.9 --- Makefile.watcomc 19 Jun 2009 13:46:09 -0000 1.10 *************** *** 4,11 **** PROGRAMS = ppm2grey$E waveppm$E wavepgm$E pgmdiff$E pgmcompare$E pgmdenoise$E & pgminmax$E pgmpixel$E pgmstats$E pgmhist$E pgmcount$E pgmscale$E & ! vid2pgm$E video2grey$E imgconvert$E pgmequalize$E OBJECTS = ppm2grey$O waveppm$O wavepgm$O pgmdiff$O pgmcompare$O pgmdenoise$O & pgminmax$O pgmpixel$O pgmstats$O pgmhist$O pgmcount$O pgmscale$O & ! vid2pgm$O video2grey$O imgconvert$O pgmequalize$O pgmnorm$O CPPFLAGS = -i=.. -i=..\..\pfi -dDPRINTF="" -dPFI -dJPEG --- 4,11 ---- PROGRAMS = ppm2grey$E waveppm$E wavepgm$E pgmdiff$E pgmcompare$E pgmdenoise$E & pgminmax$E pgmpixel$E pgmstats$E pgmhist$E pgmcount$E pgmscale$E & ! vid2pgm$E video2grey$E imgconvert$E pgmequalize$E ppmlq$E OBJECTS = ppm2grey$O waveppm$O wavepgm$O pgmdiff$O pgmcompare$O pgmdenoise$O & pgminmax$O pgmpixel$O pgmstats$O pgmhist$O pgmcount$O pgmscale$O & ! vid2pgm$O video2grey$O imgconvert$O pgmequalize$O pgmnorm$O ppmlq$O CPPFLAGS = -i=.. -i=..\..\pfi -dDPRINTF="" -dPFI -dJPEG |
|
From: Herbert M. D. <he...@us...> - 2009-06-19 14:46:39
|
Update of /cvsroot/wavelet/Wavelet/WTools In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4434/WTools Modified Files: ImageComparison.hh Log Message: added additional CLI tool ppmlq, added some more static methods to ImageComparison Index: ImageComparison.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WTools/ImageComparison.hh,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ImageComparison.hh 13 Apr 2009 19:29:38 -0000 1.7 --- ImageComparison.hh 19 Jun 2009 13:46:04 -0000 1.8 *************** *** 92,95 **** --- 92,98 ---- * Idea and basic algorithm from Jacobs, Finkelstein, Salesin: "Fast * multiresolution image querying", Proc. of SIGGRAPH, 95. + * Note that this method is deprecated as it does not strictly conform to + * the original algorithm. I propose using the static methods truncateForLq + * and calcLqAverageAcore, calcLqDetailScore instead. * @exception invalid_argument * image is not square *************** *** 132,135 **** --- 135,170 ---- double percent, FilterSet &flt); /** + * Calculate an $L^q$ detail score for a greyscale image / single color + * channel. + * @param truncated1 + * the first image already truncated (see truncateForLq) + * @param truncated2 + * the second image already truncated (see truncateForLq) + * @param colorChannel + * the number of the color channel to which the two images correspond, this + * is important as it has an effect on the weights chosen when calculating + * the score + * @result the detail score + */ + static double calcLqDetailScore (const Image &truncated1, + const Image &truncated2, + int colorChannel = 0); + /** + * Calculate an $L^q$ average score for a greyscale image / single color + * channel. + * @param truncated1 + * the first image already truncated (see truncateForLq) + * @param truncated2 + * the second image already truncated (see truncateForLq) + * @param colorChannel + * the number of the color channel to which the two images correspond, this + * is important as it has an effect on the weights chosen when calculating + * the score + * @result the average score + */ + static double calcLqAverageScore (const Image &truncated1, + const Image &truncated2, + int colorChannel = 0); + /** * Calculates a feature vector for the $L^q$ and $L^qd$ metrics. * @param image |
|
From: Herbert M. D. <he...@us...> - 2009-05-29 10:47:50
|
Update of /cvsroot/wavelet/Wavelet In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19030 Modified Files: Image.cc Log Message: fixed bug in fix of out-of-bounds access in image Index: Image.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Image.cc,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Image.cc 29 May 2009 10:25:13 -0000 1.33 --- Image.cc 29 May 2009 10:47:42 -0000 1.34 *************** *** 899,903 **** if (col >= m_image.cols ()) { ! row = m_image.rows () - 1; } } --- 899,903 ---- if (col >= m_image.cols ()) { ! col = m_image.cols () - 1; } } |
|
From: Herbert M. D. <he...@us...> - 2009-05-29 10:32:06
|
Update of /cvsroot/wavelet/Wavelet In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17288 Modified Files: JpgReader.cc Log Message: fixed out-of-bounds access in new fill function for resize Image::OuterBorderFill::doit() Index: JpgReader.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/JpgReader.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JpgReader.cc 29 May 2009 10:25:13 -0000 1.7 --- JpgReader.cc 29 May 2009 10:31:56 -0000 1.8 *************** *** 80,84 **** xysize = xsize * ysize; - std::cout << "jpg size: " << ysize << " / " << xsize << std::endl; for (int i = 0; i < m_channels; i++) { --- 80,83 ---- |
|
From: Herbert M. D. <he...@us...> - 2009-05-29 10:25:22
|
Update of /cvsroot/wavelet/Wavelet In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16941 Modified Files: Image.cc ImageArray.cc JpgReader.cc Log Message: fixed out-of-bounds access in new fill function for resize Image::OuterBorderFill::doit() Index: JpgReader.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/JpgReader.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JpgReader.cc 23 Feb 2009 17:26:41 -0000 1.6 --- JpgReader.cc 29 May 2009 10:25:13 -0000 1.7 *************** *** 80,83 **** --- 80,84 ---- xysize = xsize * ysize; + std::cout << "jpg size: " << ysize << " / " << xsize << std::endl; for (int i = 0; i < m_channels; i++) { Index: Image.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Image.cc,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** Image.cc 28 May 2009 12:21:30 -0000 1.32 --- Image.cc 29 May 2009 10:25:13 -0000 1.33 *************** *** 881,884 **** --- 881,888 ---- { row = (int)((double)y / factor + 0.5); + if (row >= m_image.rows ()) + { + row = m_image.rows () - 1; + } } if (x < xOffset) *************** *** 893,897 **** --- 897,907 ---- { col = (int)((double)x / factor + 0.5); + if (col >= m_image.cols ()) + { + row = m_image.rows () - 1; + } } + assert (row < m_image.rows ()); + assert (col < m_image.cols ()); return m_image.at (row, col); } Index: ImageArray.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/ImageArray.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ImageArray.cc 17 Apr 2008 07:27:34 -0000 1.8 --- ImageArray.cc 29 May 2009 10:25:13 -0000 1.9 *************** *** 180,189 **** if (!tools_epsilons (ia.at (row, col), this->at (row, col), epsilon)) { ! std::cout << "at " << row << " / " << col << ": " << "this: " << this->at (row, col) << ", that: " << ia.at (row, col) << ", diff: " << this->at (row, col) - ia.at (row, col) ! << std::endl; return false; } --- 180,189 ---- if (!tools_epsilons (ia.at (row, col), this->at (row, col), epsilon)) { ! /*std::cout << "at " << row << " / " << col << ": " << "this: " << this->at (row, col) << ", that: " << ia.at (row, col) << ", diff: " << this->at (row, col) - ia.at (row, col) ! << std::endl;*/ return false; } |
