more eol-style

[xonotic/netradiant.git] / plugins / imagem8 / m32.cpp

diff --git a/plugins/imagem8/m32.cpp b/plugins/imagem8/m32.cpp
index bb2c5efaf9018bba6f1704846be2311391a7071c..b5a1fe93494225829ae026ff4baa130994cd01d5 100644 (file)
--- a/plugins/imagem8/m32.cpp
+++ b/plugins/imagem8/m32.cpp
@@ -1,77 +1,77 @@
-/*\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
-#include <stdio.h>\r
-#include <string.h>\r
-#include <glib.h>\r
-#include "m32.h"\r
-\r
-void LoadM32(const char *name, unsigned char **pic, int *width, int *height)\r
-{\r
-    FILE       *f;\r
-    m32_header_t       *m32_header;\r
-    //rgb_t    *palette;\r
-    int                i, num_pixels, size;\r
-    char       text_buf[255];\r
-    unsigned int       length;\r
-    unsigned char      *palette_ent, *buf_temp;\r
-    unsigned char       *buffer, *m32_file_buffer;\r
-\r
-    // open file\r
-    if ( length = vfsLoadFile ((char *) name, (void **) &m32_file_buffer) == (unsigned int) -1)\r
-    {\r
-       Sys_Printf("Unable to open file %s\n",name);\r
-       return;\r
-    }\r
-\r
-    m32_header = (m32_header_t *)m32_file_buffer;\r
-\r
-    // make sure we have a valid bitmap file\r
-    if ( m32_header->version != M32_VERSION)\r
-    {\r
-           vfsFreeFile(m32_file_buffer);\r
-           Sys_Printf("Invalid M32 file %s\n", name);\r
-    }\r
-\r
-    // Get M32 Info\r
-    *width    = m32_header->width[0];          // Only interested in 1st MIP\r
-    *height   = m32_header->height[0];\r
-    num_pixels = (*width) * (*height);\r
-    size = num_pixels*4;\r
-\r
-    // Allocate buffer\r
-    buf_temp = (unsigned char *)(g_malloc(size));\r
-    *pic = buf_temp;\r
-\r
-    // Image data\r
-    buffer = m32_file_buffer + m32_header->offsets[0];\r
-\r
-\r
-    // Load texture into buffer\r
-    palette_ent = buffer;\r
-    for(i=0; i<size; i++, palette_ent++)\r
-    {\r
-       *buf_temp++ = *palette_ent;\r
-    }\r
-\r
-    vfsFreeFile(m32_file_buffer);\r
-}\r
-\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
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <glib.h>
+#include "m32.h"
+
+void LoadM32(const char *name, unsigned char **pic, int *width, int *height)
+{
+    FILE       *f;
+    m32_header_t       *m32_header;
+    //rgb_t    *palette;
+    int                i, num_pixels, size;
+    char       text_buf[255];
+    unsigned int       length;
+    unsigned char      *palette_ent, *buf_temp;
+    unsigned char       *buffer, *m32_file_buffer;
+
+    // open file
+    if ( length = vfsLoadFile ((char *) name, (void **) &m32_file_buffer) == (unsigned int) -1)
+    {
+       Sys_Printf("Unable to open file %s\n",name);
+       return;
+    }
+
+    m32_header = (m32_header_t *)m32_file_buffer;
+
+    // make sure we have a valid bitmap file
+    if ( m32_header->version != M32_VERSION)
+    {
+           vfsFreeFile(m32_file_buffer);
+           Sys_Printf("Invalid M32 file %s\n", name);
+    }
+
+    // Get M32 Info
+    *width    = m32_header->width[0];          // Only interested in 1st MIP
+    *height   = m32_header->height[0];
+    num_pixels = (*width) * (*height);
+    size = num_pixels*4;
+
+    // Allocate buffer
+    buf_temp = (unsigned char *)(g_malloc(size));
+    *pic = buf_temp;
+
+    // Image data
+    buffer = m32_file_buffer + m32_header->offsets[0];
+
+
+    // Load texture into buffer
+    palette_ent = buffer;
+    for(i=0; i<size; i++, palette_ent++)
+    {
+       *buf_temp++ = *palette_ent;
+    }
+
+    vfsFreeFile(m32_file_buffer);
+}
+