Changeset 3153

Timestamp:

10/12/07 18:29:41 (6 years ago)

Author:

werner

Message:

• new option -32 for 32 bpp mode
• new option -pnm to use PNM instead of PNG files

File:

• trunk/src/host/splash/splashimg.pl (modified) (3 diffs)

trunk/src/host/splash/splashimg.pl

@@ -22 +22 @@
 #
 
+
+%bpp = 16;
+
+
 sub usage
 {
-    print STDERR "usage: $0 [System_boot.png]\n";
+    print STDERR "usage: $0 [-32] [-pnm] [System_boot.png]\n";
     exit(1);
 }
 
+
+while ($ARGV[0] =~ /^-[^-]/) {
+    if ($ARGV[0] eq "-32") {
+        $bpp = 32;
+        shift @ARGV;
+    }
+    elsif ($ARGV[0] eq "-pnm") {
+        $pnm = 1;
+        shift @ARGV;
+    }
+    else {
+        die "unrecognized option: \"$ARGV[0]\"";
+    }
+}
 
 &usage unless $#ARGV < 2;
@@ -37 +55 @@
 }
 
-$cmd = "pngtopnm '$file' | ppmtorgb3";
+if ($pnm) {
+    $cmd = "cat '$file' | ppmtorgb3";
+}
+else {
+    $cmd = "pngtopnm '$file' | ppmtorgb3";
+}
 
 system($cmd) && die "system \"$cmd\": $?";
@@ -57 +80 @@
     $g = unpack("C",substr($p{"grn"},$i,1));
     $b = unpack("C",substr($p{"blu"},$i,1));
-    $v = ($r >> 3) << 11 | ($g >> 2) << 5 | ($b >> 3);
-    print pack("v",$v) || die "print: $!";
+    if ($bpp == 16) {
+        $v = ($r >> 3) << 11 | ($g >> 2) << 5 | ($b >> 3);
+        print pack("v",$v) || die "print: $!";
+    }
+    else {
+        $v = ($r) << 16 | ($g) << 8 | $b;
+        print pack("V",$v) || die "print: $!";
+    }
 }