diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2018-12-31 11:37:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-31 11:37:51 +0100 |
| commit | 32f3ef47e55c38b0eabb6d781fee3944d3239414 (patch) | |
| tree | ba2850500ee732559bada055dbab281ceff49a22 /scripts | |
| parent | 5c41d3a1078895ed096b416db15c91108bccad87 (diff) | |
| parent | 0e0e0e475414ddeb75e0e140d8a3381a431036d9 (diff) | |
| download | PROJ-32f3ef47e55c38b0eabb6d781fee3944d3239414.tar.gz PROJ-32f3ef47e55c38b0eabb6d781fee3944d3239414.zip | |
Merge pull request #1208 from rouault/merge_PJ_and_PJ_OBJ
Unify PJ_OBJ and PJ structures
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/create_c_api_projections.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/create_c_api_projections.py b/scripts/create_c_api_projections.py index 897212ee..e99c36a8 100755 --- a/scripts/create_c_api_projections.py +++ b/scripts/create_c_api_projections.py @@ -96,7 +96,7 @@ for sectiondef in compounddef.iter('sectiondef'): shortName = name[len('create'):] c_shortName = snake_casify(shortName) - decl = "proj_obj_create_conversion_" + decl = "proj_create_conversion_" decl += c_shortName decl += "(\n" decl += " PJ_CONTEXT *ctx,\n" @@ -122,7 +122,7 @@ for sectiondef in compounddef.iter('sectiondef'): decl += " const char* linear_unit_name, double linear_unit_conv_factor" decl += ")" - header.write("PJ_OBJ PROJ_DLL *" + decl + ";\n\n") + header.write("PJ PROJ_DLL *" + decl + ";\n\n") briefdescription = func.find('briefdescription/para').xpath("normalize-space()") briefdescription = briefdescription.replace("Instanciate ", "Instanciate a ProjectedCRS with ") @@ -136,7 +136,7 @@ for sectiondef in compounddef.iter('sectiondef'): if has_angle: cppfile.write(" * Angular parameters are expressed in (ang_unit_name, ang_unit_conv_factor).\n") cppfile.write(" */\n") - cppfile.write("PJ_OBJ* " + decl + "{\n"); + cppfile.write("PJ* " + decl + "{\n"); cppfile.write(" SANITIZE_CTX(ctx);\n"); cppfile.write(" try {\n"); if has_linear: @@ -157,7 +157,7 @@ for sectiondef in compounddef.iter('sectiondef'): cppfile.write(", Scale(" + param[1] + ")") cppfile.write(");\n") - cppfile.write(" return proj_obj_create_conversion(conv);\n") + cppfile.write(" return proj_create_conversion(conv);\n") cppfile.write(" } catch (const std::exception &e) {\n"); cppfile.write(" proj_log_error(ctx, __FUNCTION__, e.what());\n") cppfile.write(" }\n") @@ -165,7 +165,7 @@ for sectiondef in compounddef.iter('sectiondef'): cppfile.write("}\n") test_cppfile.write("{\n") - test_cppfile.write(" auto projCRS = proj_obj_create_conversion_" + c_shortName + "(\n") + test_cppfile.write(" auto projCRS = proj_create_conversion_" + c_shortName + "(\n") test_cppfile.write(" m_ctxt") for param in params: test_cppfile.write(", 0") |