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

Use macro to rename function on Win64

Browse Source 
Add WIN64 define in addition to WIN32 when compiling on Win64

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3101 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
Latif Khalifa
2009-08-22 21:14:43 +00:00
parent 33d3963e8c
commit 1f1c18ceae
3 changed files with 155 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,14 +6,9 @@ extern "C" {
}
#include <algorithm>
bool DotNetAllocEncoded64(MarshalledImage* image)
bool LibomvFunc(DotNetAllocEncoded)(MarshalledImage* image)
{
return DotNetAllocEncoded(image);
}
bool DotNetAllocEncoded(MarshalledImage* image)
{
DotNetFree(image);
LibomvFunc(DotNetFree)(image);
try
{
@@ -27,14 +22,10 @@ bool DotNetAllocEncoded(MarshalledImage* image)
return true;
}
bool DotNetAllocDecoded64(MarshalledImage* image)
{
return DotNetAllocDecoded(image);
}
bool DotNetAllocDecoded(MarshalledImage* image)
bool LibomvFunc(DotNetAllocDecoded)(MarshalledImage* image)
{
DotNetFree(image);
LibomvFunc(DotNetFree)(image);
try
{
@@ -48,23 +39,15 @@ bool DotNetAllocDecoded(MarshalledImage* image)
return true;
}
void DotNetFree64(MarshalledImage* image)
{
DotNetFree(image);
}
void DotNetFree(MarshalledImage* image)
void LibomvFunc(DotNetFree)(MarshalledImage* image)
{
if (image->encoded != 0) delete[] image->encoded;
if (image->decoded != 0) delete[] image->decoded;
}
bool DotNetEncode64(MarshalledImage* image, bool lossless)
{
return DotNetEncode(image, lossless);
}
bool DotNetEncode(MarshalledImage* image, bool lossless)
bool LibomvFunc(DotNetEncode)(MarshalledImage* image, bool lossless)
{
try
{
@@ -148,12 +131,7 @@ bool DotNetEncode(MarshalledImage* image, bool lossless)
}
}
bool DotNetDecode64(MarshalledImage* image)
{
return DotNetDecode(image);
}
bool DotNetDecode(MarshalledImage* image)
bool LibomvFunc(DotNetDecode)(MarshalledImage* image)
{
opj_dparameters dparameters;
@@ -188,12 +166,8 @@ bool DotNetDecode(MarshalledImage* image)
return false;
}
}
bool DotNetDecodeWithInfo64(MarshalledImage* image)
{
return DotNetDecodeWithInfo(image);
}
bool DotNetDecodeWithInfo(MarshalledImage* image)
bool LibomvFunc(DotNetDecodeWithInfo)(MarshalledImage* image)
{
opj_dparameters dparameters;
opj_codestream_info_t info;