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

When creating composite orthophoto, only scale sub images when necessary

Browse Source
This commit is contained in:
Nathaniel MacArthur-Warner
2020-12-23 17:32:31 -08:00
parent 0e7cf378a4
commit 6ed37c880a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/util/OrthophotoManager.cxx
+9 -4
View File
@@ -18,6 +18,7 @@
// Boston, MA 02110-1301, USA. // Boston, MA 02110-1301, USA.
#include "OrthophotoManager.hxx" #include "OrthophotoManager.hxx"
#include <simgear/debug/debug_types.h>
namespace simgear { namespace simgear {
@@ -285,16 +286,20 @@ namespace simgear {
const int s_offset = degs_to_pixels_x * _bbox.getLonOffset(bounds); const int s_offset = degs_to_pixels_x * _bbox.getLonOffset(bounds);
const int t_offset = degs_to_pixels_y * _bbox.getLatOffset(bounds); const int t_offset = degs_to_pixels_y * _bbox.getLatOffset(bounds);
// Make a deep copy of the orthophoto's image so that we don't modify the original when scaling ImageRef sub_image = orthophoto->_texture->getImage();
ImageRef sub_image = new osg::Image(*orthophoto->_texture->getImage(), osg::CopyOp::DEEP_COPY_ALL);
if (sub_image->getPixelFormat() != pixel_format) { if (sub_image->getPixelFormat() != pixel_format) {
SG_LOG(SG_OSG, SG_ALERT, "Pixel format mismatch. Not creating part of composite orthophoto."); SG_LOG(SG_OSG, SG_ALERT, "Pixel format mismatch. Not creating part of composite orthophoto.");
continue; continue;
} }
sub_image->scaleImage(width, height, depth); if (sub_image->s() != width || sub_image->t() != height) {
SG_LOG(SG_OSG, SG_WARN, "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
sub_image = new osg::Image(*sub_image, osg::CopyOp::DEEP_COPY_ALL);
sub_image->scaleImage(width, height, depth);
}
composite_image->copySubImage(s_offset, t_offset, 0, sub_image); composite_image->copySubImage(s_offset, t_offset, 0, sub_image);
} }