Removed long-deprecated ImageFormat.h header, ImageFormat/ImageType enums.

Use ColorFormat.h header, ColorFormat and ColorType enums instead.
Amazingly enough there was a bug in Magnum.h (ColorType was typedef'd to
itself instead of ImageType).

src/Magnum/CMakeLists.txt

@@ -130,8 +130,7 @@ set(Magnum_HEADERS
 # Deprecated headers
 if(BUILD_DEPRECATED)
     set(Magnum_HEADERS ${Magnum_HEADERS}
-        DebugMarker.h
-        ImageFormat.h)
+        DebugMarker.h)
 endif()
 
 # Desktop-only headers and libraries

src/Magnum/ImageFormat.h

@@ -1,57 +0,0 @@
-#ifndef Magnum_ImageFormat_h
-#define Magnum_ImageFormat_h
-/*
-    This file is part of Magnum.
-
-    Copyright © 2010, 2011, 2012, 2013, 2014
-              Vladimír Vondruš <mosra@centrum.cz>
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included
-    in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-*/
-
-#ifdef MAGNUM_BUILD_DEPRECATED
-/** @file
- * @brief Enum @ref Magnum::ImageFormat, @ref Magnum::ImageType
- * @deprecated Use @ref ColorFormat.h instead.
- */
-#endif
-
-#include "Magnum/ColorFormat.h"
-
-#ifdef MAGNUM_BUILD_DEPRECATED
-namespace Magnum {
-
-/**
-@copybrief ColorFormat
-@deprecated Use @ref Magnum::ColorFormat "ColorFormat" instead.
-*/
-typedef CORRADE_DEPRECATED("use ColorFormat instead") ColorFormat ImageFormat;
-
-/**
-@copybrief ColorType
-@deprecated Use @ref Magnum::ColorType "ColorType" instead.
-*/
-typedef CORRADE_DEPRECATED("use ColorType instead") ColorType ImageType;
-
-}
-#else
-#error this header is available only on deprecated build
-#endif
-
-#endif

src/Magnum/Magnum.h

@@ -579,9 +579,6 @@ typedef BasicColor4<UnsignedByte> Color4ub;
 
 enum class ColorFormat: GLenum;
 enum class ColorType: GLenum;
-/** @todo Remove this when dropping backward compatibility */
-typedef ColorFormat ImageFormat;
-typedef ColorType ColorType;
 
 class Context;