Changeset 13625

Show
Ignore:
Timestamp:
01/29/08 17:18:27 (5 months ago)
Author:
rouault
Message:

Move test for projection in SRS after dealing with geographic SRS

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gdal/ogr/ogrsf_frmts/geoconcept/geoconcept_syscoord.c

    r13624 r13625  
    105105  CPLDebug("GEOCONCEPT", "SRS :\n%s", pszProj4); 
    106106 
    107   pszProjection = OSRGetAttrValue(poSR, "PROJECTION", 0); 
    108   if( pszProjection == NULL ) 
    109   { 
    110     CPLError(CE_Warning, CPLE_IllegalArg, 
    111              "Failed parsing spatial reference system '%s'.\n", 
    112              pszProj4); 
    113     goto onError; 
    114   } 
    115  
    116107  if( !OSRIsProjected(poSR) && !OSRIsGeographic(poSR) ) 
    117108  { 
    …… 
    200191  y_0= OSRGetProjParm(poSR,SRS_PP_FALSE_NORTHING,0.0,NULL); 
    201192  k_0= OSRGetProjParm(poSR,SRS_PP_SCALE_FACTOR,1.0,NULL); 
     193 
     194  pszProjection = OSRGetAttrValue(poSR, "PROJECTION", 0); 
     195  if( pszProjection == NULL ) 
     196  { 
     197    CPLError(CE_Warning, CPLE_IllegalArg, 
     198             "Failed parsing spatial reference system '%s'.\n", 
     199             pszProj4); 
     200    goto onError; 
     201  } 
    202202 
    203203  if( EQUAL(pszProjection,SRS_PT_LAMBERT_CONFORMAL_CONIC_1SP) )