Attachment 32429 Details for Bug 25578 – Add --enable-single-precision option

[patch] Add --enable-single-precision option

03_single-precision.patch (text/plain), 26.59 KB, created by Marius Vollmer on 2010-01-04 03:28:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Vollmer

Created: 2010-01-04 03:28:10 UTC

Size: 26.59 KB

patch

obsolete

>Index: poppler/configure.ac
>===================================================================
>--- poppler.orig/configure.ac	2009-12-30 15:22:10.000000000 +0200
>+++ poppler/configure.ac	2009-12-30 15:22:26.000000000 +0200
>@@ -67,6 +67,10 @@
>               enable_xpdf_headers="no")
> AM_CONDITIONAL(ENABLE_XPDF_HEADERS, test x$enable_xpdf_headers = xyes)
> 
>+AC_ARG_ENABLE(single-precision,
>+[  --enable-single-precision     use single precision arithmetic (instead of double precision)],
>+AC_DEFINE(USE_FLOAT,      [1], [Use single precision arithmetic]))
>+
> AC_ARG_ENABLE(fixedpoint,
> [  --enable-fixedpoint     use fixed point (instead of floating point) arithmetic],
> AC_DEFINE(USE_FIXEDPOINT, [1], [Use fixed point arithmetic]))
>Index: poppler/aclocal.m4
>===================================================================
>--- poppler.orig/aclocal.m4	2009-12-30 15:22:10.000000000 +0200
>+++ poppler/aclocal.m4	2009-12-30 15:22:26.000000000 +0200
>@@ -13,8 +13,8 @@
> 
> m4_ifndef([AC_AUTOCONF_VERSION],
>   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
>-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
>-[m4_warning([this file was generated for autoconf 2.64.
>+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
>+[m4_warning([this file was generated for autoconf 2.65.
> You have another version of autoconf.  It may work, but is not guaranteed to.
> If you have problems, you may need to regenerate the build system entirely.
> To do so, use the procedure documented by the package, typically `autoreconf'.])])
>Index: poppler/config.h.in
>===================================================================
>--- poppler.orig/config.h.in	2009-12-30 15:22:10.000000000 +0200
>+++ poppler/config.h.in	2009-12-30 15:22:26.000000000 +0200
>@@ -173,6 +173,9 @@
> /* Use fixed point arithmetic */
> #undef USE_FIXEDPOINT
> 
>+/* Use single precision arithmetic */
>+#undef USE_FLOAT
>+
> /* Version number of package */
> #undef VERSION
> 
>Index: poppler/configure
>===================================================================
>--- poppler.orig/configure	2009-12-30 15:22:10.000000000 +0200
>+++ poppler/configure	2009-12-30 15:22:26.000000000 +0200
>@@ -1,12 +1,14 @@
> #! /bin/sh
> # Guess values for system-dependent variables and create Makefiles.
>-# Generated by GNU Autoconf 2.64 for poppler 0.12.2.
>+# Generated by GNU Autoconf 2.65 for poppler 0.12.2.
> #
> # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=poppler>.
> #
>+#
> # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
>-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
>-# Foundation, Inc.
>+# 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.
>@@ -677,7 +679,8 @@
> 
> 
> 
>-exec 7<&0 </dev/null 6>&1
>+test -n "$DJDIR" || exec 7<&0 </dev/null
>+exec 6>&1
> 
> # Name of the host.
> # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
>@@ -971,6 +974,7 @@
> with_gnu_ld
> enable_libtool_lock
> enable_xpdf_headers
>+enable_single_precision
> enable_fixedpoint
> with_x
> enable_exceptions
>@@ -1663,6 +1667,7 @@
>   --enable-dependency-tracking   do not reject slow dependency extractors
>   --disable-libtool-lock  avoid locking (might break parallel builds)
>   --enable-xpdf-headers   Install unsupported xpdf headers.
>+  --enable-single-precision     use single precision arithmetic (instead of double precision)
>   --enable-fixedpoint     use fixed point (instead of floating point) arithmetic
>   --enable-exceptions     use C++ exceptions
>   --disable-largefile     omit support for large files
>@@ -1673,9 +1678,9 @@
>   --disable-splash-output Don't build the Splash graphics backend.
>   --disable-cairo-output  Don't build the cairo graphics backend.
>   --disable-poppler-glib  Don't compile poppler glib wrapper.
>-  --enable-gtk-doc        use gtk-doc to build documentation [default=no]
>-  --enable-gtk-doc-html   build documentation in html format [default=yes]
>-  --enable-gtk-doc-pdf    build documentation in pdf format [default=no]
>+  --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
>+  --enable-gtk-doc-html   build documentation in html format [[default=yes]]
>+  --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
>   --disable-gdk           Compile without gdk.
>   --disable-poppler-qt    Don't compile poppler qt wrapper.
>   --disable-poppler-qt4   Don't compile poppler Qt4 wrapper.
>@@ -1703,7 +1708,7 @@
>   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
>               nonstandard directory <lib dir>
>   LIBS        libraries to pass to the linker, e.g. -l<library>
>-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
>+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
>               you have headers in a nonstandard directory <include dir>
>   CPP         C preprocessor
>   CXX         C++ compiler command
>@@ -1814,7 +1819,7 @@
> if $ac_init_version; then
>   cat <<\_ACEOF
> poppler configure 0.12.2
>-generated by GNU Autoconf 2.64
>+generated by GNU Autoconf 2.65
> 
> Copyright (C) 2009 Free Software Foundation, Inc.
> This configure script is free software; the Free Software Foundation
>@@ -1861,7 +1866,7 @@
> 	ac_retval=1
> fi
>   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
>-  return $ac_retval
>+  as_fn_set_status $ac_retval
> 
> } # ac_fn_c_try_compile
> 
>@@ -1907,7 +1912,7 @@
>   # left behind by Apple's compiler.  We do this before executing the actions.
>   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
>   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
>-  return $ac_retval
>+  as_fn_set_status $ac_retval
> 
> } # ac_fn_c_try_link
> 
>@@ -1975,7 +1980,7 @@
>     ac_retval=1
> fi
>   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
>-  return $ac_retval
>+  as_fn_set_status $ac_retval
> 
> } # ac_fn_c_try_cpp
> 
>@@ -2017,7 +2022,7 @@
> fi
>   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
>   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
>-  return $ac_retval
>+  as_fn_set_status $ac_retval
> 
> } # ac_fn_c_try_run
> 
>@@ -2122,7 +2127,7 @@
> 	ac_retval=1
> fi
>   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
>-  return $ac_retval
>+  as_fn_set_status $ac_retval
> 
> } # ac_fn_cxx_try_compile
> 
>@@ -2159,7 +2164,7 @@
>     ac_retval=1
> fi
>   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
>-  return $ac_retval
>+  as_fn_set_status $ac_retval
> 
> } # ac_fn_cxx_try_cpp
> 
>@@ -2205,7 +2210,7 @@
>   # left behind by Apple's compiler.  We do this before executing the actions.
>   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
>   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
>-  return $ac_retval
>+  as_fn_set_status $ac_retval
> 
> } # ac_fn_cxx_try_link
> 
>@@ -2373,7 +2378,7 @@
> running configure, to aid debugging if configure makes a mistake.
> 
> It was created by poppler $as_me 0.12.2, which was
>-generated by GNU Autoconf 2.64.  Invocation command line was
>+generated by GNU Autoconf 2.65.  Invocation command line was
> 
>   $ $0 $@
> 
>@@ -2626,7 +2631,7 @@
> for ac_site_file in "$ac_site_file1" "$ac_site_file2"
> do
>   test "x$ac_site_file" = xNONE && continue
>-  if test -r "$ac_site_file"; then
>+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
>     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
> $as_echo "$as_me: loading site script $ac_site_file" >&6;}
>     sed 's/^/| /' "$ac_site_file" >&5
>@@ -2635,9 +2640,9 @@
> done
> 
> if test -r "$cache_file"; then
>-  # Some versions of bash will fail to source /dev/null (special
>-  # files actually), so we avoid doing that.
>-  if test -f "$cache_file"; then
>+  # Some versions of bash will fail to source /dev/null (special files
>+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
>+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
>     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
> $as_echo "$as_me: loading cache $cache_file" >&6;}
>     case $cache_file in
>@@ -3057,6 +3062,7 @@
> 
> fi
> 
>+  test -d ./--version && rmdir ./--version
>   if test "${ac_cv_path_mkdir+set}" = set; then
>     MKDIR_P="$ac_cv_path_mkdir -p"
>   else
>@@ -3064,7 +3070,6 @@
>     # value for MKDIR_P within a source directory, because that will
>     # break other packages using the cache if that directory is
>     # removed, or if the value is a relative name.
>-    test -d ./--version && rmdir ./--version
>     MKDIR_P="$ac_install_sh -d"
>   fi
> fi
>@@ -4022,32 +4027,30 @@
> ... rest of stderr output deleted ...
>          10q' conftest.err >conftest.er1
>     cat conftest.er1 >&5
>-    rm -f conftest.er1 conftest.err
>   fi
>+  rm -f conftest.er1 conftest.err
>   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>   test $ac_status = 0; }
> done
> 
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h.  */
>-#include <stdio.h>
>+
> int
> main ()
> {
>-FILE *f = fopen ("conftest.out", "w");
>- return ferror (f) || fclose (f) != 0;
> 
>   ;
>   return 0;
> }
> _ACEOF
> ac_clean_files_save=$ac_clean_files
>-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
>+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
> # Try to create an executable without -o first, disregard a.out.
> # It will help us diagnose broken compilers, and finding out an intuition
> # of exeext.
>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
>-$as_echo_n "checking for C compiler default output file name... " >&6; }
>+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
>+$as_echo_n "checking whether the C compiler works... " >&6; }
> ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
> 
> # The possible output files:
>@@ -4109,10 +4112,10 @@
> else
>   ac_file=''
> fi
>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
>-$as_echo "$ac_file" >&6; }
> if test -z "$ac_file"; then :
>-  $as_echo "$as_me: failed program was:" >&5
>+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>+$as_echo "no" >&6; }
>+$as_echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
> { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
>@@ -4120,51 +4123,18 @@
> { as_fn_set_status 77
> as_fn_error "C compiler cannot create executables
> See \`config.log' for more details." "$LINENO" 5; }; }
>+else
>+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
>+$as_echo "yes" >&6; }
> fi
>+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
>+$as_echo_n "checking for C compiler default output file name... " >&6; }
>+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
>+$as_echo "$ac_file" >&6; }
> ac_exeext=$ac_cv_exeext
> 
>-# Check that the compiler produces executables we can run.  If not, either
>-# the compiler is broken, or we cross compile.
>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
>-$as_echo_n "checking whether the C compiler works... " >&6; }
>-# If not cross compiling, check that we can run a simple program.
>-if test "$cross_compiling" != yes; then
>-  if { ac_try='./$ac_file'
>-  { { case "(($ac_try" in
>-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>-  *) ac_try_echo=$ac_try;;
>-esac
>-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
>-$as_echo "$ac_try_echo"; } >&5
>-  (eval "$ac_try") 2>&5
>-  ac_status=$?
>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>-  test $ac_status = 0; }; }; then
>-    cross_compiling=no
>-  else
>-    if test "$cross_compiling" = maybe; then
>-	cross_compiling=yes
>-    else
>-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
>-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
>-as_fn_error "cannot run C compiled programs.
>-If you meant to cross compile, use \`--host'.
>-See \`config.log' for more details." "$LINENO" 5; }
>-    fi
>-  fi
>-fi
>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
>-$as_echo "yes" >&6; }
>-
>-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
>+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
> ac_clean_files=$ac_clean_files_save
>-# Check that the compiler produces executables we can run.  If not, either
>-# the compiler is broken, or we cross compile.
>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
>-$as_echo_n "checking whether we are cross compiling... " >&6; }
>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
>-$as_echo "$cross_compiling" >&6; }
>-
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
> $as_echo_n "checking for suffix of executables... " >&6; }
> if { { ac_try="$ac_link"
>@@ -4197,13 +4167,72 @@
> as_fn_error "cannot compute suffix of executables: cannot compile and link
> See \`config.log' for more details." "$LINENO" 5; }
> fi
>-rm -f conftest$ac_cv_exeext
>+rm -f conftest conftest$ac_cv_exeext
> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
> $as_echo "$ac_cv_exeext" >&6; }
> 
> rm -f conftest.$ac_ext
> EXEEXT=$ac_cv_exeext
> ac_exeext=$EXEEXT
>+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>+/* end confdefs.h.  */
>+#include <stdio.h>
>+int
>+main ()
>+{
>+FILE *f = fopen ("conftest.out", "w");
>+ return ferror (f) || fclose (f) != 0;
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+ac_clean_files="$ac_clean_files conftest.out"
>+# Check that the compiler produces executables we can run.  If not, either
>+# the compiler is broken, or we cross compile.
>+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
>+$as_echo_n "checking whether we are cross compiling... " >&6; }
>+if test "$cross_compiling" != yes; then
>+  { { ac_try="$ac_link"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
>+$as_echo "$ac_try_echo"; } >&5
>+  (eval "$ac_link") 2>&5
>+  ac_status=$?
>+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>+  test $ac_status = 0; }
>+  if { ac_try='./conftest$ac_cv_exeext'
>+  { { case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
>+$as_echo "$ac_try_echo"; } >&5
>+  (eval "$ac_try") 2>&5
>+  ac_status=$?
>+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>+  test $ac_status = 0; }; }; then
>+    cross_compiling=no
>+  else
>+    if test "$cross_compiling" = maybe; then
>+	cross_compiling=yes
>+    else
>+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
>+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
>+as_fn_error "cannot run C compiled programs.
>+If you meant to cross compile, use \`--host'.
>+See \`config.log' for more details." "$LINENO" 5; }
>+    fi
>+  fi
>+fi
>+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
>+$as_echo "$cross_compiling" >&6; }
>+
>+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
>+ac_clean_files=$ac_clean_files_save
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
> $as_echo_n "checking for suffix of object files... " >&6; }
> if test "${ac_cv_objext+set}" = set; then :
>@@ -5178,13 +5207,13 @@
> else
>   lt_cv_nm_interface="BSD nm"
>   echo "int some_variable = 0;" > conftest.$ac_ext
>-  (eval echo "\"\$as_me:5181: $ac_compile\"" >&5)
>+  (eval echo "\"\$as_me:5210: $ac_compile\"" >&5)
>   (eval "$ac_compile" 2>conftest.err)
>   cat conftest.err >&5
>-  (eval echo "\"\$as_me:5184: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
>+  (eval echo "\"\$as_me:5213: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
>   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
>   cat conftest.err >&5
>-  (eval echo "\"\$as_me:5187: output\"" >&5)
>+  (eval echo "\"\$as_me:5216: output\"" >&5)
>   cat conftest.out >&5
>   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
>     lt_cv_nm_interface="MS dumpbin"
>@@ -6387,7 +6416,7 @@
>   ;;
> *-*-irix6*)
>   # Find out which ABI we are using.
>-  echo '#line 6390 "configure"' > conftest.$ac_ext
>+  echo '#line 6419 "configure"' > conftest.$ac_ext
>   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
>   (eval $ac_compile) 2>&5
>   ac_status=$?
>@@ -7915,11 +7944,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:7918: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:7947: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>conftest.err)
>    ac_status=$?
>    cat conftest.err >&5
>-   echo "$as_me:7922: \$? = $ac_status" >&5
>+   echo "$as_me:7951: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>      # So say no if there are warnings other than the usual output.
>@@ -8254,11 +8283,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:8257: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:8286: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>conftest.err)
>    ac_status=$?
>    cat conftest.err >&5
>-   echo "$as_me:8261: \$? = $ac_status" >&5
>+   echo "$as_me:8290: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>      # So say no if there are warnings other than the usual output.
>@@ -8359,11 +8388,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:8362: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:8391: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>out/conftest.err)
>    ac_status=$?
>    cat out/conftest.err >&5
>-   echo "$as_me:8366: \$? = $ac_status" >&5
>+   echo "$as_me:8395: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s out/conftest2.$ac_objext
>    then
>      # The compiler can only warn and ignore the option if not recognized
>@@ -8414,11 +8443,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:8417: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:8446: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>out/conftest.err)
>    ac_status=$?
>    cat out/conftest.err >&5
>-   echo "$as_me:8421: \$? = $ac_status" >&5
>+   echo "$as_me:8450: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s out/conftest2.$ac_objext
>    then
>      # The compiler can only warn and ignore the option if not recognized
>@@ -10797,7 +10826,7 @@
>   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>   lt_status=$lt_dlunknown
>   cat > conftest.$ac_ext <<_LT_EOF
>-#line 10800 "configure"
>+#line 10829 "configure"
> #include "confdefs.h"
> 
> #if HAVE_DLFCN_H
>@@ -10893,7 +10922,7 @@
>   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>   lt_status=$lt_dlunknown
>   cat > conftest.$ac_ext <<_LT_EOF
>-#line 10896 "configure"
>+#line 10925 "configure"
> #include "confdefs.h"
> 
> #if HAVE_DLFCN_H
>@@ -11443,8 +11472,8 @@
> ... rest of stderr output deleted ...
>          10q' conftest.err >conftest.er1
>     cat conftest.er1 >&5
>-    rm -f conftest.er1 conftest.err
>   fi
>+  rm -f conftest.er1 conftest.err
>   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>   test $ac_status = 0; }
> done
>@@ -11918,8 +11947,8 @@
> ... rest of stderr output deleted ...
>          10q' conftest.err >conftest.er1
>     cat conftest.er1 >&5
>-    rm -f conftest.er1 conftest.err
>   fi
>+  rm -f conftest.er1 conftest.err
>   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>   test $ac_status = 0; }
> done
>@@ -12303,8 +12332,8 @@
> ... rest of stderr output deleted ...
>          10q' conftest.err >conftest.er1
>     cat conftest.er1 >&5
>-    rm -f conftest.er1 conftest.err
>   fi
>+  rm -f conftest.er1 conftest.err
>   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>   test $ac_status = 0; }
> done
>@@ -14447,11 +14476,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:14450: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:14479: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>conftest.err)
>    ac_status=$?
>    cat conftest.err >&5
>-   echo "$as_me:14454: \$? = $ac_status" >&5
>+   echo "$as_me:14483: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>      # So say no if there are warnings other than the usual output.
>@@ -14546,11 +14575,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:14549: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:14578: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>out/conftest.err)
>    ac_status=$?
>    cat out/conftest.err >&5
>-   echo "$as_me:14553: \$? = $ac_status" >&5
>+   echo "$as_me:14582: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s out/conftest2.$ac_objext
>    then
>      # The compiler can only warn and ignore the option if not recognized
>@@ -14598,11 +14627,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:14601: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:14630: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>out/conftest.err)
>    ac_status=$?
>    cat out/conftest.err >&5
>-   echo "$as_me:14605: \$? = $ac_status" >&5
>+   echo "$as_me:14634: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s out/conftest2.$ac_objext
>    then
>      # The compiler can only warn and ignore the option if not recognized
>@@ -16028,8 +16057,8 @@
> ... rest of stderr output deleted ...
>          10q' conftest.err >conftest.er1
>     cat conftest.er1 >&5
>-    rm -f conftest.er1 conftest.err
>   fi
>+  rm -f conftest.er1 conftest.err
>   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>   test $ac_status = 0; }
> done
>@@ -16813,6 +16842,14 @@
> fi
> 
> 
>+# Check whether --enable-single-precision was given.
>+if test "${enable_single_precision+set}" = set; then :
>+  enableval=$enable_single_precision;
>+$as_echo "#define USE_FLOAT 1" >>confdefs.h
>+
>+fi
>+
>+
> # Check whether --enable-fixedpoint was given.
> if test "${enable_fixedpoint+set}" = set; then :
>   enableval=$enable_fixedpoint;
>@@ -18752,7 +18789,7 @@
> do
>   for j in png.h;
>   do
>-    echo "configure: 18755: $i/$j" >&5
>+    echo "configure: 18792: $i/$j" >&5
>     if test -r "$i/$j"; then
>       echo "taking that" >&5
>       png_incdir=$i
>@@ -22038,7 +22075,7 @@
> # values after options handling.
> ac_log="
> This file was extended by poppler $as_me 0.12.2, which was
>-generated by GNU Autoconf 2.64.  Invocation command line was
>+generated by GNU Autoconf 2.65.  Invocation command line was
> 
>   CONFIG_FILES    = $CONFIG_FILES
>   CONFIG_HEADERS  = $CONFIG_HEADERS
>@@ -22078,6 +22115,7 @@
> 
>   -h, --help       print this help, then exit
>   -V, --version    print version number and configuration settings, then exit
>+      --config     print configuration, then exit
>   -q, --quiet, --silent
>                    do not print progress messages
>   -d, --debug      don't remove temporary files
>@@ -22100,10 +22138,11 @@
> 
> _ACEOF
> cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
>+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
> ac_cs_version="\\
> poppler config.status 0.12.2
>-configured by $0, generated by GNU Autoconf 2.64,
>-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
>+configured by $0, generated by GNU Autoconf 2.65,
>+  with options \\"\$ac_cs_config\\"
> 
> Copyright (C) 2009 Free Software Foundation, Inc.
> This config.status script is free software; the Free Software Foundation
>@@ -22141,6 +22180,8 @@
>     ac_cs_recheck=: ;;
>   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
>     $as_echo "$ac_cs_version"; exit ;;
>+  --config | --confi | --conf | --con | --co | --c )
>+    $as_echo "$ac_cs_config"; exit ;;
>   --debug | --debu | --deb | --de | --d | -d )
>     debug=: ;;
>   --file | --fil | --fi | --f )
>@@ -22703,7 +22744,7 @@
> t delim
> :nl
> h
>-s/$.\{148\}$.*/\1/
>+s/$.\{148\}$..*/\1/
> t more1
> s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
> p
>@@ -22717,7 +22758,7 @@
> t nl
> :delim
> h
>-s/$.\{148\}$.*/\1/
>+s/$.\{148\}$..*/\1/
> t more2
> s/["\\]/\\&/g; s/^/"/; s/$/"/
> p
>Index: poppler/splash/SplashTypes.h
>===================================================================
>--- poppler.orig/splash/SplashTypes.h	2009-12-30 15:23:53.000000000 +0200
>+++ poppler/splash/SplashTypes.h	2009-12-30 15:24:01.000000000 +0200
>@@ -33,8 +33,12 @@
> #include "goo/FixedPoint.h"
> typedef FixedPoint SplashCoord;
> #else
>+#if USE_FLOAT
>+typedef float SplashCoord;
>+#else
> typedef double SplashCoord;
> #endif
>+#endif
> 
> //------------------------------------------------------------------------
> // antialiasing
>Index: poppler/splash/SplashMath.h
>===================================================================
>--- poppler.orig/splash/SplashMath.h	2009-12-30 15:25:05.000000000 +0200
>+++ poppler/splash/SplashMath.h	2009-12-30 15:27:53.000000000 +0200
>@@ -18,48 +18,72 @@
> #if USE_FIXEDPOINT
>   return FixedPoint::abs(x);
> #else
>+#if USE_FLOAT
>+  return fabsf(x);
>+#else
>   return fabs(x);
> #endif
>+#endif
> }
> 
> static inline int splashFloor(SplashCoord x) {
>   #if USE_FIXEDPOINT
>     return FixedPoint::floor(x);
>   #else
>+  #if USE_FLOAT
>+    return (int)floorf(x);
>+  #else
>     return (int)floor(x);
>   #endif
>+  #endif
> }
> 
> static inline int splashCeil(SplashCoord x) {
> #if USE_FIXEDPOINT
>   return FixedPoint::ceil(x);
> #else
>+#if USE_FLOAT
>+  return (int)ceilf(x);
>+#else
>   return (int)ceil(x);
> #endif
>+#endif
> }
> 
> static inline int splashRound(SplashCoord x) {
> #if USE_FIXEDPOINT
>   return FixedPoint::round(x);
> #else
>+#if USE_FLOAT
>+  return (int)floorf(x + 0.5);
>+#else
>   return (int)floor(x + 0.5);
> #endif
>+#endif
> }
> 
> static inline SplashCoord splashSqrt(SplashCoord x) {
> #if USE_FIXEDPOINT
>   return FixedPoint::sqrt(x);
> #else
>+#if USE_FLOAT
>+  return sqrtf(x);
>+#else
>   return sqrt(x);
> #endif
>+#endif
> }
> 
> static inline SplashCoord splashPow(SplashCoord x, SplashCoord y) {
> #if USE_FIXEDPOINT
>   return FixedPoint::pow(x, y);
> #else
>+#if USE_FLOAT
>+  return powf(x, y);
>+#else
>   return pow(x, y);
> #endif
>+#endif
> }
> 
> static inline SplashCoord splashDist(SplashCoord x0, SplashCoord y0,
>@@ -81,8 +105,12 @@
>     return dya * FixedPoint::sqrt(dxa / dya + 1);
>   }
> #else
>+#if USE_FLOAT
>+  return sqrtf(dx * dx + dy * dy);
>+#else
>   return sqrt(dx * dx + dy * dy);
> #endif
>+#endif
> }
> 
> #endif

Actions: View | Splinter Review

Attachments on bug 25578: 31969 | 32429

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.