StelTextureMgr.cpp   StelTextureMgr.cpp 
skipping to change at line 55 skipping to change at line 55
tex->fullPath = afilename; tex->fullPath = afilename;
QImage image(tex->fullPath); QImage image(tex->fullPath);
if (image.isNull()) if (image.isNull())
return StelTextureSP(); return StelTextureSP();
tex->loadParams = params; tex->loadParams = params;
if (tex->glLoad(image)) if (tex->glLoad(image))
return tex; return tex;
else else
{
qWarning()<<tex->getErrorMessage();
return StelTextureSP(); return StelTextureSP();
}
} }
StelTextureSP StelTextureMgr::createTextureThread(const QString& url, const StelTexture::StelTextureParams& params, bool lazyLoading) StelTextureSP StelTextureMgr::createTextureThread(const QString& url, const StelTexture::StelTextureParams& params, bool lazyLoading)
{ {
if (url.isEmpty()) if (url.isEmpty())
return StelTextureSP(); return StelTextureSP();
StelTextureSP tex = StelTextureSP(new StelTexture()); StelTextureSP tex = StelTextureSP(new StelTexture());
tex->loadParams = params; tex->loadParams = params;
tex->fullPath = url; tex->fullPath = url;
 End of changes. 2 change blocks. 
0 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/