X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvideo%2Ftexture_manager.cpp;h=d45eb84f8bffe255d9143f7c3054d4e387751ff6;hb=a113d3bd1feddd510e3b2852b0d42522735eee40;hp=1f78be0f3a08066e8aa4f4bc678ad9d17f833f2d;hpb=ff4c6994b952e26b854461d739eb3bcbfc30719f;p=supertux.git diff --git a/src/video/texture_manager.cpp b/src/video/texture_manager.cpp index 1f78be0f3..d45eb84f8 100644 --- a/src/video/texture_manager.cpp +++ b/src/video/texture_manager.cpp @@ -137,7 +137,7 @@ TextureManager::create_image_texture(const std::string& filename) SDL_FreeSurface(convert); throw; } - + SDL_FreeSurface(convert); return result; } @@ -183,7 +183,7 @@ TextureManager::save_texture(Texture* texture) size_t pixelssize = saved_texture.width * saved_texture.height * 4; saved_texture.pixels = new char[pixelssize]; - + glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, saved_texture.pixels); @@ -204,11 +204,11 @@ TextureManager::reload_textures() glPixelStorei(GL_UNPACK_SKIP_ROWS, 0); glPixelStorei(GL_UNPACK_SKIP_IMAGES, 0); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - + for(std::vector::iterator i = saved_textures.begin(); i != saved_textures.end(); ++i) { SavedTexture& saved_texture = *i; - + GLuint handle; glGenTextures(1, &handle); assert_gl("creating texture handle"); @@ -236,4 +236,3 @@ TextureManager::reload_textures() saved_textures.clear(); } -