Show
Ignore:
Timestamp:
01/16/08 16:07:40 (1 year ago)
Author:
cneumann
Message:

changed: - factory functions return a TransitPtr? that can not be implicitly

converted to C Ptr. Should help with porting.

added: - GlobalRefPtr?, needed for cases where upon return from main

a RefPtr? goes out of scope (it would attempt to access the
FCFactory which is already shutdown at that point).

status: - vrml loader does not compile (needs porting to ref ptr)

  • tutorials compile, run and exit cleanly
  • multithreading and cluster are untested, yet
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r785 r1039  
    9090\*-------------------------------------------------------------------------*/ 
    9191 
    92 FieldContainerPtr NFIOImage::readFC(const std::string &/*typeName*/) 
     92FieldContainerTransitPtr NFIOImage::readFC(const std::string &/*typeName*/) 
    9393{ 
    9494    FDEBUG(("NFIOImage::readFC\n")); 
    9595     
    96     ImagePtr img = Image::create(); 
     96    ImageRefPtr img = Image::create(); 
    9797     
    9898    UInt16 version; 
    …… 
    113113        //beginEditCP(img); 
    114114            //img->read(img->getName().c_str()); 
    115             subRef(img); 
    116115            img = ImageFileHandler::the()->read(img->getName().c_str()); 
    117116        //endEditCP(img); 
    118117    } 
    119118     
    120     return img; 
     119    return FieldContainerTransitPtr(img); 
    121120} 
    122121 
    …… 
    159158} 
    160159 
    161 void NFIOImage::readCompressedPixel(ImagePtr &img) 
     160void NFIOImage::readCompressedPixel(ImagePtr img) 
    162161{ 
    163162    static bool jpeg = isJPEGSupported(); 
    …… 
    197196} 
    198197 
    199 void NFIOImage::writeCompressedPixel(const ImagePtr &img) 
     198void NFIOImage::writeCompressedPixel(ImagePtr const img) 
    200199{ 
    201200    _out->putValue(std::string("cpixel"));