diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-03-31 14:33:12 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-03-31 17:44:20 +0300 |
| commit | fcc8ffda16ee409e5952e3ca1d872bee786514df (patch) | |
| tree | 920efa910b2860846dab12003067a89c20e29970 /indra/llimage | |
| parent | 8d5dab9f67d54ce20768c0ccda58f27693cb20c9 (diff) | |
#3809 Partial revert of "Fix J2C Upload"
This partially reverts commit 8d5dab9f67d54ce20768c0ccda58f27693cb20c9.
Apparently viewer doesn't support some jp2 variants, so I'm leaving only
the fix for bulk upload.
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llimagedimensionsinfo.cpp | 20 | ||||
| -rw-r--r-- | indra/llimage/llimagedimensionsinfo.h | 1 |
2 files changed, 0 insertions, 21 deletions
diff --git a/indra/llimage/llimagedimensionsinfo.cpp b/indra/llimage/llimagedimensionsinfo.cpp index 49a1777fe5..d4efbcfad2 100644 --- a/indra/llimage/llimagedimensionsinfo.cpp +++ b/indra/llimage/llimagedimensionsinfo.cpp @@ -27,7 +27,6 @@ #include "stdtypes.h" #include "llimagejpeg.h" -#include "llimagej2c.h" #include "llimagedimensionsinfo.h" @@ -64,8 +63,6 @@ bool LLImageDimensionsInfo::load(const std::string& src_filename,U32 codec) return getImageDimensionsTga(); case IMG_CODEC_JPEG: return getImageDimensionsJpeg(); - case IMG_CODEC_J2C: - return getImageDimensionsJ2c(); case IMG_CODEC_PNG: return getImageDimensionsPng(); default: @@ -217,23 +214,6 @@ bool LLImageDimensionsInfo::getImageDimensionsJpeg() return !sJpegErrorEncountered; } -bool LLImageDimensionsInfo::getImageDimensionsJ2c() -{ - clean(); - - LLPointer<LLImageJ2C> jpeg_image = new LLImageJ2C; - if (jpeg_image->load(mSrcFilename)) - { - mWidth = jpeg_image->getWidth(); - mHeight = jpeg_image->getHeight(); - return true; - } - mWarning = "texture_load_format_error"; - LL_WARNS() << "J2C load error: " << LLImage::getLastThreadError() << LL_ENDL; - - return false; -} - bool LLImageDimensionsInfo::checkFileLength(S32 min_len) { // Make sure the file is not shorter than min_len bytes. diff --git a/indra/llimage/llimagedimensionsinfo.h b/indra/llimage/llimagedimensionsinfo.h index 820cf33d7e..681d66ae4e 100644 --- a/indra/llimage/llimagedimensionsinfo.h +++ b/indra/llimage/llimagedimensionsinfo.h @@ -91,7 +91,6 @@ protected: bool getImageDimensionsTga(); bool getImageDimensionsPng(); bool getImageDimensionsJpeg(); - bool getImageDimensionsJ2c(); S32 read_s32() { |