From: Martin Mares <mj@ucw.cz>
Date: Sun, 15 Jun 2014 20:35:27 +0000 (+0200)
Subject: Disable logo drawing hacks
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;ds=sidebyside;h=bc432588d79bf0c0ba61430e0b6fc4c8e754eef6;p=leo.git

Disable logo drawing hacks
---

diff --git a/Makefile b/Makefile
index 2221454..f2a7361 100644
--- a/Makefile
+++ b/Makefile
@@ -42,10 +42,10 @@ install:
 endif
 .PHONY: install
 
-#output.svg: leo dump.osm poskole.css
-#	./leo
-#
-#output.pdf: output.svg
-#	inkscape --export-pdf=output.pdf output.svg
+output.svg: $(o)/leo dump.osm poskole.css
+	$(o)/leo
+
+output.pdf: output.svg
+	inkscape --export-pdf=output.pdf output.svg
 
 include $(BUILDSYS)/Makebottom
diff --git a/leo.c b/leo.c
index c873770..dea6cde 100644
--- a/leo.c
+++ b/leo.c
@@ -212,11 +212,14 @@ int main(int argc UNUSED, char **argv)
     }
 
   // FIXME: Replace by generic logo drawing facility
+#if 0
   struct svg_icon *logo = svg_icon_load(svg, "../logo/kocka-s-okrajem.svg");
+#endif
 
   sym_draw_all(svg);
 
   // Draw logo
+#if 0
   double logo_width = 36.12;
   double logo_height = 36.12 / logo->width * logo->height;
   struct svg_icon_request sir = {
@@ -227,6 +230,7 @@ int main(int argc UNUSED, char **argv)
     .height = logo_height,
   };
   svg_icon_put(svg, &sir);
+#endif
 
   draw_scale(svg);