diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-23 10:08:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-24 08:11:12 +0000 |
| commit | 81b7de3d9f29d3aa14446b5c3624fe62cdbebd30 (patch) | |
| tree | 6f9e07c9ad5d151f1a870df098c83df8e2b9642d /canvas | |
| parent | 93de1f80e8b6ea49be8eca57a87e6ba92dc6cae9 (diff) | |
convert canvas::IRenderModule::PrimitiveType to scoped enum
Change-Id: Idf2e7449ce5b595386f437597ce7ccf00d141db0
Reviewed-on: https://gerrit.libreoffice.org/22634
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/directx/dx_9rm.cxx | 10 | ||||
| -rw-r--r-- | canvas/source/tools/surface.cxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index 633e5a972e7e..8d697e1af104 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -501,7 +501,7 @@ namespace dxcanvas mnBeginSceneCount(0), mbCanUseDynamicTextures(false), mbError( false ), - meType( PRIMITIVE_TYPE_UNKNOWN ), + meType( PrimitiveType::Unknown ), maPageSize(), mad3dpp(), maNumVertices( VERTEX_BUFFER_SIZE ), @@ -1038,8 +1038,8 @@ namespace dxcanvas return; --mnBeginSceneCount; - meType=PRIMITIVE_TYPE_UNKNOWN; - mnCount=0; + meType = PrimitiveType::Unknown; + mnCount = 0; } @@ -1056,7 +1056,7 @@ namespace dxcanvas switch(meType) { - case PRIMITIVE_TYPE_TRIANGLE: + case PrimitiveType::Triangle: { maVertexCache.push_back(vertex); ++mnCount; @@ -1064,7 +1064,7 @@ namespace dxcanvas break; } - case PRIMITIVE_TYPE_QUAD: + case PrimitiveType::Quad: { if(mnCount == 3) { diff --git a/canvas/source/tools/surface.cxx b/canvas/source/tools/surface.cxx index 8cd5e93a41ba..c1ff5a218f65 100644 --- a/canvas/source/tools/surface.cxx +++ b/canvas/source/tools/surface.cxx @@ -158,7 +158,7 @@ namespace canvas vertex.z = 0.0f; { - pRenderModule->beginPrimitive( canvas::IRenderModule::PRIMITIVE_TYPE_QUAD ); + pRenderModule->beginPrimitive( canvas::IRenderModule::PrimitiveType::Quad ); // issue an endPrimitive() when leaving the scope const ::comphelper::ScopeGuard aScopeGuard( @@ -279,7 +279,7 @@ namespace canvas vertex.z = 0.0f; { - pRenderModule->beginPrimitive( canvas::IRenderModule::PRIMITIVE_TYPE_QUAD ); + pRenderModule->beginPrimitive( canvas::IRenderModule::PrimitiveType::Quad ); // issue an endPrimitive() when leaving the scope const ::comphelper::ScopeGuard aScopeGuard( @@ -385,7 +385,7 @@ namespace canvas nVertexCount/3 ); #endif - pRenderModule->beginPrimitive( canvas::IRenderModule::PRIMITIVE_TYPE_TRIANGLE ); + pRenderModule->beginPrimitive( canvas::IRenderModule::PrimitiveType::Triangle ); // issue an endPrimitive() when leaving the scope const ::comphelper::ScopeGuard aScopeGuard( |