[screenshot] exception handling for screenshot requests; [cef example…

…] fixed bitness
aardvark-platform · Oct 11, 2022 · fbbecc1 · fbbecc1
1 parent 3d2f024
commit fbbecc1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 5.3.3
+- exception handling for screenshots
+
 ### 5.3.2
 - Fixed CEF processes nuget packages
 - [Screenshot] Save image with alpha when using PNG

diff --git a/src/Aardvark.Service.Giraffe/Server.fs b/src/Aardvark.Service.Giraffe/Server.fs
@@ -524,7 +524,7 @@ module Server =
             }
 
 
-        let private screenshot (sceneName : string) (next : HttpFunc) (ctx : HttpContext) =
+        let screenshot' (sceneName : string) (next : HttpFunc) (ctx : HttpContext) =
             let request = ctx.Request
             let args = request.Query |> Seq.choose (fun v -> match v.Value with | SingleString s -> Some (v.Key, s) | _ -> None) |> Map.ofSeq
 
@@ -588,7 +588,7 @@ module Server =
 
         let screenshot (sceneName : string) (next : HttpFunc) (ctx : HttpContext) =
             try
-                screenshot sceneName next ctx
+                screenshot' sceneName next ctx
             with e -> 
                 RequestErrors.BAD_REQUEST (sprintf "could not render screenshot (cause: %s)" e.Message) next ctx
 

diff --git a/src/Aardvark.Service/SuaveServer.fs b/src/Aardvark.Service/SuaveServer.fs
@@ -448,7 +448,7 @@ module Server =
             let json = Pickler.json.PickleToString stats
             ctx |> (OK json >=> Writers.setMimeType "text/json")
 
-        let private screenshot' (sceneName : string) (context: HttpContext) =
+        let  screenshot' (sceneName : string) (context: HttpContext) =
             let request = context.request
             let args = request.query |> List.choose (function (n,Some v) -> Some(n,v) | _ -> None) |> Map.ofList
 

diff --git a/src/Aardvark.UI.Primitives/UI.Primitives.fs b/src/Aardvark.UI.Primitives/UI.Primitives.fs
@@ -33,7 +33,7 @@ module Html =
 
         let horizontal ch = table [clazz "ui table"; style "backgroundColor: transparent"] [ tbody [] [ tr [] ch ] ]
 
-        let finish<'msg> = td[] []
+        let finish<'msg> = td [] []
 
     let ofC4b (c : C4b) = sprintf "rgb(%i,%i,%i)" c.R c.G c.B
 

diff --git a/src/Examples (net471)/Hello World (net471)/Hello World (CEF).fsproj b/src/Examples (net471)/Hello World (net471)/Hello World (CEF).fsproj
@@ -4,6 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net471</TargetFramework>
     <DisableImplicitFSharpCoreReference>True</DisableImplicitFSharpCoreReference>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\..\..\bin\Debug\</OutputPath>