Add support for uploading JP2 files.
Recognizes .jp2, .j2c and .j2k extensions. Adds image/jp2 files to file picker image filter (windows and Mac, windows apparently already showed them). Show preview for jpeg 2000 files. Fixes error reporting for failed image uploads. Enforces a power-of-two size for jpeg 2000 files (seemed to make sense to do that).
This commit is contained in:
@@ -38,6 +38,7 @@
|
||||
#include "llimagetga.h"
|
||||
#include "llimagejpeg.h"
|
||||
#include "llimagepng.h"
|
||||
#include "llimagej2c.h"
|
||||
|
||||
#include "llagent.h"
|
||||
#include "llbutton.h"
|
||||
@@ -423,6 +424,21 @@ bool LLFloaterImagePreview::loadImage(const std::string& src_filename)
|
||||
}
|
||||
}
|
||||
break;
|
||||
case IMG_CODEC_J2C:
|
||||
{
|
||||
LLPointer<LLImageJ2C> j2c_image = new LLImageJ2C;
|
||||
|
||||
if (!j2c_image->load(src_filename))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!j2c_image->decode(raw_image, 0.0f))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user