diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-03-06 14:27:29 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-03-06 14:27:29 -0500 |
| commit | 1771857e6c538382e86ea5b69e36fe8fbaa59f08 (patch) | |
| tree | 6182c291393b8dbb141d7519b8f1b77d61526774 /indra/llimagej2coj | |
| parent | 08ed7f676f2ce38937a03c2a4e823e3564981264 (diff) | |
| parent | bfdbda24bf96b85104742f5578b5a921bc91a1d8 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llimagej2coj')
| -rw-r--r-- | indra/llimagej2coj/llimagej2coj.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp index 3bb1778d9d..925da5674b 100644 --- a/indra/llimagej2coj/llimagej2coj.cpp +++ b/indra/llimagej2coj/llimagej2coj.cpp @@ -41,8 +41,12 @@ LLImageJ2CImpl* fallbackCreateLLImageJ2CImpl() std::string LLImageJ2COJ::getEngineInfo() const { +#ifdef OPENJPEG_VERSION return std::string("OpenJPEG: " OPENJPEG_VERSION ", Runtime: ") + opj_version(); +#else + return std::string("OpenJPEG runtime: ") + opj_version(); +#endif } // Return string from message, eliminating final \n if present |