Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / tools / quake2 / common / lbmlib.h

diff --git a/tools/quake2/common/lbmlib.h b/tools/quake2/common/lbmlib.h
index b20552257feed7911176e476e7fe004ee30b5e25..8bc9cafc79826113ead9e67da0487cf5eec465e8 100644 (file)
--- a/tools/quake2/common/lbmlib.h
+++ b/tools/quake2/common/lbmlib.h
@@ -1,38 +1,38 @@
-/*\r
-Copyright (C) 1999-2007 id Software, Inc. and contributors.\r
-For a list of contributors, see the accompanying CONTRIBUTORS file.\r
-\r
-This file is part of GtkRadiant.\r
-\r
-GtkRadiant is free software; you can redistribute it and/or modify\r
-it under the terms of the GNU General Public License as published by\r
-the Free Software Foundation; either version 2 of the License, or\r
-(at your option) any later version.\r
-\r
-GtkRadiant is distributed in the hope that it will be useful,\r
-but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-GNU General Public License for more details.\r
-\r
-You should have received a copy of the GNU General Public License\r
-along with GtkRadiant; if not, write to the Free Software\r
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\r
-*/\r
-// piclib.h\r
-\r
-\r
-void LoadLBM (char *filename, byte **picture, byte **palette);\r
-void WriteLBMfile (char *filename, byte *data, int width, int height\r
-       , byte *palette);\r
-void LoadPCX (char *filename, byte **picture, byte **palette, int *width, int *height);\r
-void WritePCXfile (char *filename, byte *data, int width, int height\r
-       , byte *palette);\r
-\r
-// loads / saves either lbm or pcx, depending on extension\r
-void Load256Image (char *name, byte **pixels, byte **palette,\r
-                                  int *width, int *height);\r
-void Save256Image (char *name, byte *pixels, byte *palette,\r
-                                  int width, int height);\r
-\r
-\r
-void LoadTGA (char *filename, byte **pixels, int *width, int *height);\r
+/*
+   Copyright (C) 1999-2007 id Software, Inc. and contributors.
+   For a list of contributors, see the accompanying CONTRIBUTORS file.
+
+   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 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
+ */
+// piclib.h
+
+
+void LoadLBM( char *filename, byte **picture, byte **palette );
+void WriteLBMfile( char *filename, byte *data, int width, int height
+                                  , byte *palette );
+void LoadPCX( char *filename, byte **picture, byte **palette, int *width, int *height );
+void WritePCXfile( char *filename, byte *data, int width, int height
+                                  , byte *palette );
+
+// loads / saves either lbm or pcx, depending on extension
+void Load256Image( char *name, byte **pixels, byte **palette,
+                                  int *width, int *height );
+void Save256Image( char *name, byte *pixels, byte *palette,
+                                  int width, int height );
+
+
+void LoadTGA( char *filename, byte **pixels, int *width, int *height );