Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LIBOMV-681 Adds 64 bit export stubs to openjpeg-dotnet, Thanks Robert Adams for the report

Browse Source 
* 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:
Jim Radford
2009-08-22 20:46:17 +00:00
parent 29c5fea933
commit 60b8a2df0e
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
openjpeg-dotnet/OpenJPEG.rc
View File

@@ -7,7 +7,8 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
//#include "afxres.h"
#include "windows.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

25
openjpeg-dotnet/dotnet/dotnet.cpp
View File

@@ -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)
{

6
openjpeg-dotnet/dotnet/dotnet.h
View File

@@ -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