fix slideshow

Author: Frédéric Bour

.gitignore

@@ -7,6 +7,7 @@
 *.cmx
 *.cmxs
 *.cmxa
+.merlin
 
 # ocamlbuild working directory
 _build/
@@ -27,6 +28,3 @@ node_modules
 
 *.lock
 yarn-error.log
-
-example/.merlin
-lib/.merlin

.merlin

@@ -1,7 +1,7 @@
 all: driver
 
 driver:
-	dune build driver.bc
+	dune build driver.bc pres_state.cma
 
 clean:
 	dune clean

slideshow/.merlin

@@ -0,0 +1,10 @@
+(executable
+ (name driver) 
+ (modules mod_use slideshow driver)
+ (libraries tgls.tgles2 tsdl findlib.dynload compiler-libs.toplevel wall)
+ (flags :standard -linkall))
+
+(library
+ (name pres_state)
+ (modules pres_state)
+ (libraries wall))

slideshow/Makefile

@@ -4,14 +4,16 @@ let background =
   Paint.linear_gradient ~sx:0.0 ~sy:0.0 ~ex:1024.0 ~ey:0.0
      ~inner:Color.white ~outer:(Color.with_a Color.blue 0.5)
 
-let mediabox = Path.make (fun ctx -> Path.rect ctx 0.0 0.0 1024.0 768.0)
+let mediabox = Path.make @@ fun t ->
+  Path.rect t ~x:0.0 ~y:0.0 ~w:1024.0 ~h:768.0
 
 let load_font name =
   let ic = open_in_bin name in
   let dim = in_channel_length ic in
   let fd = Unix.descr_of_in_channel ic in
   let buffer =
-    Bigarray.Array1.map_file fd Bigarray.int8_unsigned Bigarray.c_layout false dim
+    Bigarray.array1_of_genarray @@
+    Unix.map_file fd Bigarray.int8_unsigned Bigarray.c_layout false [|dim|]
   in
   let offset = List.hd (Stb_truetype.enum buffer) in
   match Stb_truetype.init buffer offset with

slideshow/dune

@@ -1,3 +1,4 @@
+[@@@ocaml.warning "-6"]
 open Wall
 open Wall_text
 open Pres_state
@@ -201,7 +202,7 @@ Slideshow.set_slides Slideshow.window [
              Transform.scale (1.0 +. f /. 4.0) f)
             (Image.paint paint (Image.fill circle)))
      ]);
-  (fun st ->
+  (fun _st ->
      let outline = Outline.make ~cap:`ROUND ~width:10.0 () in
      let circle = Path.make (fun ctx ->
          Path.circle ctx 0.0 0.0 100.0
@@ -454,7 +455,7 @@ Slideshow.set_slides Slideshow.window [
        code "Image.transform (skew %a %a) rect" pf sx pf sy;
      ]);
   (fun _ -> api_outline `Composition);
-  (fun st ->
+  (fun _st ->
      let rect =
        Path.make (fun ctx -> Path.rect ctx (-120.0) (-120.0) 240.0 240.0)
      in