diff options
| author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2016-03-17 16:27:26 +0300 |
|---|---|---|
| committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:56:46 +0300 |
| commit | 2928862bac8b3a96816b53d32954e05580914582 (patch) | |
| tree | 9b928a50fb0aa10de878d0a3a7fb77ad632d17a2 /drape | |
| parent | 8ce96397b00740e81eaac8ac7f084c25c998c741 (diff) | |
Debug output fixed.
Diffstat (limited to 'drape')
| -rw-r--r-- | drape/overlay_tree.cpp | 6 | ||||
| -rw-r--r-- | drape/render_bucket.cpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drape/overlay_tree.cpp b/drape/overlay_tree.cpp index 43e3888885..b50317e67e 100644 --- a/drape/overlay_tree.cpp +++ b/drape/overlay_tree.cpp @@ -238,12 +238,12 @@ void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle, Erase(*it); #ifdef DEBUG_OVERLAYS_OUTPUT - LOG(LINFO, ("Displace (2):", handle->GetOverlayDebugInfo(), "->", it->GetOverlayDebugInfo())); + LOG(LINFO, ("Displace (2):", handle->GetOverlayDebugInfo(), "->", (*it)->GetOverlayDebugInfo())); #endif #ifdef COLLECT_DISPLACEMENT_INFO m_displacementInfo.emplace_back(DisplacementData(handle->GetExtendedPixelRect(modelView).Center(), - it->GetExtendedPixelRect(modelView).Center(), + (*it)->GetExtendedPixelRect(modelView).Center(), dp::Color(0, 0, 255, 255))); #endif @@ -260,7 +260,7 @@ void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle, DeleteHandle(rivalHandle); #ifdef DEBUG_OVERLAYS_OUTPUT - LOG(LINFO, ("Displace (3):", handle->GetOverlayDebugInfo(), "->", handleToDelete->GetOverlayDebugInfo())); + LOG(LINFO, ("Displace (3):", handle->GetOverlayDebugInfo(), "->", rivalHandle->GetOverlayDebugInfo())); #endif #ifdef COLLECT_DISPLACEMENT_INFO diff --git a/drape/render_bucket.cpp b/drape/render_bucket.cpp index 8210088d04..7684ad5484 100644 --- a/drape/render_bucket.cpp +++ b/drape/render_bucket.cpp @@ -124,8 +124,7 @@ void RenderBucket::RenderDebug(ScreenBase const & screen) const if (!screen.PixelRect().IsIntersect(handle->GetPixelRect(screen, false))) continue; - OverlayHandle::Rects rects; - handle->GetExtendedPixelShape(screen, rects); + OverlayHandle::Rects const & rects = handle->GetExtendedPixelShape(screen); for (auto const & rect : rects) { if (screen.isPerspective() && !screen.PixelRectIn3d().IsIntersect(m2::RectD(rect))) |