License: Update GPLv2+ header to match current FSF recommendation

[lugaru.git] / Source / TGALoader.cpp

diff --git a/Source/TGALoader.cpp b/Source/TGALoader.cpp
index fdb2afa006df53a06823d7d993b06fef163fdc8a..a7a1178ae4b53eaee72cfa3de96ca50aba974872 100644 (file)
--- a/Source/TGALoader.cpp
+++ b/Source/TGALoader.cpp
@@ -3,20 +3,18 @@ Copyright (C) 2003, 2010 - Wolfire Games
 
 This file is part of Lugaru.
 
-Lugaru 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.
+Lugaru 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.
 
-This program is distributed in the hope that it will be useful,
+Lugaru 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.
+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 this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /**> HEADER FILES <**/
@@ -42,16 +40,16 @@ bool upload_image(const unsigned char* filePath, bool hasalpha)
     char fileName[256];
     CopyPascalStringToC( filePath, fileName);
     /*
-       // change extension to .TGA
-       int len = strlen( fileName);
-       if (len > 3)
-       {
-               fileName[ len - 3] = 't';
-               fileName[ len - 2] = 'g';
-               fileName[ len - 1] = 'a';
-       }
+        // change extension to .TGA
+        int len = strlen( fileName);
+        if (len > 3)
+        {
+            fileName[ len - 3] = 't';
+            fileName[ len - 2] = 'g';
+            fileName[ len - 1] = 'a';
+        }
     */
-//     return (LoadTGA( fileName) != NULL);
+//return (LoadTGA( fileName) != NULL);
     return (LoadImage(fileName, texture));
 
 #else
@@ -120,18 +118,18 @@ bool upload_image(const unsigned char* filePath, bool hasalpha)
     DisposeGWorld(gw);
 
     // Loop Through The Image Data
-    GLuint                     imageSize;                                                                      // Used To Store The Image Size When Setting Aside Ram
-    GLuint                     temp;                                                                           // Temporary Variable
-    GLuint                     bytesPerPixel;                                                                          // Temporary Variable
+    GLuint imageSize; // Used To Store The Image Size When Setting Aside Ram
+    GLuint temp; // Temporary Variable
+    GLuint bytesPerPixel; // Temporary Variable
     bytesPerPixel = texture.bpp / 8;
     imageSize = texture.sizeX * texture.sizeY * bytesPerPixel;
     //~ int alltrans=10;
 
     for ( GLuint i = 0; i < int( imageSize ); i += 4 ) {
         // Swaps The 1st And 3rd Bytes ('R'ed and 'B'lue)
-        temp = texture.data[i];                                        // Temporarily Store The Value At Image Data 'i'
-        texture.data[i] = texture.data[i + 1]; // Set The 1st Byte To The Value Of The 3rd Byte
-        texture.data[i + 1] = texture.data[i + 2];                             // Set The 3rd Byte To The Value In 'temp' (1st Byte Value)
+        temp = texture.data[i]; // Temporarily Store The Value At Image Data 'i'
+        texture.data[i] = texture.data[i + 1]; // Set The 1st Byte To The Value Of The 3rd Byte
+        texture.data[i + 1] = texture.data[i + 2]; // Set The 3rd Byte To The Value In 'temp' (1st Byte Value)
         texture.data[i + 2] = texture.data[i + 3];
         texture.data[i + 3] = temp;
     }
@@ -141,8 +139,8 @@ bool upload_image(const unsigned char* filePath, bool hasalpha)
     if (!hasalpha) {
         for ( GLuint i = 0; i < int( imageSize ); i += 4 ) {
             texture.data[i + 3] = 255;
-            /*texture.data[tempplace] = texture.data[i];       // Set The 1st Byte To The Value Of The 3rd Byte
-            texture.data[tempplace + 1] = texture.data[i + 1];                         // Set The 3rd Byte To The Value In 'temp' (1st Byte Value)
+            /*texture.data[tempplace] = texture.data[i]; // Set The 1st Byte To The Value Of The 3rd Byte
+            texture.data[tempplace + 1] = texture.data[i + 1]; // Set The 3rd Byte To The Value In 'temp' (1st Byte Value)
             texture.data[tempplace + 2] = texture.data[i + 2];
             tempplace+=3;*/
         }
@@ -159,7 +157,7 @@ bool upload_image(const unsigned char* filePath, bool hasalpha)
                     howmany = 0;
                     for ( GLuint l = 0; l < texdetail * texture.sizeX ; l += texture.sizeX ) {
                         for ( GLuint j = 0; j < texdetail ; j ++ ) {
-                            temp += (int)texture.data[k + i + j * bytesPerPixel + l * bytesPerPixel + b];      // Set The 1st Byte To The Value Of The 3rd Byte
+                            temp += (int)texture.data[k + i + j * bytesPerPixel + l * bytesPerPixel + b]; // Set The 1st Byte To The Value Of The 3rd Byte
                             howmany++;
                         }
                     }