mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-01 00:09:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug when reading multi channel WMTS datasets.

Browse Source
This commit is contained in:
Kalle Bladin
2016-05-05 17:47:24 -04:00
parent 338dfcfe4c
commit 418a661986
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/other/gdaldataconverter.inl
+10 -8
View File
@@ -57,8 +57,8 @@ namespace openspace {
// Level = overviewCount - overview
int numOverviews = firstBand->GetOverviewCount();
int xSize0 = firstBand->GetXSize();
int ySize0 = firstBand->GetYSize();
int xSize0 = firstBand->GetOverview(0)->GetXSize();
int ySize0 = firstBand->GetOverview(0)->GetYSize();
GeodeticPatch patch = GeodeticPatch(tileIndex);
glm::uvec2 pixelStart0 = geodeticToPixel(dataSet, patch.northWestCorner());
@@ -74,6 +74,9 @@ namespace openspace {
glm::uvec2 pixelStart(pixelStart0.x >> (ov + 1), pixelStart0.y >> (ov + 1));
glm::uvec2 numberOfPixels(numberOfPixels0.x >> (ov + 1), numberOfPixels0.y >> (ov + 1));
//glm::uvec2 pixelStart(0, 0);
//glm::uvec2 numberOfPixels(xSize0, ySize0);
// GDAL reads image data top to bottom
T* imageData = new T[numberOfPixels.x * numberOfPixels.y * nRasters];
@@ -97,18 +100,17 @@ namespace openspace {
sizeof(T) * nRasters, // Pixel spacing
0); // Line spacing
}
// GDAL reads image data top to bottom. We want the opposite.
T* imageDataYflipped = new T[numberOfPixels.x * numberOfPixels.y * nRasters];
for (size_t y = 0; y < numberOfPixels.y; y++) {
for (size_t x = 0; x < numberOfPixels.x; x++) {
imageDataYflipped[x + y * numberOfPixels.x] =
imageData[x + (numberOfPixels.y - 1 - y) * numberOfPixels.x];
for (size_t x = 0; x < numberOfPixels.x * nRasters; x++) {
imageDataYflipped[x + y * numberOfPixels.x * nRasters] =
imageData[x + (numberOfPixels.y - 1 - y) * numberOfPixels.x * nRasters];
}
}
delete[] imageData;
glm::uvec3 dims(numberOfPixels.x, numberOfPixels.y, 1);
UninitializedTextureTile::TextureFormat textrureFormat =
getTextureFormatFromRasterCount(nRasters);
@@ -196,7 +198,7 @@ namespace openspace {
switch (gdalType)
{
case GDT_Byte:
return GL_BYTE;
return GL_UNSIGNED_BYTE;
break;
case GDT_UInt16:
return GL_UNSIGNED_SHORT;
modules/globebrowsing/other/tileprovider.h
+1 -1
View File
@@ -88,7 +88,7 @@ namespace openspace {
GDALDataset* _gdalDataSet;
// Converters are needed for all different data types since they are templated.
GdalDataConverter<GLbyte> _uByteConverter;
GdalDataConverter<GLubyte> _uByteConverter;
GdalDataConverter<GLushort> _uShortConverter;
GdalDataConverter<GLshort> _shortConverter;
GdalDataConverter<GLuint> _uIntConverter;