[Marble-devel] Review Request: More robust tile loading

[Bernhard Beschow]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://reviewboard.kde.org/r/4444/
-----------------------------------------------------------

Review request for marble.


Changes
-------

Let TextureTile::image() return a pointer. This keeps more code unchanged.


Summary
-------

Motivation: It may happen that Marble receives invalid image data over the network or loads invalid image data from disk, making Marble really slow. This is caused by heavy debug output from QImage while Marble tries to access invalid image data. This will be qFatal in the upcoming Qt 4.7.

Solution: Check if the image is valid ater loading data into a QImage instead of blindly loading data into it. Also Q_ASSERT every image assignment in TextureTile.

Note that by this patch, Marble will abort when TileLoader::scaledLowerLevelTile() is not able to produce a scaled image. This could happen when the level-zero tile is missing.


Diffs (updated)
-----

  trunk/KDE/kdeedu/marble/src/lib/TextureTile.h 1142673 
  trunk/KDE/kdeedu/marble/src/lib/TextureTile.cpp 1142673 
  trunk/KDE/kdeedu/marble/src/lib/TileLoader.h 1142673 
  trunk/KDE/kdeedu/marble/src/lib/TileLoader.cpp 1142673 

Diff: http://reviewboard.kde.org/r/4444/diff


Testing
-------

Works for me. Please test if it works for you as well!


Thanks,

Bernhard

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.kde.org/pipermail/marble-devel/attachments/20100625/a1344783/attachment.htm