100aa4b79e
Merge
2016-09-16 14:59:52 -07:00
8c86c594be
paren fix
2016-09-06 11:01:02 -04:00
53f9fbcfb7
add run time error checking to LLImageRaw::scale
2016-09-06 09:11:10 -04:00
5e02d304f0
MAINT-6618 More checks
2016-08-09 19:26:30 +03:00
d4b1db277c
MAINT-6618 Fixed the crash in LLImageRaw::scale() + some additional checks
2016-08-09 05:07:39 +03:00
2339e759fc
MAINT-4327/MAINT-6584 Supress the crash on memory allocation error when decoding J2C images
2016-07-27 05:49:07 +03:00
acdb050ce5
MAINT-6584: Convert LLImage class hierarchy to standard 'bool'
...
instead of legacy BOOL.
2016-07-22 11:35:23 -04:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
c3affc4d6b
Hotfix for build on OSX with -Werror,-Wtautological-compare
2015-05-05 21:05:13 +03:00
bb87365c37
Merge viewer-release, become version 3.7.29
2015-04-28 13:36:35 +03:00
5c6cf3e7fb
restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes
2015-04-10 11:02:37 -04:00
8b42c7898e
replace llifstream and llofstream with std::ifstream and std::ofstream respectively
2015-04-07 17:59:28 -04:00
3a57b18896
convert llifstream and llofstream to std::ifstream and std::ofstream respectively
2015-04-07 17:28:05 -04:00
a7530cb3fa
MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no apparent reason
...
Linux & OS X compile error fix
2015-02-23 14:06:42 +02:00
ef67802a19
Backed out changeset: 81b8de17a195
2015-02-23 14:03:07 +02:00
6926a6977d
MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no apparent reason
...
Linux & OS X compile error fix
2015-02-23 13:14:25 +02:00
32bb73eff4
Backed out changeset: 4c24cfce033a
2015-02-23 13:11:34 +02:00
59fb68799c
MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no apparent reason
...
Linux & OS X compile error fix
2015-02-23 12:45:28 +02:00
8c819b6980
MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no apparent reason
2015-02-20 01:32:24 +02:00
4042617479
MAINT-4329 Backed out changeset: fd3a4d5c2cf5
2015-02-13 20:05:48 +02:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
41170b5603
MAINT-4329 FIXED scales each image *twice* for no apparent reason : patchset #2
2014-09-25 21:19:17 +03:00
8dae4bc222
Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors
2014-05-06 18:21:04 -07:00
6bf3cb875c
ACME-1195 : WIP : Lazy evaluate intermediate images in snapshot preview so perf is better in common cases, allow thumbnail to be computed from grabed frame (for SL Share), thumbnail display still buggy in SL Share
2014-01-28 10:19:57 -08:00
4b2e69d8e0
ACME-1236 : Clean up llimage after refactoring so there's no difference with viewer-release
2014-01-15 10:27:49 -08:00
7cc64a09a3
ACME-1236 : Refactor filters and vignette into llimagefilter, add example filters to llimage_libtest
2014-01-14 21:01:51 -08:00
0c7cab771c
ACME-1236 : Add lines as a new type of vignette and Brightscan as an example
2014-01-09 21:58:30 -08:00
70b877da0e
Fix ambiguous pow call (use powf) instead
2014-01-08 21:19:21 -08:00
3161d822ab
ACME-1236 : WIP : Added mode and angle parameter to filterScreen (renamed for consistency)
2014-01-08 15:41:42 -08:00
c2a974f155
ACME-1236 : WIP : Introduced screenFilter, simple creative screening filter
2014-01-07 22:10:23 -08:00
3cbd0dfd84
ACME-1236 : WIP : Make each color correct filter use a per channel alpha argument, tweak Instagram-like test filters for discussion
2014-01-06 14:46:52 -08:00
90cbda6db0
ACME-1236 : WIP : Add 2 new color correction filters. Add a la Instagram composite filters for testing in llimage_libtest
2014-01-03 17:31:04 -08:00
35e30759c8
ACME-1236 : WIP : Added a min value to vignette
2014-01-03 15:44:29 -08:00
1b5fb66292
ACME-1236 : WIP : Added the vignette mode. Can be applied to colorCorrect and color Transform. Added new -v argument to llimage_libtest
2014-01-03 14:19:29 -08:00
d28b92744e
ACME-1236 : WIP : added all the color correction filters: colorize, linarize, equalize, contrast, brightness
2014-01-02 16:14:38 -08:00
205a4e3dc6
ACME-1236 : WIP : add filterGamma, computeHistograms, colorCorrect, implemented filter gamma to llimage_libtest for testing
2014-01-01 19:42:10 -08:00
9dca514c0b
ACME-1236 : WIP : add filterRotate to rotate hue, add rotate as a valid argument to --filter in llimage_libtest
2014-01-01 17:58:52 -08:00
08a798bb1d
ACME-1236 : WIP : Implement saturation/desaturation transform filter, add it to llimage_libtest for testing
2013-12-30 20:33:33 -08:00
7372afaae4
ACME-1236 : WIP : Implement colorTransform filter, grayscale and sepia using it, add parameter to llimage_libtest to use filters
2013-12-20 13:49:20 -08:00
6578144b7e
ACME-1236 : WIP : Added Gray Scale as an experimental filter in Flickr. Lots of ugly hacks for now
2013-12-18 15:55:13 -08:00
12f0f8cb72
changed over to manual naming of MemTrackable stats
...
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -07:00
053d97db1b
better memory usage for LLTrace (tighter packing of recording arrays)
...
removed complicated and unnecessary fast timer gapless handoff logic (it should be gapless anyway)
improved MemTrackable API, better separation of shadow and footprint
added memory usage stats to floater_stats.xml
2013-09-25 19:12:35 -07:00
0dfc08d22a
BUILDFIX: more bad merge stuff
...
also added ability for statbar to show memtrackable info
2013-09-19 15:21:46 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
075a7bcc98
SH-4297 WIP interesting: viewer-interesting starts loading cached scene late
...
dependency cleanup - removed a lot of unecessary includes
2013-07-18 15:09:45 -07:00
8208a40412
BUILDFIX: reverted changes that attempted to automate mem track
...
stat definition as they don't work on gcc/clang
2013-07-01 18:50:51 -07:00
04bdc8ba83
SH-4294 FIX Interesting: Statistics Texture cache hit rate is always 0%
...
also, removed LLTrace::init and cleanup
removed derived class implementation of memory stat for LLMemTrackable
is automatic now
2013-07-01 17:04:01 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
Rider Linden