diff options
Diffstat (limited to 'indra/llimagej2coj')
| -rw-r--r-- | indra/llimagej2coj/CMakeLists.txt | 31 | ||||
| -rw-r--r-- | indra/llimagej2coj/llimagej2coj.cpp | 6 |
2 files changed, 34 insertions, 3 deletions
diff --git a/indra/llimagej2coj/CMakeLists.txt b/indra/llimagej2coj/CMakeLists.txt new file mode 100644 index 0000000000..ed3ff3c8ee --- /dev/null +++ b/indra/llimagej2coj/CMakeLists.txt @@ -0,0 +1,31 @@ +# -*- cmake -*- + +project(llimagej2coj) + +include(00-Common) +include(LLCommon) +include(LLImage) +include(OpenJPEG) + +include_directories( + ${LLCOMMON_INCLUDE_DIRS} + ${LLIMAGE_INCLUDE_DIRS} + ${OPENJPEG_INCLUDE_DIR} + ) + +set(llimagej2coj_SOURCE_FILES + llimagej2coj.cpp + ) + +set(llimagej2coj_HEADER_FILES + CMakeLists.txt + + llimagej2coj.h + ) + +set_source_files_properties(${llimagej2coj_HEADER_FILES} + PROPERTIES HEADER_FILE_ONLY TRUE) + +list(APPEND llimagej2coj_SOURCE_FILES ${llimagej2coj_HEADER_FILES}) + +add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES}) diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp index c71ba1b3c2..2818859d93 100644 --- a/indra/llimagej2coj/llimagej2coj.cpp +++ b/indra/llimagej2coj/llimagej2coj.cpp @@ -33,7 +33,7 @@ #include "llimagej2coj.h" // this is defined so that we get static linking. -#include "openjpeg/openjpeg.h" +#include "openjpeg.h" #include "lltimer.h" #include "llmemory.h" @@ -268,12 +268,12 @@ BOOL LLImageJ2COJ::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, con if (!comment_text) { - parameters.cp_comment = ""; + parameters.cp_comment = (char *) ""; } else { // Awful hacky cast, too lazy to copy right now. - parameters.cp_comment = (char *)comment_text; + parameters.cp_comment = (char *) comment_text; } // |