[GRASS5] Re: [GRASS-CVS] radim: grass6/lib/proj convert.c,1.18,1.19

[Markus Neteler]

Hi,

should this also be fixed in 6.0.2-CVS?

Markus

On Fri, Jan 27, 2006 at 06:47:20PM +0100, grass at intevation.de wrote:
> Author: radim
> 
> Update of /grassrepository/grass6/lib/proj
> In directory doto:/tmp/cvs-serv18826
> 
> Modified Files:
> 	convert.c 
> Log Message:
> use OGRSpatialReferenceH instead of pointer
> 
> Index: convert.c
> ===================================================================
> RCS file: /grassrepository/grass6/lib/proj/convert.c,v
> retrieving revision 1.18
> retrieving revision 1.19
> diff -u -d -r1.18 -r1.19
> --- convert.c	4 Dec 2005 14:37:08 -0000	1.18
> +++ convert.c	27 Jan 2006 17:47:18 -0000	1.19
> @@ -226,12 +226,13 @@
>  }
>  
>  int GPJ_osr_to_grass(struct Cell_head *cellhd, struct Key_Value **projinfo, 
> -                     struct Key_Value **projunits, OGRSpatialReferenceH *hSRS,
> +                     struct Key_Value **projunits, OGRSpatialReferenceH *phSRS,
>  		     int interactive)
>  {
>      struct Key_Value *temp_projinfo;
>      char *pszProj4 = NULL, *pszRemaining;
>      char *pszProj = NULL;
> +    OGRSpatialReferenceH hSRS = *phSRS;
>      
>      if( hSRS == NULL )
>          goto default_to_xy;
> @@ -373,6 +374,7 @@
>          {
>  	    /* Need to make a new copy of the string so we don't mess
>  	     * around with the memory inside the OGRSpatialReferenceH? */
> +
>  	    G_asprintf( &pszDatumName, pszDatumNameConst );
>              GPJ_DatumNameMassage( &pszDatumName );
>  
> 
> 
> _______________________________________________
> grass-commit mailing list
> grass-commit at grass.itc.it
> http://grass.itc.it/mailman/listinfo/grass-commit