Finished changelog merge. Updated all license headers. Created new license header format in all files using single line comments.

1 files changed, 22 insertions, 22 deletions

diff --git a/imageto/main.c b/imageto/main.c
index 15b3906..51cfb92 100644
--- a/imageto/main.c
+++ b/imageto/main.c
@@ -1,20 +1,20 @@
-/* imageto -- convert a scanned image.
-
-Copyright (C) 1992, 2004, 2011 Free Software Foundation, Inc.
-
-This program 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 3, or (at your option)
-any later version.
-
-This program 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 this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+# imageto -- convert a scanned image.
+#
+# Copyright (C) 1992, 2004, 2011 Free Software Foundation, Inc.
+#
+# This program 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 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 #include "config.h"
 #include "lib.h"
@@ -52,7 +52,7 @@ string input_name;
 
 /* Show every scanline on the terminal as we read it?  (-trace-scanlines) */
 boolean trace_scanlines = false;
-
+
 /* Private variables.  */
 
 /* The design size of the font we're creating.  (-designsize)  */
@@ -76,7 +76,7 @@ static string read_command_line (int, string[]);
 static void set_img_input_format (void);
 static void set_input_format (string);
 static void set_pbm_input_format (void);
-
+
 /* We have three different strategies for processing the image:
      1)  (normal) analyze the image and write out the ``true'' characters,
      2) (-strips) takes a constant number of scanlines as each character,
@@ -182,7 +182,7 @@ main (int argc, string argv[])
 
   return 0;
 }
-
+
 /* We are semi-clever about printing this, for the sake of huge images.  */
 
 void
@@ -217,7 +217,7 @@ print_scanline (one_byte line[], unsigned width)
       putchar ('\n');
     }
 }
-
+
 /* Reading the options.  */
 
 /* This is defined in version.c.  */
@@ -358,7 +358,7 @@ read_command_line (int argc, string argv[])
 
   FINISH_COMMAND_LINE ();
 }
-
+
 /* If the input format wasn't explicitly set on the command line,
    attempt to intuit it from FILENAME, and set the necessary variables.
    If we can't tell what the format should be, quit.  */