mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 04:00:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Erik Broberg
2016-04-28 17:59:04 -04:00
parent 414462c7d8
commit 4656d997e4
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/globebrowsing/other/gdaldataconverter.cpp
View File

@@ -43,7 +43,7 @@ namespace openspace {
std::shared_ptr<Texture> GdalDataConverter::convertToOpenGLTexture(
GDALDataset* dataSet,
const TileIndex& tileIndex,
const GeodeticTileIndex& tileIndex,
int GLType)
{
int nRasters = dataSet->GetRasterCount();

4
modules/globebrowsing/other/gdaldataconverter.h
View File

@@ -25,7 +25,7 @@
#ifndef __GDALDATACONVERTER_H__
#define __GDALDATACONVERTER_H__
#include <modules/globebrowsing/other/twmstileprovider.h>
#include <modules/globebrowsing/other/tileprovider.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/opengl/texture.h>
@@ -46,7 +46,7 @@ namespace openspace {
std::shared_ptr<Texture> convertToOpenGLTexture(
GDALDataset* dataSet,
const TileIndex& tileIndex,
const GeodeticTileIndex& tileIndex,
int GLType);
private:

2
modules/globebrowsing/other/texturetileset.cpp
View File

@@ -65,7 +65,7 @@ namespace openspace {
assert(poDataset != NULL);
GdalDataConverter conv;
TileIndex ti;
GeodeticTileIndex ti;
ti.x = 0;
ti.y = 0;
ti.level = 0;