diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-16 15:20:53 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-16 15:20:53 -0800 |
| commit | 798d62a467035e255ef172e0be1f707ba15f5d04 (patch) | |
| tree | 6f82982afffb0f3ed44176456671468ae9e53c97 /indra | |
| parent | 4745ab85dab9e418c49e5c4a722aa88548b8f39e (diff) | |
ACME-1233 : Avoid iteration on the quality setting and make it more consistent
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterfacebook.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/indra/newview/llfloaterfacebook.cpp b/indra/newview/llfloaterfacebook.cpp index 09cc14f6db..7bf74ef6ba 100644 --- a/indra/newview/llfloaterfacebook.cpp +++ b/indra/newview/llfloaterfacebook.cpp @@ -62,9 +62,6 @@ const std::string DEFAULT_PHOTO_QUERY_PARAMETERS = "?sourceid=slshare_photo&utm_ const S32 MAX_QUALITY = 100; // Max quality value for jpeg images const S32 MIN_QUALITY = 0; // Min quality value for jpeg images const S32 TARGET_DATA_SIZE = 95000; // Size of the image (compressed) we're trying to send to Facebook -const S32 MAX_DATA_SIZE = 98000; // Max size of the image (compressed) sent to Facebook -const S32 QUALITY_DECREMENT = 5; // Value we use to ratchet the quality down if we're over MAX_DATA_SIZE - std::string get_map_url() { @@ -416,11 +413,6 @@ void LLFacebookPhotoPanel::updateControls() if (got_snap) { LLResMgr::getInstance()->getIntegerString(bytes_string, (previewp->getDataSize()) >> 10 ); - if (previewp->getDataSize() >= MAX_DATA_SIZE) - { - // If size too big, change mQuality - mQuality -= QUALITY_DECREMENT; - } } //getChild<LLUICtrl>("file_size_label")->setTextArg("[SIZE]", got_snap ? bytes_string : getString("unknown")); <---uses localized string @@ -467,11 +459,9 @@ void LLFacebookPhotoPanel::updateResolution(BOOL do_update) checkAspectRatio(width); previewp->getSize(width, height); - if (do_update || (mQuality == MAX_QUALITY)) - { - // Recompute quality setting if the update is requested by the UI or if quality has been reset - mQuality = compute_jpeg_quality(width, height); - } + + // Recompute quality setting + mQuality = compute_jpeg_quality(width, height); bool quality_reset = previewp->setSnapshotQuality(mQuality, false); if (original_width != width || original_height != height || quality_reset) |