livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACME-1343 : Reset the siz eof the preview texture to be the same as the saved snapshot

meow-7.2.2
Merov Linden 2014-03-04 14:01:47 -08:00
parent 013d72cc90
commit 3441d3403f
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llsnapshotlivepreview.cpp
View File

@ -621,19 +621,16 @@ LLViewerTexture* LLSnapshotLivePreview::getBigThumbnailImage()
LLPointer<LLImageRaw> raw = new LLImageRaw;
// The big thumbnail is be a subsampled version of the preview (used in SL Share previews, i.e. Flickr, Twitter, Facebook)
raw->resize( mPreviewImage->getWidth(),
mPreviewImage->getHeight(),
mPreviewImage->getComponents());
raw->copy(mPreviewImage);
// Scale to the big thumbnail size
if (!raw->scale(getBigThumbnailWidth(), getBigThumbnailHeight()))
{
raw = NULL ;
}
if (raw)
{
// The big thumbnail is a new filtered version of the preview (used in SL Share previews, i.e. Flickr, Twitter, Facebook)
mBigThumbnailWidth = mPreviewImage->getWidth();
mBigThumbnailHeight = mPreviewImage->getHeight();
raw->resize( mBigThumbnailWidth,
mBigThumbnailHeight,
mPreviewImage->getComponents());
raw->copy(mPreviewImage);
// Filter
// Note: filtering needs to be done *before* the scaling to power of 2 or the effect is distorted
if (getFilter() != "")

6
indra/newview/llsnapshotlivepreview.h
View File

@ -123,8 +123,8 @@ public:
LLViewerTexture* getBigThumbnailImage();
S32 getBigThumbnailWidth() const { return 3*mThumbnailWidth ; }
S32 getBigThumbnailHeight() const { return 3*mThumbnailHeight ; }
S32 getBigThumbnailWidth() const { return mBigThumbnailWidth ; }
S32 getBigThumbnailHeight() const { return mBigThumbnailHeight ; }
// Returns TRUE when snapshot generated, FALSE otherwise.
static BOOL onIdle( void* snapshot_preview );
@ -154,6 +154,8 @@ private:
BOOL mThumbnailSubsampled; // TRUE if the thumbnail is a subsampled version of the mPreviewImage
LLPointer<LLViewerTexture> mBigThumbnailImage ;
S32 mBigThumbnailWidth;
S32 mBigThumbnailHeight;
BOOL mBigThumbnailUpToDate;
S32 mCurImageIndex;