From kde-commits Sat Nov 20 17:31:08 2010 From: Bernhard Beschow Date: Sat, 20 Nov 2010 17:31:08 +0000 To: kde-commits Subject: KDE/kdeedu/marble Message-Id: <20101120173108.3681DAC8A0 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=129027430302035 SVN commit 1199115 by beschow: add level zero tiles for clouds * prevents hitting the assertion "level zero image missing" when activating clouds layer for the first time M +4 -0 data/CMakeLists.txt A data/maps/earth/clouds (directory) A data/maps/earth/clouds/0 (directory) A data/maps/earth/clouds/0/000000 (directory) A data/maps/earth/clouds/0/000000/000000_000000.jpg A data/maps/earth/clouds/0/000000/000000_000001.jpg M +1 -1 src/lib/TileLoader.cpp --- trunk/KDE/kdeedu/marble/data/CMakeLists.txt #1199114:1199115 @@ -58,6 +58,10 @@ DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/citylights/legend) install (FILES +maps/earth/clouds/0/000000/000000_000000.jpg +DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/clouds/0/000000) + +install (FILES maps/earth/srtm/srtm.dgml maps/earth/srtm/srtm-preview.png DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/srtm) --- trunk/KDE/kdeedu/marble/src/lib/TileLoader.cpp #1199114:1199115 @@ -188,8 +188,8 @@ int const deltaLevel = id.zoomLevel() - level; TileId const replacementTileId( id.mapThemeIdHash(), level, id.x() >> deltaLevel, id.y() >> deltaLevel ); - mDebug() << "TileLoader::scaledLowerLevelTile" << "trying" << replacementTileId.toString(); QString const fileName = tileFileName( replacementTileId ); + mDebug() << "TileLoader::scaledLowerLevelTile" << "trying" << fileName; QImage const toScale( fileName ); if ( !toScale.isNull() ) { // which rect to scale?