diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-03-11 15:38:30 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-03-11 15:38:30 +0100 |
| commit | a3f5d6dff3587d3a1225c607359c241107232470 (patch) | |
| tree | 755bad119aec75c78287df7d57281c4634b38c84 | |
| parent | ab87b8ef0af7ef888b7d810db610ead6eb784d71 (diff) | |
| download | PROJ-a3f5d6dff3587d3a1225c607359c241107232470.tar.gz PROJ-a3f5d6dff3587d3a1225c607359c241107232470.zip | |
typo fix: Rename PJD_ERR_UNKNOW_UNIT_ID as PJD_ERR_UNKNOWN_UNIT_ID
Original mispelled constant kept for backward compatibility.
| -rw-r--r-- | src/PJ_unitconvert.c | 12 | ||||
| -rw-r--r-- | src/pj_init.c | 4 | ||||
| -rw-r--r-- | src/projects.h | 3 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/PJ_unitconvert.c b/src/PJ_unitconvert.c index 06224362..bedeb02b 100644 --- a/src/PJ_unitconvert.c +++ b/src/PJ_unitconvert.c @@ -415,7 +415,7 @@ PJ *CONVERSION(unitconvert,0) { proj_log_debug(P, "xy_in unit: %s", pj_units[i].name); } else { if ( (f = pj_param (P->ctx, P->params, "dxy_in").f) == 0.0) - return pj_default_destructor(P, PJD_ERR_UNKNOW_UNIT_ID); + return pj_default_destructor(P, PJD_ERR_UNKNOWN_UNIT_ID); } if (f != 0.0) Q->xy_factor *= f; @@ -429,7 +429,7 @@ PJ *CONVERSION(unitconvert,0) { proj_log_debug(P, "xy_out unit: %s", pj_units[i].name); } else { if ( (f = pj_param (P->ctx, P->params, "dxy_out").f) == 0.0) - return pj_default_destructor(P, PJD_ERR_UNKNOW_UNIT_ID); + return pj_default_destructor(P, PJD_ERR_UNKNOWN_UNIT_ID); } if (f != 0.0) Q->xy_factor /= f; @@ -443,7 +443,7 @@ PJ *CONVERSION(unitconvert,0) { proj_log_debug(P, "z_in unit: %s", pj_units[i].name); } else { if ( (f = pj_param (P->ctx, P->params, "dz_in").f) == 0.0) - return pj_default_destructor(P, PJD_ERR_UNKNOW_UNIT_ID); + return pj_default_destructor(P, PJD_ERR_UNKNOWN_UNIT_ID); } if (f != 0.0) Q->z_factor *= f; @@ -457,7 +457,7 @@ PJ *CONVERSION(unitconvert,0) { proj_log_debug(P, "z_out unit: %s", pj_units[i].name); } else { if ( (f = pj_param (P->ctx, P->params, "dz_out").f) == 0.0) - return pj_default_destructor(P, PJD_ERR_UNKNOW_UNIT_ID); + return pj_default_destructor(P, PJD_ERR_UNKNOWN_UNIT_ID); } if (f != 0.0) Q->z_factor /= f; @@ -467,7 +467,7 @@ PJ *CONVERSION(unitconvert,0) { if ((name = pj_param (P->ctx, P->params, "st_in").s) != NULL) { for (i = 0; (s = time_units[i].id) && strcmp(name, s) ; ++i); - if (!s) return pj_default_destructor(P, PJD_ERR_UNKNOW_UNIT_ID); /* unknown unit conversion id */ + if (!s) return pj_default_destructor(P, PJD_ERR_UNKNOWN_UNIT_ID); /* unknown unit conversion id */ Q->t_in_id = i; proj_log_debug(P, "t_in unit: %s", time_units[i].name); @@ -477,7 +477,7 @@ PJ *CONVERSION(unitconvert,0) { if ((name = pj_param (P->ctx, P->params, "st_out").s) != NULL) { for (i = 0; (s = time_units[i].id) && strcmp(name, s) ; ++i); - if (!s) return pj_default_destructor(P, PJD_ERR_UNKNOW_UNIT_ID); /* unknown unit conversion id */ + if (!s) return pj_default_destructor(P, PJD_ERR_UNKNOWN_UNIT_ID); /* unknown unit conversion id */ Q->t_out_id = i; proj_log_debug(P, "t_out unit: %s", time_units[i].name); diff --git a/src/pj_init.c b/src/pj_init.c index cd8b67d9..3ea2aea0 100644 --- a/src/pj_init.c +++ b/src/pj_init.c @@ -689,7 +689,7 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) { if ((name = pj_param(ctx, start, "sunits").s) != NULL) { for (i = 0; (s = pj_units[i].id) && strcmp(name, s) ; ++i) ; if (!s) - return pj_default_destructor (PIN, PJD_ERR_UNKNOW_UNIT_ID); + return pj_default_destructor (PIN, PJD_ERR_UNKNOWN_UNIT_ID); s = pj_units[i].to_meter; } if (s || (s = pj_param(ctx, start, "sto_meter").s)) { @@ -717,7 +717,7 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) { if ((name = pj_param(ctx, start, "svunits").s) != NULL) { for (i = 0; (s = pj_units[i].id) && strcmp(name, s) ; ++i) ; if (!s) - return pj_default_destructor (PIN, PJD_ERR_UNKNOW_UNIT_ID); + return pj_default_destructor (PIN, PJD_ERR_UNKNOWN_UNIT_ID); s = pj_units[i].to_meter; } if (s || (s = pj_param(ctx, start, "svto_meter").s)) { diff --git a/src/projects.h b/src/projects.h index 25ff82a4..5c8d1301 100644 --- a/src/projects.h +++ b/src/projects.h @@ -535,7 +535,8 @@ enum deprecated_constants_for_now_dropped_analytical_factors { #define PJD_ERR_PROJ_NOT_NAMED -4 #define PJD_ERR_UNKNOWN_PROJECTION_ID -5 #define PJD_ERR_ECCENTRICITY_IS_ONE -6 -#define PJD_ERR_UNKNOW_UNIT_ID -7 +#define PJD_ERR_UNKNOW_UNIT_ID -7 /* deprecated: typo */ +#define PJD_ERR_UNKNOWN_UNIT_ID -7 #define PJD_ERR_INVALID_BOOLEAN_PARAM -8 #define PJD_ERR_UNKNOWN_ELLP_PARAM -9 #define PJD_ERR_REV_FLATTENING_IS_ZERO -10 |