diff options
| -rw-r--r-- | indra/llkdu/llimagej2ckdu.cpp | 20 | ||||
| -rw-r--r-- | indra/llkdu/llimagej2ckdu.h | 12 | 
2 files changed, 2 insertions, 30 deletions
| diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp index 282c859e9e..90b8d10ecc 100644 --- a/indra/llkdu/llimagej2ckdu.cpp +++ b/indra/llkdu/llimagej2ckdu.cpp @@ -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 diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index 02281152bf..b123a6dd52 100644 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h @@ -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 | 
