diff --git a/DummyLoader/DummyLoader.idl b/DummyLoader/DummyLoader.idl
index f4aa7bf..ef31ef0 100644
--- a/DummyLoader/DummyLoader.idl
+++ b/DummyLoader/DummyLoader.idl
@@ -4,8 +4,8 @@ import "IImage3d.idl";
[
- version(1.2),
- uuid(67E59584-3F6A-4852-8051-103A4583CA5E),
+ version(2.0),
+ uuid(ED4540BD-07B5-44B0-BCDE-3E2C1D99183B),
helpstring("DummyLoader module")
]
library DummyLoader
@@ -13,8 +13,8 @@ library DummyLoader
importlib("stdole2.tlb");
[
- version(1.2),
- uuid(6FA82ED5-6332-4344-8417-DEA55E72098C),
+ version(2.0),
+ uuid(50BE330D-F729-4D8F-A1E4-C939E0598EDF),
helpstring("3D image source")
]
coclass Image3dSource
@@ -23,8 +23,8 @@ library DummyLoader
};
[
- version(1.2),
- uuid(8E754A72-0067-462B-9267-E84AF84828F1),
+ version(2.0),
+ uuid(1326A2C6-7753-4584-B866-CDF3C6E240F1),
helpstring("3D image file loader")
]
coclass Image3dFileLoader
diff --git a/DummyLoader/Main.cpp b/DummyLoader/Main.cpp
index 48f8751..ef0b2cb 100644
--- a/DummyLoader/Main.cpp
+++ b/DummyLoader/Main.cpp
@@ -11,7 +11,7 @@ class DummyLoaderModule :
{
public:
DECLARE_LIBID(LIBID_DummyLoader)
- DECLARE_REGISTRY_APPID_RESOURCEID(IDR_AppID, "{92280FDD-C149-44E3-BDEE-736F9F9EEA4E}")
+ DECLARE_REGISTRY_APPID_RESOURCEID(IDR_AppID, "{AE03BF33-C065-4DB2-94E3-8167CF9B1E23}")
};
DummyLoaderModule _AtlModule;
diff --git a/DummyLoader/UNREGISTER_DummyLoader.bat b/DummyLoader/UNREGISTER_DummyLoader.bat
index 9585016..bf5a156 100644
--- a/DummyLoader/UNREGISTER_DummyLoader.bat
+++ b/DummyLoader/UNREGISTER_DummyLoader.bat
@@ -10,18 +10,18 @@ cd /d "%~dp0"
:: Remove all traces of DummyLoader from registry
for %%R in (HKEY_LOCAL_MACHINE HKEY_CURRENT_USER) do (
:: TypeLib
- reg delete "%%R\SOFTWARE\Classes\TypeLib\{67E59584-3F6A-4852-8051-103A4583CA5E}" /f 2> NUL
+ reg delete "%%R\SOFTWARE\Classes\TypeLib\{ED4540BD-07B5-44B0-BCDE-3E2C1D99183B}" /f 2> NUL
for %%P in (32 64) do (
:: Image3dSource class
reg delete "%%R\SOFTWARE\Classes\DummyLoader.Image3dSource" /f 2> NUL
reg delete "%%R\SOFTWARE\Classes\DummyLoader.Image3dSource.1" /f 2> NUL
- reg delete "%%R\SOFTWARE\Classes\CLSID\{6FA82ED5-6332-4344-8417-DEA55E72098C}" /f /reg:%%P 2> NUL
+ reg delete "%%R\SOFTWARE\Classes\CLSID\{50BE330D-F729-4D8F-A1E4-C939E0598EDF}" /f /reg:%%P 2> NUL
:: Image3dFileLoader class
reg delete "%%R\SOFTWARE\Classes\DummyLoader.Image3dFileLoader" /f 2> NUL
reg delete "%%R\SOFTWARE\Classes\DummyLoader.Image3dFileLoader.1" /f 2> NUL
- reg delete "%%R\SOFTWARE\Classes\CLSID\{8E754A72-0067-462B-9267-E84AF84828F1}" /f /reg:%%P 2> NUL
+ reg delete "%%R\SOFTWARE\Classes\CLSID\{1326A2C6-7753-4584-B866-CDF3C6E240F1}" /f /reg:%%P 2> NUL
)
)
diff --git a/Image3dAPI/IImage3d.idl b/Image3dAPI/IImage3d.idl
index e1256ce..80611de 100644
--- a/Image3dAPI/IImage3d.idl
+++ b/Image3dAPI/IImage3d.idl
@@ -17,8 +17,8 @@ typedef [
v1_enum, // 32bit enum size
helpstring("Image3dAPI version.")]
enum Image3dAPIVersion {
- IMAGE3DAPI_VERSION_MAJOR = 1,
- IMAGE3DAPI_VERSION_MINOR = 2,
+ IMAGE3DAPI_VERSION_MAJOR = 2,
+ IMAGE3DAPI_VERSION_MINOR = 0,
} Image3dAPIVersion;
@@ -276,7 +276,7 @@ cpp_quote("#endif")
[ object,
oleautomation, // use "automation" marshaler (oleaut32.dll)
- uuid(D483D815-52DD-4750-8CA2-5C6C489588B6),
+ uuid(881DC121-1C8B-44AE-99E2-AAE4AD6A50E0),
helpstring("Interface for retrieving 3D image data.")]
interface IImage3dSource : IUnknown {
[helpstring("Get the number of frames available")]
@@ -319,7 +319,7 @@ enum Image3dError {
[ object,
oleautomation, // use "automation" marshaler (oleaut32.dll)
- uuid(CD30759B-EB38-4469-9CA5-4DF75737A31B),
+ uuid(381BA014-DA39-48B2-B0E7-7454D439469A),
helpstring("Factory for loading 3D image data from a file.\n"
"Implementors are responsible for also providing details on relevant DICOM tags that indicate that the loader might support the file.")]
interface IImage3dFileLoader : IUnknown {
diff --git a/Image3dAPI/IImage3dTypeLibraryGenerator.idl b/Image3dAPI/IImage3dTypeLibraryGenerator.idl
index 7ae016c..fdcfe65 100644
--- a/Image3dAPI/IImage3dTypeLibraryGenerator.idl
+++ b/Image3dAPI/IImage3dTypeLibraryGenerator.idl
@@ -8,7 +8,7 @@ import "IImage3d.idl";
[
- uuid(3ff1aab8-f3d8-33d4-825d-00104b3646c0),
+ uuid(1979020F-3402-49AD-A17C-507A1BBE4D09),
helpstring("Interface to generate IImage3dAPI.tlb .")
]
library Image3dlib
diff --git a/Image3dAPI/UNREGISTER_Image3dAPI.bat b/Image3dAPI/UNREGISTER_Image3dAPI.bat
index 6f6a849..49f7c40 100644
--- a/Image3dAPI/UNREGISTER_Image3dAPI.bat
+++ b/Image3dAPI/UNREGISTER_Image3dAPI.bat
@@ -10,12 +10,12 @@ cd /d "%~dp0"
:: Remove all traces of Image3dAPI interfaces from registry
:: IImage3dTypeLibraryGenerator.idl
-reg delete "HKCR\TypeLib\{3ff1aab8-f3d8-33d4-825d-00104b3646c0}" /f 2> NUL
+reg delete "HKCR\TypeLib\{1979020F-3402-49AD-A17C-507A1BBE4D09}" /f 2> NUL
for %%P in (32 64) do (
:: IImage3d.idl
- reg delete "HKCR\Interface\{D483D815-52DD-4750-8CA2-5C6C489588B6}" /f /reg:%%P 2> NUL
- reg delete "HKCR\Interface\{CD30759B-EB38-4469-9CA5-4DF75737A31B}" /f /reg:%%P 2> NUL
+ reg delete "HKCR\Interface\{881DC121-1C8B-44AE-99E2-AAE4AD6A50E0}" /f /reg:%%P 2> NUL
+ reg delete "HKCR\Interface\{381BA014-DA39-48B2-B0E7-7454D439469A}" /f /reg:%%P 2> NUL
)
::pause
diff --git a/PackagingGE/DummyLoader.redist.nuspec b/PackagingGE/DummyLoader.redist.nuspec
index a13dde3..789665c 100644
--- a/PackagingGE/DummyLoader.redist.nuspec
+++ b/PackagingGE/DummyLoader.redist.nuspec
@@ -15,7 +15,7 @@
Fredrik Orderud
<>
changelog in docs/changelog.txt
- Copyright 2015-2018
+ Copyright 2015-2020
diff --git a/PackagingGE/Image3dAPI.nuspec b/PackagingGE/Image3dAPI.nuspec
index 2f9a9d1..f082e0a 100644
--- a/PackagingGE/Image3dAPI.nuspec
+++ b/PackagingGE/Image3dAPI.nuspec
@@ -16,7 +16,7 @@
<>
changelog in docs/changelog.txt
- Copyright 2015-2018
+ Copyright 2015-2020