LIBOMV-681 Adds 64 bit export stubs to openjpeg-dotnet, Thanks Robert Adams for the report
* This changes the 32bit exported dll functions back to what they were, and adds the 64 bit dll exports * Includes windows.h instead of afxrs.h which isn't included with Express Editions of Visual Studio Express git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3099 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
@@ -6,6 +6,10 @@ extern "C" {
|
||||
}
|
||||
#include <algorithm>
|
||||
|
||||
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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user