Mac Only: Implemented initial CoreGraphics image decoding to support uploads, both single and bulk, bypassing viewer's internal decoding classes and using osx native frameworks. Also pushing non-fully-working-yet (and thus disabled) code for native j2c decoding.

3 files changed, 30 insertions, 4 deletions

diff --git a/linden/indra/newview/floaterlocalassetbrowse.cpp b/linden/indra/newview/floaterlocalassetbrowse.cpp
index 6564528..443b5bf 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.cpp
+++ b/linden/indra/newview/floaterlocalassetbrowse.cpp
@@ -74,6 +74,9 @@ this feature is still a work in progress.
 #include "llvovolume.h"
 #include "llface.h"
 
+#ifdef LL_DARWIN
+#include "llwindowmacosx-objc.h"
+#endif
 
 /*=======================================*/
 /*     Instantiating manager class       */
@@ -227,6 +230,13 @@ void LocalBitmap::updateSelf()
 
 bool LocalBitmap::decodeSelf(LLImageRaw* rawimg)
 {
+#ifdef LL_DARWIN
+        if (decodeImageQuartz(filename, rawimg))
+        {
+                rawimg->biasedScaleToPowerOfTwo( LLViewerImage::MAX_IMAGE_SIZE_DEFAULT );
+                return true;
+        }
+#else
         switch (this->extension)
         {
                 case IMG_EXTEN_BMP:
@@ -275,6 +285,7 @@ bool LocalBitmap::decodeSelf(LLImageRaw* rawimg)
                 default:
                         break;
         }
+#endif
         return false;
 }
 
diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index 9827a31..c81081f 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -62,6 +62,10 @@
 
 #include "hippoGridManager.h"
 
+#ifdef LL_DARWIN
+#include "llwindowmacosx-objc.h"
+#endif
+
 //static
 S32 LLFloaterImagePreview::sUploadAmount = 10;
 
@@ -353,7 +357,10 @@ bool LLFloaterImagePreview::loadImage(const std::string& src_filename)
         }
 
         LLPointer<LLImageRaw> raw_image = new LLImageRaw;
-
+#ifdef LL_DARWIN
+        if (! decodeImageQuartz(src_filename, raw_image))
+                return false;
+#else
         switch (codec)
         {
         case IMG_CODEC_BMP:
@@ -428,8 +435,9 @@ bool LLFloaterImagePreview::loadImage(const std::string& src_filename)
         }
 
         raw_image->biasedScaleToPowerOfTwo(1024);
+#endif
+
         mRawImagep = raw_image;
-        
         return true;
 }
 
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index cb02b09..869c9d7 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -65,6 +65,10 @@
 
 #include <sys/stat.h>
 
+#ifdef LL_DARWIN
+#include "llwindowmacosx-objc.h"
+#endif
+
 ////////////////////////////////////////////////////////////////////////////
 
 void (*LLViewerImageList::sUUIDCallback)(void **, const LLUUID&) = NULL;
@@ -920,7 +924,10 @@ BOOL LLViewerImageList::createUploadFile(const std::string& filename,
 {
         // First, load the image.
         LLPointer<LLImageRaw> raw_image = new LLImageRaw;
-        
+#ifdef LL_DARWIN
+        if (!decodeImageQuartz(filename, raw_image))
+                return FALSE;
+#else
         switch (codec)
         {
                 case IMG_CODEC_BMP:
@@ -993,7 +1000,7 @@ BOOL LLViewerImageList::createUploadFile(const std::string& filename,
                 default:
                         return FALSE;
         }
-        
+#endif
         LLPointer<LLImageJ2C> compressedImage = convertToUploadFile(raw_image);
         
         if( !compressedImage->save(out_filename) )