Changeset 14434

Show
Ignore:
Timestamp:
05/10/08 15:18:43 (2 months ago)
Author:
warmerdam
Message:

be more careful about casting C/C++ types

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gdal/alg/contour.cpp

    r12809 r14434  
    12461246    int iPoint; 
    12471247 
    1248     hFeat = OGR_F_Create( OGR_L_GetLayerDefn( poInfo->hLayer ) ); 
     1248    hFeat = OGR_F_Create( OGR_L_GetLayerDefn( (OGRLayerH) poInfo->hLayer ) ); 
    12491249 
    12501250    if( poInfo->nIDField != -1 ) 
    …… 
    12701270    OGR_F_SetGeometryDirectly( hFeat, hGeom ); 
    12711271 
    1272     OGR_L_CreateFeature( poInfo->hLayer, hFeat ); 
     1272    OGR_L_CreateFeature( (OGRLayerH) poInfo->hLayer, hFeat ); 
    12731273    OGR_F_Destroy( hFeat ); 
    12741274 

  • trunk/gdal/ogr/ogrfeature.cpp

    r14269 r14434  
    262262    VALIDATE_POINTER1( hFeat, "OGR_F_GetDefnRef", NULL ); 
    263263 
    264     return ((OGRFeature *) hFeat)->GetDefnRef(); 
     264    return (OGRFeatureDefnH) ((OGRFeature *) hFeat)->GetDefnRef(); 
    265265} 
    266266 

  • trunk/gdal/ogr/ogrfeaturedefn.cpp

    r11294 r14434  
    307307 
    308308{ 
    309     return ((OGRFeatureDefn *) hDefn)->GetFieldDefn( iField ); 
     309    return (OGRFieldDefnH) ((OGRFeatureDefn *) hDefn)->GetFieldDefn( iField ); 
    310310} 
    311311 

  • trunk/gdal/ogr/ogrfeaturestyle.cpp

    r14175 r14434  
    150150 */ 
    151151 
    152 OGRFeatureH OGR_SM_Create( void *hStyleTable ) 
     152OGRStyleMgrH OGR_SM_Create( void *hStyleTable ) 
    153153 
    154154{