Changeset 9527

Timestamp:

01/21/09 19:23:55 (4 years ago)

Author:

robert

Message:

Replaced readImageFile() usage with readRefImageFile() to prevent threading issues with caching of imagery in the osgDB::Registry cache.

Location:

OpenSceneGraph/trunk/src/osgPlugins

Files:

• 3ds/ReaderWriter3DS.cpp (modified) (2 diffs)
• OpenFlight/PaletteRecords.cpp (modified) (2 diffs)
• ac/ac3d.cpp (modified) (1 diff)
• bsp/Q3BSPReader.cpp (modified) (2 diffs)
• bsp/VBSPReader.cpp (modified) (3 diffs)
• dae/daeRMaterials.cpp (modified) (3 diffs)
• dw/ReaderWriterDW.cpp (modified) (3 diffs)
• geo/ReaderWriterGEO.cpp (modified) (5 diffs)
• ive/DataInputStream.cpp (modified) (2 diffs)
• logo/ReaderWriterLOGO.cpp (modified) (1 diff)
• lwo/ReaderWriterLWO.cpp (modified) (2 diffs)
• lwo/Surface.cpp (modified) (1 diff)
• lwo/old_Lwo2.cpp (modified) (1 diff)
• md2/ReaderWriterMD2.cpp (modified) (6 diffs)
• mdl/MDLReader.cpp (modified) (2 diffs)
• obj/ReaderWriterOBJ.cpp (modified) (2 diffs)
• osgViewer/View.cpp (modified) (1 diff)
• osgVolume/ImageLayer.cpp (modified) (1 diff)
• txp/TXPArchive.cpp (modified) (1 diff)
• vrml/ReaderWriterVRML2.cpp (modified) (1 diff)
• x/ReaderWriterDirectX.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp

@@ -716 +716 @@
         osg::notify(osg::DEBUG_INFO) << "    LIB3DS_RGB_TINT     "<<((texture->flags)&LIB3DS_RGB_TINT)<< std::endl;
 
