Commit 5f9aefec authored by Cédric Traizet's avatar Cédric Traizet
Browse files

BUG: fix ImageMetadata pointer checks in GlImageActor and use...

BUG: fix ImageMetadata pointer checks in GlImageActor and use OutputImageMetadata in m_ImageToViewportTransform in Ice::GlImageActor
parent 7c6de401
Pipeline #9285 passed with stages
in 69 minutes and 19 seconds
......@@ -1089,11 +1089,13 @@ void GlImageActor::UpdateTransforms()
geometryChanged = geometryChanged
|| (m_ViewportToImageTransform.IsNotNull() && m_ViewportToImageTransform->GetInputProjectionRef() != settings->GetWkt())
|| (m_ImageToViewportTransform.IsNotNull() && m_ImageToViewportTransform->GetOutputProjectionRef() != settings->GetWkt())
|| (m_ViewportToImageTransform.IsNotNull() && m_ViewportToImageTransform->GetInputImageMetadata() == nullptr)
|| (m_ImageToViewportTransform.IsNotNull() && m_ImageToViewportTransform->GetInputImageMetadata() == nullptr)
|| (m_ViewportToImageTransform.IsNotNull() && !HasSameSensorModel(*(m_ViewportToImageTransform->GetInputImageMetadata()),
|| (m_ViewportToImageTransform.IsNotNull() && m_ViewportToImageTransform->GetInputImageMetadata()
&& settings->GetImageMetadata()
&& !HasSameSensorModel(*(m_ViewportToImageTransform->GetInputImageMetadata()),
*(settings->GetImageMetadata())))
|| (m_ImageToViewportTransform.IsNotNull() && !HasSameSensorModel(*(m_ImageToViewportTransform->GetInputImageMetadata()),
|| (m_ImageToViewportTransform.IsNotNull() && m_ImageToViewportTransform->GetOutputImageMetadata()
&& settings->GetImageMetadata()
&& !HasSameSensorModel(*(m_ImageToViewportTransform->GetOutputImageMetadata()),
*(settings->GetImageMetadata())));
if(settings->GetUseProjection() && geometryChanged)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment