Hello community, here is the log from the commit of package iscan-free checked in at Tue Oct 16 18:01:40 CEST 2007. -------- --- iscan-free/iscan-free.changes 2007-10-11 14:57:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/iscan-free/iscan-free.changes 2007-10-16 14:31:06.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Oct 16 14:30:45 CEST 2007 - jsmeix@suse.de + +- Changed fixes-for-GCC43.patch as suggested by Olaf Meeuwissen + so that it also works for GCC before 4.3. + With the previous fixes-for-GCC43.patch GCC before 4.3 showed: + "pisa_tool.h:59: multiple definition of 'double similarity..." + and for GCC 4.3 the error was "pisa_tool.h:69: error: explicit + template specialization cannot have a storage class". + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iscan-free.spec ++++++ --- /var/tmp/diff_new_pack.H12487/_old 2007-10-16 17:56:36.000000000 +0200 +++ /var/tmp/diff_new_pack.H12487/_new 2007-10-16 17:56:36.000000000 +0200 @@ -42,7 +42,7 @@ Patch10: adapt-man-for-free.patch # Have Epson Avasys' release number at the end of the SUSE package Version: Version: 2.8.0.1 -Release: 38 +Release: 41 # See the post and triggerin sections what is pre-required: PreReq: coreutils, /bin/grep, /bin/sed Requires: sane-backends @@ -243,6 +243,13 @@ Dirk O. Siebnich %changelog +* Tue Oct 16 2007 - jsmeix@suse.de +- Changed fixes-for-GCC43.patch as suggested by Olaf Meeuwissen + so that it also works for GCC before 4.3. + With the previous fixes-for-GCC43.patch GCC before 4.3 showed: + "pisa_tool.h:59: multiple definition of 'double similarity..." + and for GCC 4.3 the error was "pisa_tool.h:69: error: explicit + template specialization cannot have a storage class". * Thu Oct 11 2007 - jsmeix@suse.de - fixes-for-GCC43.patch applies fixes for GCC 4.3, see http://en.opensuse.org/GCC_4.3_Transition ++++++ fixes-for-GCC43.patch ++++++ --- /var/tmp/diff_new_pack.H12487/_old 2007-10-16 17:56:36.000000000 +0200 +++ /var/tmp/diff_new_pack.H12487/_new 2007-10-16 17:56:36.000000000 +0200 @@ -20,18 +20,70 @@ #include "jpegstream.hh" #include "gettext.h" ---- frontend/pisa_tool.h.orig 2005-04-22 10:35:36.000000000 +0200 -+++ frontend/pisa_tool.h 2007-10-11 14:42:03.000000000 +0200 -@@ -54,9 +54,9 @@ static type similarity ( const type & A, +--- frontend/pisa_tool.h (revision 1529) ++++ frontend/pisa_tool.h (working copy) +@@ -35,12 +35,12 @@ + #include <config.h> + #include "pisa_structs.h" + +-template <class type> +-static type similarity ( const type & A, +- const type & a, +- const type & b ) ++template <class Type> ++Type similarity ( const Type & A, ++ const Type & a, ++ const Type & b ) + { +- type B; ++ Type B; + + if ( a == 0 ) + return 0; +@@ -53,22 +53,7 @@ + return B; } - template <> +-template <> -static double similarity <double> ( const double & A, - const double & a, - const double & b ) +-{ +- double B; + +- if ( a == 0 ) +- return 0; +- +- B = ( b * A ) / a; +- +- return B; +-} +- +- + template <class Type> + int pt_in_rect ( const _rect <Type> & rect, const _point <Type> & pt ) + { +--- frontend/pisa_tool.cc (revision 1529) ++++ frontend/pisa_tool.cc (working copy) +@@ -32,6 +32,21 @@ + #include "pisa_tool.h" + + ++template <> +double similarity <double> ( const double & A, + const double & a, + const double & b ) ++{ ++ double B; ++ ++ if ( a == 0 ) ++ return 0; ++ ++ B = ( b * A ) / a; ++ ++ return B; ++} ++ + /*--------------------------------------------------------------*/ + GtkWidget * xpm2widget ( GtkWidget * widget, char ** xpm_data ) { - double B; - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org