Merge branch 'master' into divVerent/farplanedist-sky-fix

[xonotic/netradiant.git] / plugins / image / bmp.h

diff --git a/plugins/image/bmp.h b/plugins/image/bmp.h
index c246f17215823d3fbace17a334e48dedb4cac383..bbb0714e5742165c2bb9478093194c3db4deeacf 100644 (file)
--- a/plugins/image/bmp.h
+++ b/plugins/image/bmp.h
@@ -1,101 +1,30 @@
-/*\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
-\r
-#ifndef _BMP_H\r
-#define _BMP_H\r
-\r
-#define xBI_NONE  0\r
-#define xBI_RGB   0\r
-#define xBI_RLE4  2\r
-#define xBI_RLE8  1\r
-\r
-#define BMP_SIGNATURE_WORD  0x4d42\r
-\r
-#pragma pack(1)\r
-\r
-\r
-\r
-typedef struct {\r
-    unsigned short    bfType;       // signature - 'BM'\r
-    unsigned long     bfSize;       // file size in bytes\r
-    unsigned short    bfReserved1;  // 0\r
-    unsigned short    bfReserved2;  // 0\r
-    unsigned long     bfOffBits;    // offset to bitmap\r
-} bmphd_t;\r
-\r
-\r
-\r
-typedef struct {\r
-    unsigned long     biSize;       // size of this struct\r
-    long              biWidth;      // bmap width in pixels\r
-    long              biHeight;     // bmap height in pixels\r
-    unsigned short    biPlanes;     // num planes - always 1\r
-    unsigned short    biBitCount;   // bits perpixel\r
-    unsigned long     biCompression; // compression flag\r
-    unsigned long     biSizeImage;   // image size in bytes\r
-    long              biXPelsPerMeter; // horz resolution\r
-    long              biYPelsPerMeter; // vert resolution\r
-    unsigned long     biClrUsed;       // 0 -> color table size\r
-    unsigned long     biClrImportant;  // important color count\r
-} binfo_t;\r
-\r
-\r
-typedef struct {\r
-    unsigned char blue;\r
-    unsigned char green;\r
-    unsigned char red;\r
-    unsigned char reserved;\r
-} drgb_t;\r
-\r
-\r
-// quake expects its palette to be bgr\r
-// this is totally backwards but what can you do\r
-typedef struct {\r
-    unsigned char r;\r
-    unsigned char g;\r
-    unsigned char b;\r
-} rgb_t;\r
-\r
-\r
-typedef struct {\r
-    unsigned char b;\r
-    unsigned char g;\r
-    unsigned char r;\r
-} bgr_t;\r
-\r
-\r
-typedef struct {\r
-       int            bpp;        // bits per pixel\r
-    int            width;\r
-    int            height;\r
-    unsigned char *data;\r
-    rgb_t         *palette;\r
-} bitmap_t;\r
-\r
-\r
-void LoadBMP(char *filename, bitmap_t *bit);\r
-void FreeBMP(bitmap_t *bitmap);\r
-void WriteBMP(char *filename, bitmap_t *bit);\r
-void NewBMP(int width, int height, int bpp, bitmap_t *bit);\r
-\r
-\r
-\r
-#endif\r
+/*
+   Copyright (C) 2001-2006, William Joseph.
+   All Rights Reserved.
+
+   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
+ */
+
+#if !defined ( INCLUDED_BMP_H )
+#define INCLUDED_BMP_H
+
+class Image;
+class ArchiveFile;
+
+Image* LoadBMP( ArchiveFile& file );
+
+#endif