File tree 1 file changed +5
-1
lines changed
1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -825,18 +825,22 @@ int msProcessProjection(projectionObj *p)
825
825
826
826
#if PROJ_VERSION_MAJOR >= 6
827
827
{
828
- char szTemp [24 ];
829
828
char * * args = (char * * )msSmallMalloc (sizeof (char * ) * (p -> numargs + 1 ));
830
829
memcpy (args , p -> args , sizeof (char * ) * p -> numargs );
831
830
831
+ #if PROJ_VERSION_MAJOR == 6 && PROJ_VERSION_MINOR < 2
832
832
/* PROJ lookups are faster with EPSG in uppercase. Fixed in PROJ 6.2 */
833
+ /* Do that only for those versions, as it can create confusion if using */
834
+ /* a real old-style 'epsg' file... */
835
+ char szTemp [24 ];
833
836
if ( p -> numargs && strncmp (args [0 ], "init=epsg:" , strlen ("init=epsg:" )) == 0 &&
834
837
strlen (args [0 ]) < 24 )
835
838
{
836
839
strcpy (szTemp , "init=EPSG:" );
837
840
strcat (szTemp , args [0 ] + strlen ("init=epsg:" ));
838
841
args [0 ] = szTemp ;
839
842
}
843
+ #endif
840
844
841
845
args [p -> numargs ] = (char * ) "type=crs" ;
842
846
if ( !(p -> proj = proj_create_argv (p -> proj_ctx -> proj_ctx , p -> numargs + 1 , args )) ) {
You can’t perform that action at this time.
0 commit comments