diff --git a/lib/OSnap_Config/OSnap_Config_Global.ml b/lib/OSnap_Config/OSnap_Config_Global.ml index 55ae0c2..2805241 100644 --- a/lib/OSnap_Config/OSnap_Config_Global.ml +++ b/lib/OSnap_Config/OSnap_Config_Global.ml @@ -115,10 +115,11 @@ module YAML = struct |> Result.join |> Result.map (Option.value ~default:0) in - Result.ok (r, g, b))) + Result.ok + @@ Int32.of_int ((0xFF lsl 24) lor (b lsl 16) lor (g lsl 8) lor (r lsl 0)))) |> Result.map OSnap_Config_Utils.to_result_option |> Result.join - |> Result.map (Option.value ~default:(255, 0, 0)) + |> Result.map (Option.value ~default:0xFF0000FFl) in let duplicates = default_sizes @@ -285,8 +286,9 @@ module JSON = struct let* r = assoc |> Yojson.Basic.Util.member "r" |> get_color in let* g = assoc |> Yojson.Basic.Util.member "g" |> get_color in let* b = assoc |> Yojson.Basic.Util.member "b" |> get_color in - Result.ok (r, g, b) - | `Null -> Result.ok (255, 0, 0) + Result.ok + @@ Int32.of_int ((0xFF lsl 24) lor (b lsl 16) lor (g lsl 8) lor (r lsl 0)) + | `Null -> Result.ok 0xFF0000FFl | _ -> Result.error (`OSnap_Config_Parse_Error diff --git a/lib/OSnap_Config/OSnap_Config_Types.ml b/lib/OSnap_Config/OSnap_Config_Types.ml index a15f353..89660a4 100644 --- a/lib/OSnap_Config/OSnap_Config_Types.ml +++ b/lib/OSnap_Config/OSnap_Config_Types.ml @@ -42,6 +42,6 @@ type global = ; default_sizes : size list ; functions : (string * action list) list ; snapshot_directory : string - ; diff_pixel_color : int * int * int + ; diff_pixel_color : int32 ; parallelism : int option } diff --git a/lib/OSnap_Diff/OSnap_Diff.ml b/lib/OSnap_Diff/OSnap_Diff.ml index fb017bd..7f60488 100644 --- a/lib/OSnap_Diff/OSnap_Diff.ml +++ b/lib/OSnap_Diff/OSnap_Diff.ml @@ -11,9 +11,9 @@ type failState = let diff ~output - ?(diffPixel = 255, 0, 0) ?(ignoreRegions = []) ?(threshold = 0) + ~diffPixel ~original_image_data ~new_image_data () @@ -41,13 +41,13 @@ let diff ~diffPixel () |> function - | Pixel (_, diffCount, _) when diffCount <= threshold -> + | Pixel (_, diffCount, _, _) when diffCount <= threshold -> free_images (); Result.ok () | Layout -> free_images (); Result.error Layout - | Pixel (diff_mask, diffCount, diffPercentage) -> + | Pixel (diff_mask, diffCount, diffPercentage, _) -> let border_width = 5 in let complete_width = original_image.width diff --git a/lib/OSnap_Diff/OSnap_Diff.mli b/lib/OSnap_Diff/OSnap_Diff.mli index 23cb859..6954e41 100644 --- a/lib/OSnap_Diff/OSnap_Diff.mli +++ b/lib/OSnap_Diff/OSnap_Diff.mli @@ -5,9 +5,9 @@ type failState = val diff : output:string - -> ?diffPixel:int * int * int -> ?ignoreRegions:((int * int) * (int * int)) list -> ?threshold:int + -> diffPixel:int32 -> original_image_data:string -> new_image_data:string -> unit diff --git a/osnap.opam b/osnap.opam index f6d98a1..052e8be 100644 --- a/osnap.opam +++ b/osnap.opam @@ -47,11 +47,8 @@ build: [ dev-repo: "git+https://github.com/eWert-Online/OSnap.git" pin-depends: [ [ "cdp.dev" "git+https://github.com/eWert-Online/reason-cdp.git#a0579cb4789b8ccf1cc4342b9885a46cf1549012"] - [ "eio-ssl.dev" "git+https://github.com/anmonteiro/eio-ssl.git#0.3.0"] - [ "httpun-ws.dev" "git+https://github.com/anmonteiro/httpun-ws.git"] - [ "httpun-ws-eio.dev" "git+https://github.com/anmonteiro/httpun-ws.git"] [ "libspng.dev" "git+https://github.com/eWert-Online/esy-libspng.git#opam"] [ "multipart_form.dev" "git+https://github.com/anmonteiro/multipart_form.git"] - [ "odiff-core.dev" "git+https://github.com/dmtrKovalenko/odiff.git#5a9a1976c553b6c57c32c4e9dcf185bbcdaf1fca"] + [ "odiff-core.dev" "git+https://github.com/dmtrKovalenko/odiff.git#v3.1.1"] [ "piaf.dev" "git+https://github.com/anmonteiro/piaf.git"] ] \ No newline at end of file diff --git a/osnap.opam.template b/osnap.opam.template index 63fb759..15e0dcb 100644 --- a/osnap.opam.template +++ b/osnap.opam.template @@ -1,10 +1,7 @@ pin-depends: [ [ "cdp.dev" "git+https://github.com/eWert-Online/reason-cdp.git#a0579cb4789b8ccf1cc4342b9885a46cf1549012"] - [ "eio-ssl.dev" "git+https://github.com/anmonteiro/eio-ssl.git#0.3.0"] - [ "httpun-ws.dev" "git+https://github.com/anmonteiro/httpun-ws.git"] - [ "httpun-ws-eio.dev" "git+https://github.com/anmonteiro/httpun-ws.git"] [ "libspng.dev" "git+https://github.com/eWert-Online/esy-libspng.git#opam"] [ "multipart_form.dev" "git+https://github.com/anmonteiro/multipart_form.git"] - [ "odiff-core.dev" "git+https://github.com/dmtrKovalenko/odiff.git#5a9a1976c553b6c57c32c4e9dcf185bbcdaf1fca"] + [ "odiff-core.dev" "git+https://github.com/dmtrKovalenko/odiff.git#v3.1.1"] [ "piaf.dev" "git+https://github.com/anmonteiro/piaf.git"] ] \ No newline at end of file