Joel Holdsworth : tools: Remove fallback render rule.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 60fad33ae9e7eaff4fb3733ff640a5706ada0c87
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=60fad33ae9e7eaff4fb3733ff6...

Author: Joel Holdsworth <joel(a)airwebreathe.org.uk>
Date:   Tue Apr 20 23:50:55 2010 +0100

tools: Remove fallback render rule.

---

 tools/buildicon |   21 ++-------------------
 1 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/tools/buildicon b/tools/buildicon
index ec2ec69..f5d32c0 100755
--- a/tools/buildicon
+++ b/tools/buildicon
@@ -106,22 +106,6 @@ sub svg_element_start
     push(@pngFiles, $pngFileName);
 }
 
-sub resize_image
-{
-    # Use ImageMagick to stretch the image
-    my($size) = @_;
-    my $pngFileName = "$icoName-$size.png";
-    shell $convert, $renderedSVGFileName, "-resize", "${size}x${size}", $pngFileName;
-    push(@pngFiles, $pngFileName);
-}
-
-sub fallback_render
-{
-    resize_image(16);
-    resize_image(32);
-    resize_image(48);
-}
-
 # Render the SVG image
 shell $rsvg, $svgFileName, $renderedSVGFileName;
 
@@ -130,9 +114,8 @@ my $parser = new XML::Parser(
     Handlers => {Start => \&svg_element_start});
 $parser->parsefile("$svgFileName");
 
-# If no render directives were found, this is an old-style icon
-# which should be rendered with the old build rule
-fallback_render unless(@pngFiles);
+# Die if no render directives were found
+die "No render directives found in icon" unless(@pngFiles);
 
 # Combine them into an ICO file
 shell $icotool, "-c", "-o", $icoFileName, @pngFiles;