From 968c2365395dd73218d6242a7fc2fb0f72d21fe6 Mon Sep 17 00:00:00 2001 From: ExMix Date: Wed, 18 Sep 2013 14:45:42 +0300 Subject: [drape] review fixes --- drape/attribute_provider.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drape/attribute_provider.cpp') diff --git a/drape/attribute_provider.cpp b/drape/attribute_provider.cpp index cdb2256e3c..3c0af9f2f4 100644 --- a/drape/attribute_provider.cpp +++ b/drape/attribute_provider.cpp @@ -39,28 +39,28 @@ uint8_t AttributeProvider::GetStreamCount() const const void * AttributeProvider::GetRawPointer(uint8_t streamIndex) { - ASSERT(streamIndex < GetStreamCount(), ("Stream index = ", streamIndex, " out of range [0 : ", GetStreamCount(), ")")); + ASSERT_LESS(streamIndex, GetStreamCount(), ()); CHECK_STREAMS; return m_streams[streamIndex].m_data.GetRaw(); } const BindingInfo & AttributeProvider::GetBindingInfo(uint8_t streamIndex) const { - ASSERT(streamIndex < GetStreamCount(), ("Stream index = ", streamIndex, " out of range [0 : ", GetStreamCount(), ")")); + ASSERT_LESS(streamIndex, GetStreamCount(), ()); CHECK_STREAMS; return m_streams[streamIndex].m_binding; } void AttributeProvider::Advance(uint16_t vertexCount) { - assert(m_vertexCount >= vertexCount); + ASSERT_LESS_OR_EQUAL(vertexCount, m_vertexCount, ()); CHECK_STREAMS; for (size_t i = 0; i < GetStreamCount(); ++i) { const BindingInfo & info = m_streams[i].m_binding; uint32_t offset = vertexCount * info.GetElementSize(); void * rawPointer = m_streams[i].m_data.GetRaw(); - m_streams[i].m_data = WeakPointer((void *)(((uint8_t *)rawPointer) + offset)); + m_streams[i].m_data = ReferencePoiner((void *)(((uint8_t *)rawPointer) + offset)); } m_vertexCount -= vertexCount; @@ -68,9 +68,9 @@ void AttributeProvider::Advance(uint16_t vertexCount) void AttributeProvider::InitStream(uint8_t streamIndex, const BindingInfo &bindingInfo, - WeakPointer data) + ReferencePoiner data) { - ASSERT(streamIndex < GetStreamCount(), ("Stream index = ", streamIndex, " out of range [0 : ", GetStreamCount(), ")")); + ASSERT_LESS(streamIndex, GetStreamCount(), ()); AttributeStream s; s.m_binding = bindingInfo; s.m_data = data; -- cgit v1.2.3