-        osg::Image* osg_image = osgDB::readImageFile(fileName.c_str());
-        if (osg_image==NULL)
+        osg::ref_ptr<osg::Image> osg_image = osgDB::readRefImageFile(fileName.c_str());
+        if (!osg_image)
         {
             osg::notify(osg::NOTICE) << "Warning: Cannot create texture "<<texture->name<< std::endl;
@@ -724 +724 @@
 
         osg::Texture2D* osg_texture = new osg::Texture2D;
-        osg_texture->setImage(osg_image);
+        osg_texture->setImage(osg_image.get());
 
         // does the texture support transparancy?

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/PaletteRecords.cpp

@@ -291 +291 @@
     osg::StateSet* readTexture(const std::string& filename, const Document& document) const
     {
-        osg::Image* image = osgDB::readImageFile(filename,document.getOptions());
+        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(filename,document.getOptions());
         if (!image) return NULL;
 
@@ -301 +301 @@
         texture->setWrap(osg::Texture2D::WRAP_T,osg::Texture2D::REPEAT);
         texture->setResizeNonPowerOfTwoHint(true);
-        texture->setImage(image);
+        texture->setImage(image.get());
         stateset->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
 

OpenSceneGraph/trunk/src/osgPlugins/ac/ac3d.cpp

@@ -352 +352 @@
             return false;
         }
-        mImage = osgDB::readImageFile(absFileName, options);
+        mImage = osgDB::readRefImageFile(absFileName, options);
         if (!mImage.valid())
         {

OpenSceneGraph/trunk/src/osgPlugins/bsp/Q3BSPReader.cpp

@@ -449 +449 @@
       jpgExtendedName+=".jpg";
 
-      osg::Image* image = osgDB::readImageFile(tgaExtendedName);
+      osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(tgaExtendedName);
       if (!image)
         {
-          image = osgDB::readImageFile(jpgExtendedName);
+          image = osgDB::readRefImageFile(jpgExtendedName);
           if (!image)
             {
@@ -461 +461 @@
 
       osg::Texture2D* texture= new osg::Texture2D;
-      texture->setImage(image);
+      texture->setImage(image.get());
       texture->setDataVariance(osg::Object::DYNAMIC); // protect from being optimized away as static state.
       texture->setWrap(osg::Texture2D::WRAP_S, osg::Texture2D::REPEAT);

OpenSceneGraph/trunk/src/osgPlugins/bsp/VBSPReader.cpp

@@ -560 +560 @@
     std::string   texFile;
     std::string   texPath;
-    Image *       texImage;
-    Texture *     texture;
+    osg::ref_ptr<Image>       texImage;
+    osg::ref_ptr<Texture>     texture;
 
     // Find the texture's image file
@@ -586 +586 @@
     if (!texPath.empty())
     {
-        texImage = readImageFile(texPath);
+        texImage = readRefImageFile(texPath);
 
         // If we got the image, create the texture attribute
@@ -594 +594 @@
             if (texImage->t() == 1)
             {
-                texture = new Texture1D();
-                ((Texture1D *)texture)->setImage(texImage);
+                texture = new Texture1D(texImage.get());
             }
             else if (texImage->r() == 1)
             {
-                texture = new Texture2D();
-                ((Texture2D *)texture)->setImage(texImage);
+                texture = new Texture2D(texImage.get());
             }
             else
             {
-                texture = new Texture3D();
-                ((Texture3D *)texture)->setImage(texImage);
+                texture = new Texture3D(texImage.get());
             }
 

OpenSceneGraph/trunk/src/osgPlugins/dae/daeRMaterials.cpp

@@ -736 +736 @@
     }
     //Got a sampler and a surface and an imaged. Time to create the texture stuff for osg
-    osg::Image *img = NULL;
+    osg::ref_ptr<osg::Image> img;
     if ( dImg->getInit_from() != NULL )
     {
@@ -766 +766 @@
             const char* filename = path.c_str();
 #endif
-            img = osgDB::readImageFile( filename );
+            img = osgDB::readRefImageFile( filename );
 
             osg::notify(osg::INFO)<<"  processTexture(..) - readImage("<<filename<<")"<<std::endl;
@@ -787 +787 @@
     }
 
-    osg::Texture2D *t2D = new osg::Texture2D( img );
+    osg::Texture2D *t2D = new osg::Texture2D( img.get() );
     //set texture parameters
     if ( sampler != NULL )

OpenSceneGraph/trunk/src/osgPlugins/dw/ReaderWriterDW.cpp

@@ -55 +55 @@
             if (!ctx || !tx) { // new texture needed
                 if (fname.length()>0) { 
-                    ctx=osgDB::readImageFile(fname.c_str(),options);
-                    if (ctx) {
+                    ctx=osgDB::readRefImageFile(fname.c_str(),options);
+                    if (ctx.valid()) {
                         ctx->setFileName(fname);
-                        tx=new Texture2D;
-                        tx->setImage(ctx);
+                        tx=new Texture2D(ctx.get());
                         tx->setWrap(Texture2D::WRAP_S, Texture2D::REPEAT);
                         tx->setWrap(Texture2D::WRAP_T, Texture2D::REPEAT);
@@ -68 +67 @@
                 }
             }
-            if (ctx && tx) { // texture exists
-                dstate->setTextureAttributeAndModes(0,tx,osg::StateAttribute::ON);
+            if (ctx.valid() && tx.valid()) { // texture exists
+                dstate->setTextureAttributeAndModes(0,tx.get(),osg::StateAttribute::ON);
             }
         }
@@ -176 +175 @@
     enum atten {NONE, INVERSE_DIST, INVERSE_SQUARE} atyp;
     float bright,halfIn,halfOut,falloff; // light brightness
-    Image *ctx;
-    Texture2D *tx;
+    osg::ref_ptr<osg::Image> ctx;
+    osg::ref_ptr<osg::Texture2D> tx;
     int _lightnum;
     StateSet *dstate; // used to represent the dw material in OSG

OpenSceneGraph/trunk/src/osgPlugins/geo/ReaderWriterGEO.cpp

@@ -667 +667 @@
             dstate->setAttribute(pt);
             if (txidx>=0 && (unsigned int)txidx<txlist.size()) {
-                dstate->setTextureAttribute(0, txenvlist[txidx] );
-                dstate->setTextureAttributeAndModes(0,txlist[txidx],osg::StateAttribute::ON);
+                dstate->setTextureAttribute(0, txenvlist[txidx].get() );
+                dstate->setTextureAttributeAndModes(0,txlist[txidx].get(),osg::StateAttribute::ON);
                 const Image *txim=txlist[txidx]->getImage();
                 if (txim) {
@@ -685 +685 @@
                 dstate->setMode(GL_COLOR_MATERIAL, osg::StateAttribute::ON);
             }
-            dstate->setAttribute(matlist[imat]);
+            dstate->setAttribute(matlist[imat].get());
             Vec4 col=matlist[imat]->getAmbient(Material::FRONT);
             if (col[3]<0.99) {
@@ -1467 +1467 @@
             const char *name = gfd->getChar();
             if (name) {
-                Texture2D *tx=new Texture2D;
-                Image *ctx=osgDB::readImageFile(name,options);
-                if (ctx) {
+                osg::ref_ptr<osg::Texture2D> tx = new Texture2D;
+                osg::ref_ptr<osg::Image> ctx = osgDB::readImageFile(name,options);
+                if (ctx.valid()) {
                     ctx->setFileName(name);
-                    tx->setImage(ctx);
+                    tx->setImage(ctx.get());
                 }
                 gfd=gr->getField(GEO_DB_TEX_WRAPS);
@@ -1487 +1487 @@
                 }
                 tx->setWrap(Texture2D::WRAP_T, wm);
-                txlist.push_back(tx);
+                txlist.push_back(tx.get());
                 osg::TexEnv* texenv = new osg::TexEnv;
                 osg::TexEnv::Mode md=osg::TexEnv::MODULATE;
@@ -2015 +2015 @@
     std::vector<georecord *> geotxlist; // list of geo::textures for this model
     std::vector<georecord *> geomatlist; // list of geo::materials for this model
-    std::vector<osg::Texture2D *> txlist; // list of osg::textures for this model
-    std::vector<osg::TexEnv *> txenvlist; // list of texture environments for the textures
-    std::vector<osg::Material *> matlist; // list of materials for current model
+    std::vector< osg::ref_ptr<osg::Texture2D> > txlist; // list of osg::textures for this model
+    std::vector< osg::ref_ptr<osg::TexEnv> > txenvlist; // list of texture environments for the textures
+    std::vector< osg::ref_ptr<osg::Material> > matlist; // list of materials for current model
     georecord *cpalrec; // colour palette record
 };

OpenSceneGraph/trunk/src/osgPlugins/ive/DataInputStream.cpp

@@ -1129 +1129 @@
     // Image is not in list.
     // Read it from disk,
-    osg::Image* image = osgDB::readImageFile(filename.c_str(),_options.get());
+    osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(filename.c_str(),_options.get());
 
     // add it to the imageList,
@@ -1137 +1137 @@
     if (_verboseOutput) std::cout<<"read/writeImage() ["<<image<<"]"<<std::endl;
 
-    return image;
+    return image.release();
 }
 

OpenSceneGraph/trunk/src/osgPlugins/logo/ReaderWriterLOGO.cpp

@@ -159 +159 @@
         void addLogo( RelativePosition pos, std::string name )
         {
-            osg::Image *image = osgDB::readImageFile( name.c_str() );
-            if( image != NULL )
-                logos[pos].push_back( image ); 
+            osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile( name.c_str() );
+            if( image.valid())
+                logos[pos].push_back( image.get() ); 
             else
                 osg::notify(osg::WARN)<< "Logos::addLogo image file not found : " << name << ".\n";

OpenSceneGraph/trunk/src/osgPlugins/lwo/ReaderWriterLWO.cpp

@@ -243 +243 @@
                 {
                     osg::notify(osg::INFO) << "ctex " << lw_material.ctex.name << std::endl;
-                    osg::Image* image = osgDB::readImageFile(lw_material.ctex.name);
-                    if (image)
+                    osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(lw_material.ctex.name);
+                    if (image.valid())
                     {
                         // create state
@@ -251 +251 @@
                         // create texture
                         osg::Texture2D* texture = new osg::Texture2D;
-                        texture->setImage(image);
+                        texture->setImage(image.get());
 
                         // texture wrap mode

OpenSceneGraph/trunk/src/osgPlugins/lwo/Surface.cpp

@@ -196 +196 @@
                                 break;
                             }
+                
+                            osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(image_file, db_options);
+                            if (!image) break;
 
                             osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D;
                             if (force_arb_compression)
                                 texture->setInternalFormatMode(osg::Texture::USE_ARB_COMPRESSION);
-                            texture->setImage(osgDB::readImageFile(image_file, db_options));
+                            texture->setImage(image.get());
                             texture->setWrap(osg::Texture::WRAP_S, osg_wrap_mode(block.get_image_map().width_wrap));
                             texture->setWrap(osg::Texture::WRAP_T, osg_wrap_mode(block.get_image_map().height_wrap));

OpenSceneGraph/trunk/src/osgPlugins/lwo/old_Lwo2.cpp

@@ -708 +708 @@
         if (surface->image_index >= 0) 
         {
-            Image* image = osgDB::readImageFile(_images[surface->image_index]);
+            osg::ref_ptr<Image> image = osgDB::readRefImageFile(_images[surface->image_index]);
             notify(DEBUG_INFO) << "\tloaded image '" << _images[surface->image_index] << "'" << std::endl;
             notify(DEBUG_INFO) << "\tresult - " << image << std::endl;
-            if (image)
+            if (image.valid())
             {
                 // create texture
                 Texture2D* texture = new osg::Texture2D;
-                texture->setImage(image);
+                texture->setImage(image.get());
                 state_set->setTextureAttributeAndModes(0, texture, StateAttribute::ON);        
 

OpenSceneGraph/trunk/src/osgPlugins/md2/ReaderWriterMD2.cpp

@@ -225 +225 @@
     std::vector<osg::Texture2D*> skin_textures;
 
-    for (int si = 0; si < md2_header->numSkins; si++) {
-        osg::Image *img;
-        osg::Texture2D *tex;
+    for (int si = 0; si < md2_header->numSkins; si++)
+    {
+        osg::ref_ptr<osg::Image> img;
+        osg::ref_ptr<osg::Texture2D> tex;
         std::string imgname (md2_skins[si].name);
 
         // first try loading the imgname straight
-        img = osgDB::readImageFile (imgname, options);
-        if (img) {
+        img = osgDB::readRefImageFile (imgname, options);
+        if (img.valid()) {
             tex = new osg::Texture2D;
             tex->setImage (img);
@@ -245 +246 @@
             // it's a pcx, so try bmp and tga, since pcx sucks
             std::string basename = imgname.substr (0, imgname.size() - 3);
-            img = osgDB::readImageFile (basename + "bmp", options);
-            if (img) {
+            img = osgDB::readRefImageFile (basename + "bmp", options);
+            if (img.valid()) {
                 tex = new osg::Texture2D;
-                tex->setImage (img);
+                tex->setImage (img.get());
                 skin_textures.push_back (tex);
                 continue;
             }
 
-            img = osgDB::readImageFile (basename + "tga", options);
-            if (img) {
+            img = osgDB::readRefImageFile (basename + "tga", options);
+            if (img.valid()) {
                 tex = new osg::Texture2D;
-                tex->setImage (img);
+                tex->setImage (img,get());
                 skin_textures.push_back (tex);
                 continue;
@@ -268 +269 @@
 #else
     // load the single skin
-    osg::Image *skin_image = NULL;
-    osg::Texture2D *skin_texture = NULL;
+    osg::ref_ptr<osg::Image> skin_image;
+    osg::ref_ptr<osg::Texture2D> skin_texture = NULL;
 
     if (md2_header->numSkins > 0) {
@@ -276 +277 @@
         do {
             // first try loading the imgname straight
-            skin_image = osgDB::readImageFile (imgname, options);
-            if (skin_image) break;
+            skin_image = osgDB::readRefImageFile(imgname, options);
+            if (skin_image.valid()) break;
 
             // we failed, so check if it's a PCX image
@@ -285 +286 @@
                 // it's a pcx, so try bmp and tga, since pcx sucks
                 std::string basename = imgname.substr (0, imgname.size() - 3);
-                skin_image = osgDB::readImageFile (basename + "bmp", options);
-                if (skin_image) break;
-
-                skin_image = osgDB::readImageFile (basename + "tga", options);
-                if (skin_image) break;
+                skin_image = osgDB::readRefImageFile (basename + "bmp", options);
+                if (skin_image.valid()) break;
+
+                skin_image = osgDB::readRefImageFile (basename + "tga", options);
+                if (skin_image.valid()) break;
             }
         } while (0);
 
-        if (skin_image) {
+        if (skin_image.valid()) {
             skin_texture = new osg::Texture2D;
-            skin_texture->setImage (skin_image);
+            skin_texture->setImage (skin_image.get());
             skin_texture->setFilter (osg::Texture2D::MAG_FILTER, osg::Texture2D::NEAREST);
         } else {
@@ -408 +409 @@
 
     if (skin_texture != NULL) {
-        state->setTextureAttributeAndModes (0, skin_texture, osg::StateAttribute::ON);
+        state->setTextureAttributeAndModes (0, skin_texture.get(), osg::StateAttribute::ON);
     }
     base_switch->setStateSet (state);

OpenSceneGraph/trunk/src/osgPlugins/mdl/MDLReader.cpp

@@ -85 +85 @@
 ref_ptr<Texture> MDLReader::readTextureFile(std::string textureName)
 {
-    std::string   texFile;
-    std::string   texPath;
-    Image *       texImage;
-    Texture *     texture;
+    std::string             texFile;
+    std::string             texPath;
+    osg::ref_ptr<Image>     texImage;
+    osg::ref_ptr<Texture>   texture;
 
     // Find the texture's image file
@@ -125 +125 @@
     if (!texPath.empty())
     {
-        texImage = readImageFile(texPath);
+        texImage = readRefImageFile(texPath);
 
         // If we got the image, create the texture attribute
-        if (texImage != NULL)
+        if (texImage.valid())
         {
             // Create the texture
             if (texImage->t() == 1)
             {
-                texture = new Texture1D();
-                ((Texture1D *)texture)->setImage(texImage);
+                texture = new Texture1D(texImage.get());
             }
             else if (texImage->r() == 1)
             {
-                texture = new Texture2D();
-                ((Texture2D *)texture)->setImage(texImage);
+                texture = new Texture2D(texImage.get());
             }
             else
             {
-                texture = new Texture3D();
-                ((Texture3D *)texture)->setImage(texImage);
+                texture = new Texture3D(texImage.get());
             }
 

OpenSceneGraph/trunk/src/osgPlugins/obj/ReaderWriterOBJ.cpp

@@ -198 +198 @@
         {
             // first try with database path of parent. 
-            image = osgDB::readImageFile(model.getDatabasePath()+'/'+filename);
+            image = osgDB::readRefImageFile(model.getDatabasePath()+'/'+filename);
         }
         
@@ -204 +204 @@
         {
             // if not already set then try the filename as is.
-            image = osgDB::readImageFile(filename);
+            image = osgDB::readRefImageFile(filename);
         }
 

OpenSceneGraph/trunk/src/osgPlugins/osgViewer/View.cpp

@@ -186 +186 @@
         if (!filename.empty())
         {
-            intensityMap = osgDB::readImageFile(filename);
+            intensityMap = osgDB::readRefImageFile(filename);
         }
 

OpenSceneGraph/trunk/src/osgPlugins/osgVolume/ImageLayer.cpp

@@ -58 +58 @@
                 if (fileType == osgDB::DIRECTORY)
                 {
-                    image = osgDB::readImageFile(filename+".dicom");
+                    image = osgDB::readRefImageFile(filename+".dicom");
                     
                 }
                 else if (fileType == osgDB::REGULAR_FILE)
                 {
-                    image = osgDB::readImageFile( filename );
+                    image = osgDB::readRefImageFile( filename );
                 }
 

OpenSceneGraph/trunk/src/osgPlugins/txp/TXPArchive.cpp

@@ -392 +392 @@
         
         std::string theFile = path + filename ;
-        osg::Image* image = osgDB::readImageFile(theFile);
-        if (image)
-        {
-            osg_texture->setImage(image);
+        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(theFile);
+        if (image.valid())
+        {
+            osg_texture->setImage(image.get());
         }
         else

OpenSceneGraph/trunk/src/osgPlugins/vrml/ReaderWriterVRML2.cpp

@@ -297 +297 @@
                     const std::string &url = mfs.value[0];
 
-                    osg::ref_ptr<osg::Image> image = osgDB::readImageFile(url);
+                    osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(url);
 
                     if (image != 0) {

OpenSceneGraph/trunk/src/osgPlugins/x/ReaderWriterDirectX.cpp

@@ -228 +228 @@
             osg::Texture2D* texture = texForImage[mtl.texture[j]];
             if (!texture) {
-                osg::Image* image = osgDB::readImageFile(mtl.texture[j],options);
+                osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(mtl.texture[j],options);
                 if (!image)
                     continue;
@@ -236 +236 @@
                 texForImage[mtl.texture[j]] = texture;
 
-                texture->setImage(image);
+                texture->setImage(image.get());
                 texture->setWrap(osg::Texture2D::WRAP_S, osg::Texture2D::REPEAT);
                 texture->setWrap(osg::Texture2D::WRAP_T, osg::Texture2D::REPEAT);