diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | libtool | 16 | ||||
| -rw-r--r-- | src/PJ_healpix.c | 5 |
3 files changed, 15 insertions, 10 deletions
@@ -1,3 +1,7 @@ +2013-10-03 Frank Warmerdam <warmerdam@pobox.com> + + * src/PJ_healpix.c: Fix healpix build on msvc. (#223) + 2013-10-01 Frank Warmerdam <warmerdam@pobox.com> * nad/epsg: Upgraded to EPSG 8.2. @@ -1,8 +1,8 @@ -#! /bin/sh +#! /bin/bash # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (proj) 4.8.0 -# Libtool was configured on host gdal.mtv.corp.google.com: +# Generated automatically by config.status (proj) 4.9.0 +# Libtool was configured on host gdal: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -56,7 +56,7 @@ pic_mode=default fast_install=yes # Shell to use when invoking shell scripts. -SHELL="/bin/sh" +SHELL="/bin/bash" # An echo program that protects backslashes. ECHO="printf %s\\n" @@ -93,7 +93,7 @@ NM="/usr/bin/nm -B" LN_S="ln -s" # What is the maximum length of a command? -max_cmd_len=3458764513820540925 +max_cmd_len=1572864 # Object file suffix (normally "o"). objext=o @@ -161,7 +161,7 @@ lock_old_archive_extraction=no LTCC="gcc" # LTCC compiler flags. -LTCFLAGS="-g" +LTCFLAGS="-g -O2" # Take the output of nm and produce a listing of raw symbols and C names. global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'" @@ -269,10 +269,10 @@ finish_eval="" hardcode_into_libs=yes # Compile-time system search path for libraries. -sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.4.3 /usr/lib /lib /usr/lib/x86_64-linux-gnu " +sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.7 /usr/lib/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib " # Run-time system search path for libraries. -sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/nvidia-current /usr/lib32/nvidia-current /usr/local/grass-6.4.2svn/lib /usr/lib32/alsa-lib /usr/lib/alsa-lib /usr/local/lib /usr/lib/opencryptoki /usr/lib/opencryptoki/stdll /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu " +sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/i386-linux-gnu/mesa /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /lib/i686-linux-gnu /usr/lib/i686-linux-gnu /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu/mesa-egl /usr/lib/x86_64-linux-gnu/mesa " # Whether dlopen is supported. dlopen_support=unknown diff --git a/src/PJ_healpix.c b/src/PJ_healpix.c index 5c07700d..2cc918bb 100644 --- a/src/PJ_healpix.c +++ b/src/PJ_healpix.c @@ -247,11 +247,12 @@ LP healpix_sphere_inverse(XY xy) { lp.phi = asin(8.0*y/(3.0*PI)); } else if (fabsl(y) < PI/2.0) { double cn = floor(2.0*x/PI + 2.0); + double xc, tau; if (cn >= 4) { cn = 3; } - double xc = -3.0*PI/4.0 + (PI/2.0)*cn; - double tau = 2.0 - 4.0*fabsl(y)/PI; + xc = -3.0*PI/4.0 + (PI/2.0)*cn; + tau = 2.0 - 4.0*fabsl(y)/PI; lp.lam = xc + (x - xc)/tau; lp.phi = pj_sign(y)*asin(1.0 - pow(tau , 2.0)/3.0); } else { |