diff options
Diffstat (limited to 'indra/llimage/llimagedimensionsinfo.cpp')
-rw-r--r-- | indra/llimage/llimagedimensionsinfo.cpp | 20 |
1 files changed, 0 insertions, 20 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. |