Merge pull request #68 from markmaker/fix/com-apartmentthreaded

vonnieda · web-flow · commit 8badbbae826a · 2023-05-19T13:46:27.000-05:00
Fix / Use CoInitializeEx(NULL, COINIT_APARTMENTTHREADED)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@
 
 cmake_minimum_required(VERSION 3.1)
 project (openpnp-capture)
-set(OPENPNP_CAPTURE_LIB_VERSION "0.0.26" CACHE STRING "openpnp-capture library version")
+set(OPENPNP_CAPTURE_LIB_VERSION "0.0.28" CACHE STRING "openpnp-capture library version")
 set(OPENPNP_CAPTURE_LIB_SOVERSION "0" CACHE STRING "openpnp-capture library soversion")
 
 # make sure the libjpegturbo is compiled with the
diff --git a/win/platformcontext.cpp b/win/platformcontext.cpp
@@ -50,7 +50,7 @@ Context* createPlatformContext()
 PlatformContext::PlatformContext() : Context()
 {
     HRESULT hr;
-    hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
+    hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
     if (hr != S_OK)
     {
         // This might happen when another part of the program

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ Context* createPlatformContext()`
`50`	`50`	`PlatformContext::PlatformContext() : Context()`
`51`	`51`	`{`
`52`	`52`	`HRESULT hr;`
`53`		`- hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);`
	`53`	`+ hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);`
`54`	`54`	`if (hr != S_OK)`
`55`	`55`	`{`
`56`	`56`	`// This might happen when another part of the program`