X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture2d.cpp;fp=source%2Ftexture2d.cpp;h=311a3e4569704c92b99703c4a0473f508778c9e1;hp=cee932f7231e9fb23adcfb4ce86ba28e736dd17a;hb=71ca61440610e650c6c1b761ebee1b587bbc969e;hpb=d99f756830d39437d88e6cc7af034c3074b0bd86 diff --git a/source/texture2d.cpp b/source/texture2d.cpp index cee932f7..311a3e45 100644 --- a/source/texture2d.cpp +++ b/source/texture2d.cpp @@ -165,7 +165,7 @@ void Texture2D::image(const Graphics::Image &img, unsigned lv, bool from_buffer) PixelStore pstore = PixelStore::from_image(img); BindRestore _bind_ps(pstore); - image(0, from_buffer ? 0 : img.get_data()); + image(0, from_buffer ? 0 : img.get_pixels()); } unsigned Texture2D::get_n_levels() const @@ -270,7 +270,7 @@ bool Texture2D::AsyncLoader::process() } else if(phase==2) { - const char *data = reinterpret_cast(image.get_data()); + const char *data = reinterpret_cast(image.get_pixels()); copy(data, data+n_bytes, mapped_address); } else if(phase==3)