From 930c9f2a5df54afd7a24d4bd1a3b05112382a01b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 2 Nov 2012 12:25:27 +0100 Subject: [PATCH] Don't have `default:` in switches where all cases need to be handled. Also added assert for cases which shouldn't be reached. --- src/AbstractImage.cpp | 16 ++++++++++++++-- src/Context.cpp | 4 +++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/AbstractImage.cpp b/src/AbstractImage.cpp index de0e9929c..075ff69b3 100644 --- a/src/AbstractImage.cpp +++ b/src/AbstractImage.cpp @@ -14,6 +14,9 @@ */ #include "AbstractImage.h" + +#include + #include "TypeTraits.h" using namespace std; @@ -71,6 +74,8 @@ size_t AbstractImage::pixelSize(Components format, ComponentType type) { switch(format) { #ifndef MAGNUM_TARGET_GLES case Components::Red: + case Components::Green: + case Components::Blue: return 1*size; case Components::RedGreen: return 2*size; @@ -85,9 +90,16 @@ size_t AbstractImage::pixelSize(Components format, ComponentType type) { case Components::BGRA: #endif return 4*size; - default: - return 0; + + #ifndef MAGNUM_TARGET_GLES + case Components::Depth: + case Components::StencilIndex: + case Components::DepthStencil: + CORRADE_ASSERT(false, "AbstractImage::pixelSize(): unhandled depth/stencil type", 0); + #endif } + + return 0; } } diff --git a/src/Context.cpp b/src/Context.cpp index 06cfe594f..23d506d0c 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -129,6 +129,7 @@ const std::vector& Extension::extensions(Version version) { switch(version) { case Version::None: return extensions; + case Version::GL210: return empty; case Version::GL300: return extensions300; case Version::GL310: return extensions310; case Version::GL320: return extensions320; @@ -137,8 +138,9 @@ const std::vector& Extension::extensions(Version version) { case Version::GL410: return extensions410; case Version::GL420: return extensions420; case Version::GL430: return extensions430; - default: return empty; } + + return empty; } Context* Context::_current = nullptr;