Merge: Various fixes and improvements from We Broke The World

Pull-Request: #778
Reviewed-by: Jean Privat <jean@pryen.org>
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --combined contrib/inkscape_tools/src/svg_to_png_and_nit.nit
index 1a2d7b3,1723ecf..2a94089
--- 1/contrib/inkscape_tools/src/svg_to_png_and_nit.nit
--- 2/contrib/inkscape_tools/src/svg_to_png_and_nit.nit
+++ b/contrib/inkscape_tools/src/svg_to_png_and_nit.nit
@@@ -183,8 -183,8 +183,8 @@@ for drawing in drawings d
  
                        var x = words[1].to_f.floor.to_i
                        var y = words[2].to_f.floor.to_i
-                       var w = words[3].to_f.ceil.to_i
-                       var h = words[4].to_f.ceil.to_i
+                       var w = words[3].to_f.ceil.to_i+1
+                       var h = words[4].to_f.ceil.to_i+1
  
                        if id.has_prefix("0") then
                                var nit_name = id.substring_from(1)
@@@ -205,7 -205,7 +205,7 @@@
        # Nit class
        var nit_class_name = drawing_name.chars.first.to_s.to_upper + drawing_name.substring_from(1) + "Images"
        var nit_src = new ImageSetSrc(nit_class_name)
 -      nit_src.attributes.add "\tprivate var main_image: Image\n"
 +      nit_src.attributes.add "\tprivate var main_image: Image is noinit\n"
        nit_src.load_exprs.add "\t\tmain_image = app.load_image(\"images/{drawing_name}.png\")\n"
  
        # Sort images by name, it prevents Array errors and looks better
@@@ -234,7 -234,7 +234,7 @@@
                        nit_src.load_exprs.add "\t\t{nit_name}.add(main_image.subimage({x}, {y}, {w}, {h}))\n"
                else
                        # Single image
 -                      nit_src.attributes.add "\tvar {nit_name}: Image\n"
 +                      nit_src.attributes.add "\tvar {nit_name}: Image is noinit\n"
                        nit_src.load_exprs.add "\t\t{nit_name} = main_image.subimage({x}, {y}, {w}, {h})\n"
                end
        end