X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=plugins%2Fimage%2Fdds.cpp;fp=plugins%2Fimage%2Fdds.cpp;h=0da0d3a223c1f728acafc71e954cac55bde29aab;hp=d8416d171fc7f7c4a4727f944e06ac2d6dad9c1a;hb=e4287c28bb2dafedc81c66e63951d947cfbeb225;hpb=203343b01a7ad87cb3d136689c9936ff5bc23c01 diff --git a/plugins/image/dds.cpp b/plugins/image/dds.cpp index d8416d17..0da0d3a2 100644 --- a/plugins/image/dds.cpp +++ b/plugins/image/dds.cpp @@ -1,23 +1,23 @@ /* -Copyright (C) 2001-2006, William Joseph. -All Rights Reserved. + Copyright (C) 2001-2006, William Joseph. + All Rights Reserved. -This file is part of GtkRadiant. + This file is part of GtkRadiant. -GtkRadiant 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. + GtkRadiant 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. -GtkRadiant 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. + GtkRadiant 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 GtkRadiant; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ + You should have received a copy of the GNU General Public License + along with GtkRadiant; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ #include "dds.h" @@ -30,27 +30,23 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "ddslib.h" #include "imagelib.h" -Image* LoadDDSBuff(const byte* buffer) -{ - int width, height; - ddsPF_t pixelFormat; - if(DDSGetInfo(reinterpret_cast(const_cast(buffer)), &width, &height, &pixelFormat) == -1) - { - return 0; - } - - RGBAImage* image = new RGBAImage(width, height); - - if(DDSDecompress(reinterpret_cast(const_cast(buffer)), image->getRGBAPixels()) == -1) - { - image->release(); - return 0; - } - return image; +Image* LoadDDSBuff( const byte* buffer ){ + int width, height; + ddsPF_t pixelFormat; + if ( DDSGetInfo( reinterpret_cast( const_cast( buffer ) ), &width, &height, &pixelFormat ) == -1 ) { + return 0; + } + + RGBAImage* image = new RGBAImage( width, height ); + + if ( DDSDecompress( reinterpret_cast( const_cast( buffer ) ), image->getRGBAPixels() ) == -1 ) { + image->release(); + return 0; + } + return image; } -Image* LoadDDS(ArchiveFile& file) -{ - ScopedArchiveBuffer buffer(file); - return LoadDDSBuff(buffer.buffer); +Image* LoadDDS( ArchiveFile& file ){ + ScopedArchiveBuffer buffer( file ); + return LoadDDSBuff( buffer.buffer ); }