Added support for upload and local usage of PSD (Photoshop, including layers and native transparency) and TIFF images (including alpha channel) on any Intel Mac using native Quartz/vImage routines

5 files changed, 54 insertions, 0 deletions

diff --git a/linden/indra/newview/floaterlocalassetbrowse.cpp b/linden/indra/newview/floaterlocalassetbrowse.cpp
index 443b5bf..991d2fd 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.cpp
+++ b/linden/indra/newview/floaterlocalassetbrowse.cpp
@@ -119,6 +119,10 @@ LocalBitmap::LocalBitmap(std::string fullpath)
                 else if (temp_exten == "tga") { this->extension = IMG_EXTEN_TGA; }
                 else if (temp_exten == "jpg" || temp_exten == "jpeg") { this->extension = IMG_EXTEN_JPG; }
                 else if (temp_exten == "png") { this->extension = IMG_EXTEN_PNG; }
+#ifdef LL_DARWIN
+                else if (temp_exten == "psd") { this->extension = IMG_EXTEN_PSD; }
+                else if (temp_exten == "tif" || temp_exten == "tiff") { this->extension = IMG_EXTEN_TIFF; }
+#endif
                 else { return; } // no valid extension.
 
                 /* getting file's last modified */
diff --git a/linden/indra/newview/floaterlocalassetbrowse.h b/linden/indra/newview/floaterlocalassetbrowse.h
index e02a7d3..69afe98 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.h
+++ b/linden/indra/newview/floaterlocalassetbrowse.h
@@ -114,6 +114,10 @@ class LocalBitmap
                         IMG_EXTEN_TGA,
                         IMG_EXTEN_JPG,
                         IMG_EXTEN_PNG
+#ifdef LL_DARWIN
+                        ,IMG_EXTEN_PSD,
+                        IMG_EXTEN_TIFF
+#endif
                 };
 
                 enum bitmap_type
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index 40b1abb..a59fa06 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -532,12 +532,16 @@ Boolean LLFilePicker::navOpenFilterProc(AEDesc *theItem, void *info, void *callB
                                                 {
                                                         if (fileInfo.filetype != 'JPEG' && fileInfo.filetype != 'JPG ' && 
                                                                 fileInfo.filetype != 'BMP ' && fileInfo.filetype != 'TGA ' &&
+                                                                fileInfo.filetype != 'TIFF' && fileInfo.filetype != 'PSD ' &&
                                                                 fileInfo.filetype != 'BMPf' && fileInfo.filetype != 'TPIC' &&
                                                                 fileInfo.filetype != 'PNG ' &&
                                                                 (fileInfo.extension && (CFStringCompare(fileInfo.extension, CFSTR("jpeg"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
                                                                 CFStringCompare(fileInfo.extension, CFSTR("jpg"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
                                                                 CFStringCompare(fileInfo.extension, CFSTR("bmp"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
                                                                 CFStringCompare(fileInfo.extension, CFSTR("tga"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
+                                                                CFStringCompare(fileInfo.extension, CFSTR("psd"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
+                                                                CFStringCompare(fileInfo.extension, CFSTR("tiff"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
+                                                                CFStringCompare(fileInfo.extension, CFSTR("tif"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
                                                                 CFStringCompare(fileInfo.extension, CFSTR("png"), kCFCompareCaseInsensitive) != kCFCompareEqualTo))
                                                                 )
                                                         {
diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index 389bd5a..8142869 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -355,6 +355,16 @@ bool LLFloaterImagePreview::loadImage(const std::string& src_filename)
         {
                 codec = IMG_CODEC_PNG;
         }
+#ifdef LL_DARWIN
+        else if( exten == "psd" )
+        {
+                codec = IMG_CODEC_PSD;
+        }
+        else if( exten == "tif" || exten == "tiff" )
+        {
+                codec = IMG_CODEC_TIFF;
+        }
+#endif
 
         LLPointer<LLImageRaw> raw_image = new LLImageRaw;
 #ifdef LL_DARWIN
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index 432fcc5..1981bb9 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -640,6 +640,38 @@ void upload_new_resource(const std::string& src_filename, std::string name,
                         return;
                 }
         }
+#ifdef LL_DARWIN
+        else if(exten == "psd")
+        {
+                asset_type = LLAssetType::AT_TEXTURE;
+                if (!LLViewerImageList::createUploadFile(src_filename,
+                                                                                                 filename,
+                                                                                                 IMG_CODEC_PSD ))
+                {
+                        error_message = llformat("Problem with file %s:\n\n%s\n",
+                                                                         src_filename.c_str(), LLImage::getLastError().c_str());
+                        args["FILE"] = src_filename;
+                        args["ERROR"] = LLImage::getLastError();
+                        upload_error(error_message, "ProblemWithFile", filename, args);
+                        return;
+                }
+        }
+        else if(exten == "tif" || exten == "tiff")
+        {
+                asset_type = LLAssetType::AT_TEXTURE;
+                if (!LLViewerImageList::createUploadFile(src_filename,
+                                                                                                 filename,
+                                                                                                 IMG_CODEC_TIFF ))
+                {
+                        error_message = llformat("Problem with file %s:\n\n%s\n",
+                                                                         src_filename.c_str(), LLImage::getLastError().c_str());
+                        args["FILE"] = src_filename;
+                        args["ERROR"] = LLImage::getLastError();
+                        upload_error(error_message, "ProblemWithFile", filename, args);
+                        return;
+                }
+        }
+#endif
         else if(exten == "wav")
         {
                 asset_type = LLAssetType::AT_SOUND;  // tag it as audio