Skip to content

Commit

Permalink
Merge pull request #1254 from rouault/remove_biveval
Browse files Browse the repository at this point in the history
Completely remove Chebychev remains from codebase
  • Loading branch information
kbevers committed Feb 11, 2019
2 parents 08c2d69 + c45d769 commit e65df1f
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 560 deletions.
6 changes: 3 additions & 3 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,15 @@ libproj_la_SOURCES = \
transformations/molodensky.cpp \
transformations/vgridshift.cpp \
\
aasincos.cpp adjlon.cpp bch2bps.cpp bchgen.cpp \
biveval.cpp dmstor.cpp mk_cheby.cpp auth.cpp \
aasincos.cpp adjlon.cpp \
dmstor.cpp auth.cpp \
deriv.cpp ell_set.cpp ellps.cpp errno.cpp \
factors.cpp fwd.cpp init.cpp inv.cpp \
list.cpp malloc.cpp mlfn.cpp msfn.cpp proj_mdist.cpp \
open_lib.cpp param.cpp phi2.cpp pr_list.cpp \
qsfn.cpp strerrno.cpp \
tsfn.cpp units.cpp ctx.cpp log.cpp zpoly1.cpp rtodms.cpp \
vector1.cpp release.cpp gauss.cpp \
release.cpp gauss.cpp \
fileapi.cpp \
\
gc_reader.cpp gridcatalog.cpp \
Expand Down
6 changes: 4 additions & 2 deletions src/apps/gie.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@ static const struct errno_vs_err_const lookup[] = {
{"pjd_err_lat_0_or_alpha_eq_90" , -33},
{"pjd_err_ellipsoid_use_required" , -34},
{"pjd_err_invalid_utm_zone" , -35},
{"pjd_err_tcheby_val_out_of_range" , -36},
{"" , -36}, /* no longer used */
{"pjd_err_failed_to_find_proj" , -37},
{"pjd_err_failed_to_load_grid" , -38},
{"pjd_err_invalid_m_or_n" , -39},
Expand All @@ -1081,6 +1081,7 @@ static const struct errno_vs_err_const lookup[] = {
{"pjd_err_ellipsoidal_unsupported" , -56},
{"pjd_err_too_many_inits" , -57},
{"pjd_err_invalid_arg" , -58},
{"pjd_err_inconsistent_unit" , -59},
{"pjd_err_dont_skip" , 5555},
{"pjd_err_unknown" , 9999},
{"pjd_err_enomem" , ENOMEM},
Expand Down Expand Up @@ -1140,7 +1141,8 @@ static int errno_from_err_const (const char *err_const) {

/* First try to find a match excluding the PJD_ERR_ prefix */
for (i = 0; i < n; i++) {
if (0==strncmp (lookup[i].the_err_const + 8, err_const, len))
if (strlen(lookup[i].the_err_const) > 8 &&
0==strncmp (lookup[i].the_err_const + 8, err_const, len))
return lookup[i].the_errno;
}

Expand Down
154 changes: 0 additions & 154 deletions src/bch2bps.cpp

This file was deleted.

59 changes: 0 additions & 59 deletions src/bchgen.cpp

This file was deleted.

88 changes: 0 additions & 88 deletions src/biveval.cpp

This file was deleted.

6 changes: 3 additions & 3 deletions src/lib_proj.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,15 @@ SET(SRC_LIBPROJ_ISO19111

SET(SRC_LIBPROJ_CORE
pj_list.h proj_internal.h proj_math.h
aasincos.cpp adjlon.cpp bch2bps.cpp bchgen.cpp
biveval.cpp dmstor.cpp mk_cheby.cpp auth.cpp
aasincos.cpp adjlon.cpp
dmstor.cpp auth.cpp
deriv.cpp ell_set.cpp ellps.cpp errno.cpp
factors.cpp fwd.cpp init.cpp inv.cpp
list.cpp malloc.cpp mlfn.cpp msfn.cpp proj_mdist.cpp
open_lib.cpp param.cpp phi2.cpp pr_list.cpp
qsfn.cpp strerrno.cpp
tsfn.cpp units.cpp ctx.cpp log.cpp zpoly1.cpp rtodms.cpp
vector1.cpp release.cpp gauss.cpp
release.cpp gauss.cpp
fileapi.cpp
gc_reader.cpp gridcatalog.cpp
nad_cvt.cpp nad_init.cpp nad_intr.cpp
Expand Down

0 comments on commit e65df1f

Please sign in to comment.