FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to convert subimage on pixel format mismatch, provide more helpful logs

Browse Source
This commit is contained in:
Nathaniel MacArthur-Warner 2020-12-23 23:39:39 -08:00
parent a56d1718de
commit 3fc6df203c
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
simgear/scene/util/OrthophotoManager.cxx
View File

@ -289,19 +289,30 @@ namespace simgear {
ImageRef sub_image = orthophoto->_texture->getImage(); ImageRef sub_image = orthophoto->_texture->getImage();
if (sub_image->getPixelFormat() != pixel_format) {
SG_LOG(SG_OSG, SG_ALERT, "Pixel format mismatch. Not creating part of composite orthophoto.");
continue;
}
if (sub_image->s() != width || sub_image->t() != height) { if (sub_image->s() != width || sub_image->t() != height) {
SG_LOG(SG_OSG, SG_WARN, "Orthophoto resolution mismatch. Automatic scaling will be performed."); SG_LOG(SG_OSG, SG_INFO, "Orthophoto resolution mismatch. Automatic scaling will be performed.");
// Make a deep copy of the orthophoto's image so that we don't modify the original when scaling ImageRef scaled_image;
sub_image = new osg::Image(*sub_image, osg::CopyOp::DEEP_COPY_ALL); bool success = ImageUtils::resizeImage(sub_image, width, height, scaled_image);
sub_image->scaleImage(width, height, depth); if (success) {
sub_image = scaled_image;
} else {
SG_LOG(SG_OSG, SG_ALERT, "Failed to scale part of composite orthophoto. The image on the airport may be distorted.");
}
} }
composite_image->copySubImage(s_offset, t_offset, 0, sub_image); if (sub_image->getPixelFormat() != pixel_format || sub_image->getDataType() != data_type) {
SG_LOG(SG_OSG, SG_INFO, "Pixel format or data type mismatch. Attempting to convert component of composite orthophoto.");
if (ImageUtils::canConvert(sub_image, pixel_format, data_type)) {
sub_image = ImageUtils::convert(sub_image, pixel_format, data_type);
} else {
SG_LOG(SG_OSG, SG_ALERT, "Failed to convert component of composite orthophoto. Part of the image on the airport may be missing.");
}
}
bool success = ImageUtils::copyAsSubImage(sub_image, composite_image, s_offset, t_offset);
if (!success) {
SG_LOG(SG_OSG, SG_ALERT, "Failed to copy part of composite orthophoto. Part of the image on the aiport may be missing.");
}
} }
int max_texture_size = SGSceneFeatures::instance()->getMaxTextureSize(); int max_texture_size = SGSceneFeatures::instance()->getMaxTextureSize();
@ -324,7 +335,7 @@ namespace simgear {
if (success) { if (success) {
composite_image = scaled_image; composite_image = scaled_image;
} else { } else {
SG_LOG(SG_OSG, SG_ALERT, "Failed to scale composite orthophoto."); SG_LOG(SG_OSG, SG_ALERT, "Failed to scale composite orthophoto. You may encounter errors due to the oversize texture.");
} }
} }