livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRTVWR-427: Remove engineInfoLLImageJ2CKDU(), createLLImageJ2CKDU(), 

destroyLLImageJ2CKDU().

These were apparently intended as simple C-style DLL entry points. But as
nobody calls them, and as we decided against building the viewer from DLLs,
they only clutter the code.
master
Nat Goodspeed 2016-07-21 14:29:29 -04:00
parent f868e29945
commit f09a92f1f3
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/llkdu/llimagej2ckdu.cpp
View File

@ -72,23 +72,6 @@ private:
//
void set_default_colour_weights(kdu_params *siz);
const char* engineInfoLLImageJ2CKDU()
{
static std::string version = llformat("KDU %s", KDU_CORE_VERSION);
return version.c_str();
}
LLImageJ2CKDU* createLLImageJ2CKDU()
{
return new LLImageJ2CKDU();
}
void destroyLLImageJ2CKDU(LLImageJ2CKDU* kdu)
{
delete kdu;
kdu = NULL;
}
LLImageJ2CImpl* fallbackCreateLLImageJ2CImpl()
{
return new LLImageJ2CKDU();
@ -102,7 +85,8 @@ void fallbackDestroyLLImageJ2CImpl(LLImageJ2CImpl* impl)
const char* fallbackEngineInfoLLImageJ2CImpl()
{
return engineInfoLLImageJ2CKDU();
static std::string version = llformat("KDU %s", KDU_CORE_VERSION);
return version.c_str();
}
class LLKDUDecodeState

12
indra/llkdu/llimagej2ckdu.h
View File

@ -92,16 +92,4 @@ private:
LLKDUDecodeState *mDecodeState;
};
#if LL_WINDOWS
# define LLSYMEXPORT __declspec(dllexport)
#elif LL_LINUX
# define LLSYMEXPORT __attribute__ ((visibility("default")))
#else
# define LLSYMEXPORT
#endif
extern "C" LLSYMEXPORT const char* engineInfoLLImageJ2CKDU();
extern "C" LLSYMEXPORT LLImageJ2CKDU* createLLImageJ2CKDU();
extern "C" LLSYMEXPORT void destroyLLImageJ2CKDU(LLImageJ2CKDU* kdu);
#endif