X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fimageloader.cpp;h=daedab6c5b57e80539c580602dcc5c07a3f923f5;hb=8e403dbbcde6efee1862f6d501ce30a3e7ba81c4;hp=679f797adcc2bae5d7499c7cc41f6254ef3bb723;hpb=010c91931c89fe2b6271a7395a0cb17279c704a2;p=libs%2Fgui.git diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp index 679f797..daedab6 100644 --- a/source/graphics/imageloader.cpp +++ b/source/graphics/imageloader.cpp @@ -38,11 +38,12 @@ ImageLoader *ImageLoader::open_file(const string &fn) } } -ImageLoader *ImageLoader::open_io(IO::Base &io) +ImageLoader *ImageLoader::open_io(IO::Seekable &io) { char sig_buf[8]; unsigned sig_len = io.read(sig_buf, sizeof(sig_buf)); string sig(sig_buf, sig_len); + io.seek(0, IO::S_BEG); // TODO register loader classes automatically ImageLoader *loader = 0; @@ -50,11 +51,11 @@ ImageLoader *ImageLoader::open_io(IO::Base &io) ; #ifdef WITH_LIBPNG else if(PngLoader::detect(sig)) - loader = new PngLoader(io, sig); + loader = new PngLoader(io); #endif #ifdef WITH_DEVIL else if(DevilLoader::detect(sig)) - loader = new DevilLoader(io, sig); + loader = new DevilLoader(io); #endif else {