Merged default into minor

--HG--
branch : minor

src/modules/graphics/opengl/Canvas.cpp

@@ -894,6 +894,9 @@ love::image::ImageData *Canvas::getImageData(love::image::Image *image)
 
 void Canvas::getPixel(unsigned char* pixel_rgba, int x, int y)
 {
+	if (x < 0 || x >= width || y < 0 || y >= width)
+		throw love::Exception("Attempt to get out-of-range pixel (%d,%d)!", x, y);
+
 	resolveMSAA();
 
 	// Our texture is attached to 'resolve_fbo' when we use MSAA.

src/modules/image/magpie/ddsHandler.cpp

@@ -20,8 +20,6 @@
 
 #include "ddsHandler.h"
 
-#include <algorithm>
-
 namespace love
 {
 namespace image
@@ -31,12 +29,6 @@ namespace magpie
 
 bool ddsHandler::canParse(const filesystem::FileData *data)
 {
-	std::string ext = data->getExtension();
-	std::transform(ext.begin(), ext.end(), ext.begin(), tolower);
-
-	if (ext.compare("dds") != 0)
-		return false;
-
 	return dds::isCompressedDDS(data->getData(), data->getSize());
 }