{
for(ImageTextures::iterator i = image_textures.begin(); i != image_textures.end(); ++i)
{
- if(i->second.lock())
+ if(!i->second.expired())
{
log_warning << "Texture '" << i->first << "' not freed" << std::endl;
}
if(!texture) {
texture = create_image_texture(filename);
+ texture->cache_filename = filename;
image_textures[filename] = texture;
}
}
void
-TextureManager::release(Texture* texture)
+TextureManager::reap_cache_entry(const std::string& filename)
{
- image_textures.erase(texture->get_filename());
+ ImageTextures::iterator i = image_textures.find(filename);
+ assert(i != image_textures.end());
+ assert(i->second.expired());
+ image_textures.erase(i);
}
#ifdef HAVE_OPENGL
catch(const std::exception& err)
{
log_warning << "Couldn't load texture '" << filename << "' (now using dummy texture): " << err.what() << std::endl;
- TexturePtr texture = create_dummy_texture();
- return texture;
+ return create_dummy_texture();
}
}
SDL_SetColors(subimage.get(), image->format->palette->colors, 0, image->format->palette->ncolors);
}
- TexturePtr result = VideoSystem::new_texture(subimage.get());
- result->set_filename(filename);
- return result;
+ return VideoSystem::new_texture(subimage.get());
}
}
}
catch (const std::exception& err)
{
log_warning << "Couldn't load texture '" << filename << "' (now using dummy texture): " << err.what() << std::endl;
- TexturePtr texture = create_dummy_texture();
- return texture;
+ return create_dummy_texture();
}
}
}
else
{
- TexturePtr result = VideoSystem::new_texture(image.get());
- result->set_filename(filename);
- return result;
+ return VideoSystem::new_texture(image.get());
}
}
}
else
{
- TexturePtr result = VideoSystem::new_texture(image.get());
- result->set_filename("-dummy-texture-.png");
log_warning << "Couldn't load texture '" << dummy_texture_fname << "' (now using empty one): " << err.what() << std::endl;
- return result;
+ return VideoSystem::new_texture(image.get());
}
}
}