Changeset 14440

Show
Ignore:
Timestamp:
05/10/08 17:43:42 (2 months ago)
Author:
rouault
Message:

Be more carefull about casting C/C++ types

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gdal/ogr/ogrfeature.cpp

    r14434 r14440  
    453453    VALIDATE_POINTER1( hFeat, "OGR_F_GetGeometryRef", NULL ); 
    454454 
    455     return ((OGRFeature *) hFeat)->GetGeometryRef(); 
     455    return (OGRGeometryH) ((OGRFeature *) hFeat)->GetGeometryRef(); 
    456456} 
    457457 

  • trunk/gdal/ogr/ogrfeaturestyle.cpp

    r14434 r14440  
    571571    VALIDATE_POINTER1( hSM, "OGR_SM_InitStyleString", NULL ); 
    572572 
    573     return ((OGRStyleMgr *) hSM)->GetPart(nPartId, pszStyleString); 
     573    return (OGRStyleToolH) ((OGRStyleMgr *) hSM)->GetPart(nPartId, pszStyleString); 
    574574} 
    575575 
    …… 
    646646    { 
    647647      case OGRSTCPen: 
    648         return new OGRStylePen(); 
     648        return (OGRStyleToolH) new OGRStylePen(); 
    649649      case OGRSTCBrush: 
    650         return new OGRStyleBrush(); 
     650        return (OGRStyleToolH) new OGRStyleBrush(); 
    651651      case OGRSTCSymbol: 
    652         return new OGRStyleSymbol(); 
     652        return (OGRStyleToolH) new OGRStyleSymbol(); 
    653653      case OGRSTCLabel: 
    654         return new OGRStyleLabel(); 
     654        return (OGRStyleToolH) new OGRStyleLabel(); 
    655655      default: 
    656656        return NULL; 

  • trunk/gdal/ogr/ogrgeometry.cpp

    r14336 r14440  
    14371437#ifdef OGR_ENABLED 
    14381438    OGRGeometry* poGeometry = const_cast<OGRGeometry*>(this); 
    1439     return OGR_G_ExportToJson( static_cast<OGRGeometryH>(poGeometry) ); 
     1439    return OGR_G_ExportToJson( (OGRGeometryH) (poGeometry) ); 
    14401440#else 
    14411441    CPLError( CE_Failure, CPLE_AppDefined, 

  • trunk/gdal/ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.cpp

    r14433 r14440  
    363363                isSingle? poGeom:((OGRGeometryCollection*)poGeom)->getGeometryRef(iGeom); 
    364364            nextField= WriteFeatureGeometry_GCIO(_gcFeature, 
    365                                                  poGeomPart); 
     365                                                 (OGRGeometryH)poGeomPart); 
    366366          } 
    367367          else 

  • trunk/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp

    r14429 r14440  
    11981198        json_object_put( poObj ); 
    11991199 
    1200         return poGeometry; 
     1200        return (OGRGeometryH)poGeometry; 
    12011201    } 
    12021202 

  • trunk/gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp

    r14429 r14440  
    412412    VALIDATE_POINTER1( hGeometry, "OGR_G_ExportToJson", NULL ); 
    413413 
    414     OGRGeometry* poGeometry = static_cast<OGRGeometry*>(hGeometry); 
     414    OGRGeometry* poGeometry = (OGRGeometry*) (hGeometry); 
    415415 
    416416    json_object* poObj = NULL; 

  • trunk/gdal/ogr/ogrsf_frmts/kml/ogr2kmlgeometry.cpp

    r13358 r14440  
    375375 
    376376    memset( &sEnvelope, 0, sizeof(sEnvelope) ); 
    377     (static_cast<OGRGeometry*>(hGeometry))->getEnvelope( &sEnvelope ); 
     377    ((OGRGeometry*)(hGeometry))->getEnvelope( &sEnvelope ); 
    378378 
    379379    if( sEnvelope.MinX == 0 && sEnvelope.MaxX == 0  

  • trunk/gdal/ogr/ogrsf_frmts/kml/ogrkmllayer.cpp

    r14428 r14440  
    463463        // pszGeometry = poFeature->GetGeometryRef()->exportToKML(); 
    464464        pszGeometry =  
    465             OGR_G_ExportToKML( static_cast<OGRGeometryH>( poFeature->GetGeometryRef() ), 
     465            OGR_G_ExportToKML( (OGRGeometryH)( poFeature->GetGeometryRef() ), 
    466466                               poDS_->GetAltitudeMode()); 
    467467         

  • trunk/gdal/ogr/ogrspatialreference.cpp

    r14308 r14440  
    121121 
    122122    CPLAssert( NULL != poSRS ); 
    123     return poSRS; 
     123    return (OGRSpatialReferenceH) poSRS; 
    124124} 
    125125