diff --git a/openjpeg-dotnet/OpenJPEG.rc b/openjpeg-dotnet/OpenJPEG.rc index 4711c575..2ddc653d 100644 --- a/openjpeg-dotnet/OpenJPEG.rc +++ b/openjpeg-dotnet/OpenJPEG.rc @@ -7,7 +7,8 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +//#include "afxres.h" +#include "windows.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/openjpeg-dotnet/dotnet/dotnet.cpp b/openjpeg-dotnet/dotnet/dotnet.cpp index 25cc2ab3..bdf28598 100644 --- a/openjpeg-dotnet/dotnet/dotnet.cpp +++ b/openjpeg-dotnet/dotnet/dotnet.cpp @@ -6,6 +6,10 @@ extern "C" { } #include +bool DotNetAllocEncoded64(MarshalledImage* image) +{ + return DotNetAllocEncoded(image); +} bool DotNetAllocEncoded(MarshalledImage* image) { @@ -23,6 +27,10 @@ bool DotNetAllocEncoded(MarshalledImage* image) return true; } +bool DotNetAllocDecoded64(MarshalledImage* image) +{ + return DotNetAllocDecoded(image); +} bool DotNetAllocDecoded(MarshalledImage* image) { @@ -40,6 +48,10 @@ bool DotNetAllocDecoded(MarshalledImage* image) return true; } +void DotNetFree64(MarshalledImage* image) +{ + DotNetFree(image); +} void DotNetFree(MarshalledImage* image) { @@ -47,6 +59,10 @@ void DotNetFree(MarshalledImage* image) if (image->decoded != 0) delete[] image->decoded; } +bool DotNetEncode64(MarshalledImage* image, bool lossless) +{ + return DotNetEncode(image, lossless); +} bool DotNetEncode(MarshalledImage* image, bool lossless) { @@ -132,6 +148,11 @@ bool DotNetEncode(MarshalledImage* image, bool lossless) } } +bool DotNetDecode64(MarshalledImage* image) +{ + return DotNetDecode(image); +} + bool DotNetDecode(MarshalledImage* image) { opj_dparameters dparameters; @@ -167,6 +188,10 @@ bool DotNetDecode(MarshalledImage* image) return false; } } +bool DotNetDecodeWithInfo64(MarshalledImage* image) +{ + return DotNetDecodeWithInfo(image); +} bool DotNetDecodeWithInfo(MarshalledImage* image) { diff --git a/openjpeg-dotnet/dotnet/dotnet.h b/openjpeg-dotnet/dotnet/dotnet.h index 122405bb..67c87e8c 100644 --- a/openjpeg-dotnet/dotnet/dotnet.h +++ b/openjpeg-dotnet/dotnet/dotnet.h @@ -34,5 +34,11 @@ DLLEXPORT bool DotNetAllocEncoded(MarshalledImage* image); DLLEXPORT bool DotNetAllocDecoded(MarshalledImage* image); DLLEXPORT void DotNetFree(MarshalledImage* image); +DLLEXPORT bool DotNetEncode64(MarshalledImage* image, bool lossless); +DLLEXPORT bool DotNetDecode64(MarshalledImage* image); +DLLEXPORT bool DotNetDecodeWithInfo64(MarshalledImage* image); +DLLEXPORT bool DotNetAllocEncoded64(MarshalledImage* image); +DLLEXPORT bool DotNetAllocDecoded64(MarshalledImage* image); +DLLEXPORT void DotNetFree64(MarshalledImage* image); #endif