* .webp image format support

plugins/image/crn.cpp

@@ -23,7 +23,6 @@
 #include "crn.h"
 
 #include "iarchive.h"
-#include "idatastream.h"
 #include "stream/textstream.h"
 
 #include "crnlib/crnlib.h"

plugins/image/image.cpp

@@ -31,6 +31,7 @@
 #include "dds.h"
 #include "ktx.h"
 #include "crn.h"
+#include "webp.h"
 
 
 #include "modulesystem/singletonmodule.h"
@@ -179,6 +180,26 @@ typedef SingletonModule<ImageCRNAPI, ImageDependencies> ImageCRNModule;
 ImageCRNModule g_ImageCRNModule;
 
 
+class ImageWebpAPI
+{
+	_QERPlugImageTable m_imagewebp;
+public:
+	typedef _QERPlugImageTable Type;
+	STRING_CONSTANT( Name, "webp" );
+
+	ImageWebpAPI(){
+		m_imagewebp.loadImage = LoadWebp;
+	}
+	_QERPlugImageTable* getTable(){
+		return &m_imagewebp;
+	}
+};
+
+typedef SingletonModule<ImageWebpAPI, ImageDependencies> ImageWebpModule;
+
+ImageWebpModule g_ImageWebpModule;
+
+
 extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules( ModuleServer& server ){
 	initialiseModule( server );
 
@@ -189,4 +210,5 @@ extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules( ModuleServer& server
 	g_ImageDDSModule.selfRegister();
 	g_ImageKTXModule.selfRegister();
 	g_ImageCRNModule.selfRegister();
+	g_ImageWebpModule.selfRegister();
 }

plugins/image/webp.cpp

@@ -0,0 +1,45 @@
+/*
+   Copyright (C) 2018, Unvanquished Developers
+   All Rights Reserved.
+
+   This file is part of NetRadiant.
+
+   NetRadiant is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   NetRadiant is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with NetRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+
+#include "webp.h"
+
+#include "iarchive.h"
+#include "stream/textstream.h"
+
+#include "webplib/webplib.h"
+#include "imagelib.h"
+
+Image* LoadWebpBuff( const byte *buffer, int length ){
+	int width, height;
+	if ( unsigned char *img = ConvertWebptoRGBA( buffer, length, width, height ) ) {
+		auto *image = new RGBAImage( width, height );
+		memcpy( image->getRGBAPixels(), img, width * height * sizeof( *RGBAImage::pixels ) );
+		free( img );
+		return image;
+	}
+	return nullptr;
+}
+
+Image* LoadWebp( ArchiveFile& file ){
+	ScopedArchiveBuffer buffer( file );
+	return LoadWebpBuff( buffer.buffer, buffer.length );
+}

plugins/image/webp.h

@@ -0,0 +1,27 @@
+/*
+   Copyright (C) 2018, Unvanquished Developers
+   All Rights Reserved.
+
+   This file is part of NetRadiant.
+
+   NetRadiant is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   NetRadiant is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with NetRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#pragma once
+
+class Image;
+class ArchiveFile;
+
+Image* LoadWebp( ArchiveFile &file );