Commit pdfi to master.

This is a commit of the pdfi branch to master, eliminating
the traditional merge step.

The full history of the pdfi branch can be seen in the repo,
and that branch is effectively frozen from this point onwards.

This commit actually differs from pdfi in a small number of
whitespace changes (trailing spaces etc).

1 files changed, 6 insertions, 6 deletions

diff --git a/toolbin/headercompile.pl b/toolbin/headercompile.pl
index 2b3a95b3d..2b9c3220a 100755
--- a/toolbin/headercompile.pl
+++ b/toolbin/headercompile.pl
@@ -99,7 +99,7 @@ sub pcompare($$)
     return $v;
 }
 
-# main: Work starts here 
+# main: Work starts here
 
 readdeps("base");
 readdeps("psi");
@@ -267,7 +267,7 @@ for (my $ui=$mx-1; $ui >= 0; $ui--) {
     if (!exists $dirs{$f}) {
         next;
     }
-    
+
     $h = $dirs{$f}."/".$f;
 
     my $ret = system("cc -DHAVE_INTTYPES_H -Ibase -Ipsi -Ilcms2mt -Ilcms2 -Iopenjpeg/src/lib/openjp2 -Ijpeg -Ijbig2dec   -Iobj -o tmp.o $h > tmp.err 2>&1");
@@ -385,9 +385,9 @@ sub rewrite_make($)
     open(F, "$f") || die "WTF?";
     while (<F>) {
         $_ =~ s/[\r\n]*$//;
-	if ($_ =~ m/^\# Dependencies:/) {
-	    last;
-	}
+    if ($_ =~ m/^\# Dependencies:/) {
+        last;
+    }
         if ($_ =~ m/^([a-z0-9_\-]+_h)=/) {
             my $f = $1;
             # Gather up the line, allowing for continuations
@@ -406,7 +406,7 @@ sub rewrite_make($)
                 }
                 $_ = $block;
             }
-            
+
             my $makefile = 0;
             if ($_ =~ m/\$\(MAKEFILE\)/) {
                 $makefile = 1;