Show
Ignore:
Timestamp:
02/27/08 09:30:29 (9 months ago)
Author:
cneumann
Message:

fixed: Overzealous use of RefPtr? replaced with InternalRefPtr?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/FileIO/OSB/OSGNFIOGeometry.cpp

    r1039 r1063  
    123123    FDEBUG(("NFIOGeometry::readFC\n")); 
    124124     
    125     GeometryRefPtr geo = Geometry::create(); 
     125    GeometryInternalRefPtr geo = Geometry::create(); 
    126126     
    127127    UInt16 version; 
    …… 
    412412    _in->getValue(fieldType); 
    413413     
    414     GeoPnt3fPropertyRefPtr positions = GeoPnt3fProperty::create(); 
     414    GeoPnt3fPropertyInternalRefPtr positions = GeoPnt3fProperty::create(); 
    415415    readQuantizedVectors<Pnt3f>(positions); 
    416416     
    …… 
    425425    _in->getValue(fieldType); 
    426426     
    427     GeoVec3fPropertyRefPtr normals = GeoVec3fProperty::create(); 
     427    GeoVec3fPropertyInternalRefPtr normals = GeoVec3fProperty::create(); 
    428428    readQuantizedVectors<Vec3f>(normals); 
    429429     
    …… 
    438438    _in->getValue(fieldType); 
    439439     
    440     GeoVec2fPropertyRefPtr texcoords = GeoVec2fProperty::create(); 
     440    GeoVec2fPropertyInternalRefPtr texcoords = GeoVec2fProperty::create(); 
    441441    readQuantizedVectors<Vec2f>(texcoords); 
    442442     
    …… 
    466466    _in->getValue(noe); 
    467467     
    468     GeoIntegralPropertyRefPtr indices; 
     468    GeoIntegralPropertyInternalRefPtr indices; 
    469469    bool using_16bit = false; 
    470470    if(getOptions().unpack16BitIndices()) 
    …… 
    833833    { 
    834834        // multi indexed. 
    835         std::vector<GeoUInt32PropertyPtr> indices_list; 
     835        std::vector<GeoUInt32PropertyInternalRefPtr     > indices_list; 
    836836        std::vector<GeoUInt32Property::StoredFieldType *> indicesp_list; 
    837837        for(UInt32 i=0;i<size;++i) 
    838838        { 
    839             GeoUInt32PropertyRefPtr indices = GeoUInt32Property::create(); 
     839            GeoUInt32PropertyInternalRefPtr     indices = GeoUInt32Property::create(); 
    840840            GeoUInt32Property::StoredFieldType *indicesp = indices->editFieldPtr(); 
    841             indices_list.push_back(indices); 
     841            indices_list .push_back(indices ); 
    842842            indicesp_list.push_back(indicesp); 
    843843        }