Second Life viewer sources 1.21.0-RC

1 files changed, 3 insertions, 3 deletions

diff --git a/linden/indra/llimagej2coj/llimagej2coj.cpp b/linden/indra/llimagej2coj/llimagej2coj.cpp
index 478cc84..983241c 100644
--- a/linden/indra/llimagej2coj/llimagej2coj.cpp
+++ b/linden/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;
         }
 
         //