Skip to content

Fix large images still not being openable #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Filoppi wants to merge 1 commit into
base: release-1.1.0
Choose a base branch
from
+14 −6
Open

Fix large images still not being openable #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions DXRenderer/HDRImageViewerRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,14 +912,22 @@ void HDRImageViewerRenderer::ComputeHdrMetadata()

ctx->DrawImage(m_histogramEffect.Get());

// We ignore D2DERR_RECREATE_TARGET here. This error indicates that the device
// is lost. It will be handled during the next call to Present.
HRESULT hr = ctx->EndDraw();
ctx->SetDpi(m_deviceResources->GetDpi(), m_deviceResources->GetDpi());
if (hr != D2DERR_RECREATE_TARGET)
// Depending on the resolution, DPI, Windows size etc,
// EndDraw() might return the "D1225: Tile Too Small" error.
// In that case, we want to continue, even if we won't have the histogram data.
try
{
IFT(hr);
HRESULT hr = ctx->EndDraw();
// We ignore D2DERR_RECREATE_TARGET here. This error indicates that the device
// is lost. It will be handled during the next call to Present.
if (FAILED(hr) && hr != D2DERR_RECREATE_TARGET)
{
throw Platform::Exception::CreateException(hr);
}
}
catch (...) { }

ctx->SetDpi(m_deviceResources->GetDpi(), m_deviceResources->GetDpi());

float *histogramData = new float[sc_histNumBins];
IFT(m_histogramEffect->GetValue(D2D1_HISTOGRAM_PROP_HISTOGRAM_OUTPUT,
Expand Down