scroggo
3965825b97
Check libpng directly into third_party/
...
With this change, the CMake build, which does not use DEPS to sync
external projects, is able to build and use the same version of libpng
that is used in other builds.
This will allow all platforms (including Google3 CMake build) to test on
the same version of libpng, so we do not need to make SkPngCodec support
all versions of libpng.
- Update CMakeLists.txt to use the checked in libpng.
- Check in libpng version 1.6.22rc01
- Update README.google
- Replace our old LICENSE file with the latest one from libpng
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2033063003
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review-Url: https://codereview.chromium.org/2033063003
2016-06-02 12:59:59 -07:00
halcanary
3d5942e8a4
gyp: clean up warnings with clang-3.8
...
Also: update zlib DEPS.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2002233002
Review-Url: https://codereview.chromium.org/2002233002
2016-05-23 14:02:54 -07:00
msarett
8fe89ab9b2
Update libpng to 1.6.22rc01
...
If there are no issues, this version will be released May 26.
Let's start testing with it, so we are ready to update Chrome when
it is available.
BUG=skia:4710
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1983853002
Review-Url: https://codereview.chromium.org/1983853002
2016-05-17 09:31:04 -07:00
halcanary
7a223f5825
DEPS: update icu + sfntly
...
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1960153002
Review-Url: https://codereview.chromium.org/1960153002
2016-05-09 08:00:26 -07:00
halcanary
00d44e014c
Start building HarfBuzz+Skia example
...
(prevent bitrot in example code)
tools/using_skia_and_harfbuzz.cpp was written by aam@:
https://github.com/aam/skiaex
update HarfBuzz to latest release: 1.2.7
BUG=skia:4742
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1940393002
Review-Url: https://codereview.chromium.org/1940393002
2016-05-03 15:09:52 -07:00
msarett
b917e04d51
Update libjpeg-turbo to 1.4.90
...
Google3, Chrome, and Android are considering updates. Let's start
testing Skia on the newest version.
https://critique.corp.google.com/#review/116667446
https://codereview.chromium.org/1934113002
https://buganizer.corp.google.com/u/0/issues/28268702
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1940903002
Committed: https://skia.googlesource.com/skia/+/3994c161ec5a2b83e8f6bab4d9c469eec2668d92
Review-Url: https://codereview.chromium.org/1940903002
2016-05-02 10:43:22 -07:00
msarett
a13efa6906
Revert of Update libjpeg-turbo to 1.4.90 (patchset #1 id:20001 of https://codereview.chromium.org/1940903002/ )
...
Reason for revert:
Clang wants "strbeq" and gcc wants "streqb". Uggh.
https://build.chromium.org/p/client.skia.compile/builders/Build-Mac-Clang-Arm7-Debug-Android/builds/1766/steps/compile_skia%20on%20Mac/logs/stdio
Original issue's description:
> Update libjpeg-turbo to 1.4.90
>
> Google3, Chrome, and Android are considering updates. Let's start
> testing Skia on the newest version.
> https://critique.corp.google.com/#review/116667446
> https://codereview.chromium.org/1934113002
> https://buganizer.corp.google.com/u/0/issues/28268702
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1940903002
>
> Committed: https://skia.googlesource.com/skia/+/3994c161ec5a2b83e8f6bab4d9c469eec2668d92
TBR=scroggo@google.com ,djsollen@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/1937143002
2016-05-02 09:14:23 -07:00
msarett
3994c161ec
Update libjpeg-turbo to 1.4.90
...
Google3, Chrome, and Android are considering updates. Let's start
testing Skia on the newest version.
https://critique.corp.google.com/#review/116667446
https://codereview.chromium.org/1934113002
https://buganizer.corp.google.com/u/0/issues/28268702
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1940903002
Review-Url: https://codereview.chromium.org/1940903002
2016-05-02 07:48:59 -07:00
borenet
43bf511ead
Delete ChromeOS code
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1926163002
Review-Url: https://codereview.chromium.org/1926163002
2016-04-29 14:01:34 -07:00
djsollen
affacce4c6
Require Android SDK copy of CMake to build Vulkan on Android.
...
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1930423002
Review-Url: https://codereview.chromium.org/1930423002
2016-04-29 08:09:43 -07:00
yujieqin
97920b4092
Update DNG SDK version
...
* Add PATENTS file
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1897773003
Review URL: https://codereview.chromium.org/1897773003
2016-04-24 08:14:57 -07:00
djsollen
12d62a7d51
VulkanViewer on Android
...
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1903253003
Review URL: https://codereview.chromium.org/1903253003
2016-04-21 07:59:44 -07:00
egdaniel
cd07bedbe6
Update to ToT shaderc
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1898863002
Review URL: https://codereview.chromium.org/1898863002
2016-04-18 13:42:02 -07:00
mtklein
fbcfd6d060
mojo -> nojo
...
BUG=skia:4891
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1889543003
Review URL: https://codereview.chromium.org/1889543003
2016-04-14 09:42:34 -07:00
yujieqin
e34635dee1
Since PIEX can now return an uncompressed RGB thumbnail, check the type of the image before treating it as a JPEG.
...
Highlights of new PIEX:
* PIEX can now return JPEG compressed image or uncompressed RGB image
* Add IsOfType() and GEtNumberofBytesForIsOfType() to image_type_recognition_lite
* Add GetDngInformation() and GetOrientation() to piex
* Remove deprecated data entries from piex_types
BUG=b/27214608, b/28119810
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1883783002
Review URL: https://codereview.chromium.org/1883783002
2016-04-14 07:04:00 -07:00
yujieqin
4334ff29b4
Enable RAW codec for Windows
...
BUG=skia:4890 b/26973157
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1853093002
Review URL: https://codereview.chromium.org/1853093002
2016-04-06 06:47:15 -07:00
mtklein
77304a5b76
Get back on mainline libpng 1.6 now that 3bpp perf patches are merged.
...
Checked manually in Instruments that we're still running our SSE filters for both RGB and RGBA PNGs.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1865633002
Review URL: https://codereview.chromium.org/1865633002
2016-04-05 13:46:00 -07:00
mtklein
c19201f315
Roll up to use >=4.
...
d0513638e7
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1854293002
Review URL: https://codereview.chromium.org/1854293002
2016-04-04 13:48:41 -07:00
mtklein
85ad730113
Point libpng at upstream libpng 1.6 + my new perf patch.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852363002
Review URL: https://codereview.chromium.org/1852363002
2016-04-04 12:08:46 -07:00
egdaniel
b90e67f8ea
Update shaderc to ToT.
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1847643002
Review URL: https://codereview.chromium.org/1847643002
2016-03-31 06:16:32 -07:00
yujieqin
246723f7e7
Update to new DNG SDK: Integrate integer overflow fixes
...
BUG=b/26535130
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1801063002
Review URL: https://codereview.chromium.org/1801063002
2016-03-16 05:57:38 -07:00
msarett
6b563156eb
Update libjpeg-turbo with security fixes from upstream
...
This includes:
0463f7c9aa
a572622dd6
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789693002
Review URL: https://codereview.chromium.org/1789693002
2016-03-11 09:24:21 -08:00
borenet
51b56c9041
Move llvm from deps to deps_os
...
Re-upload of https://codereview.chromium.org/1721943003/
TBR=bsalomon
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1782793003
Review URL: https://codereview.chromium.org/1782793003
2016-03-10 05:49:48 -08:00
yujieqin
412f534563
Update DNG SDK version.
...
* Integrate integer overflow changes from security branch
BUG=b/26535130
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004
Committed: https://skia.googlesource.com/skia/+/be2924ad17d47f4ed49666894d87571a28f89567
Committed: https://skia.googlesource.com/skia/+/62c0f75159674087079140e09ef1396316577754
Review URL: https://codereview.chromium.org/1748363004
2016-03-08 11:47:31 -08:00
bsalomon
de7bbab699
Pull and build shaderc rather than use checked in lib/header
...
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1760493003
Committed: https://skia.googlesource.com/skia/+/7d4490ecfa4d974003f675ef004e77f85ecfadd2
Review URL: https://codereview.chromium.org/1760493003
2016-03-03 15:43:04 -08:00
yujieqin
99354b81c3
Revert of Update DNG SDK version. (patchset #4 id:60001 of https://codereview.chromium.org/1748363004/ )
...
Reason for revert:
Sorry for breaking the build again...
Original issue's description:
> Update DNG SDK version.
>
> * Integrate integer overflow changes from security branch
>
> BUG=b/26535130
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004
>
> Committed: https://skia.googlesource.com/skia/+/be2924ad17d47f4ed49666894d87571a28f89567
>
> Committed: https://skia.googlesource.com/skia/+/62c0f75159674087079140e09ef1396316577754
TBR=msarett@google.com ,scroggo@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=b/26535130
Review URL: https://codereview.chromium.org/1755283004
2016-03-03 06:56:19 -08:00
yujieqin
62c0f75159
Update DNG SDK version.
...
* Integrate integer overflow changes from security branch
BUG=b/26535130
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004
Committed: https://skia.googlesource.com/skia/+/be2924ad17d47f4ed49666894d87571a28f89567
Review URL: https://codereview.chromium.org/1748363004
2016-03-03 06:41:48 -08:00
Eric Boren
b5f0d40935
Revert "Pull and build shaderc rather than use checked in lib/header"
...
This reverts commit 7d4490ecfa
.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1757253002
Review URL: https://codereview.chromium.org/1757253002 .
2016-03-03 08:01:33 -05:00
bsalomon
7d4490ecfa
Pull and build shaderc rather than use checked in lib/header
...
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1760493003
Review URL: https://codereview.chromium.org/1760493003
2016-03-02 15:59:24 -08:00
yujieqin
62c9c4ba61
Revert of Update DNG SDK version. (patchset #3 id:40001 of https://codereview.chromium.org/1748363004/ )
...
Reason for revert:
This breaks the ChromeOS build. E.g. https://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Release-CrOS_Link/builds/5215/steps/build%20most/logs/stdio
Original issue's description:
> Update DNG SDK version.
>
> * Integrate integer overflow changes from security branch
>
> BUG=b/26535130
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004
>
> Committed: https://skia.googlesource.com/skia/+/be2924ad17d47f4ed49666894d87571a28f89567
TBR=msarett@google.com ,scroggo@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=b/26535130
Review URL: https://codereview.chromium.org/1755743003
2016-03-02 04:57:09 -08:00
yujieqin
be2924ad17
Update DNG SDK version.
...
* Integrate integer overflow changes from security branch
BUG=b/26535130
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1748363004
Review URL: https://codereview.chromium.org/1748363004
2016-03-02 03:30:38 -08:00
yujieqin
cf16e67f84
Update PIEX: Prepares support for uncompressed thumbnails
...
The new version of PIEX added new API for adding support to thumbnails. It also marks some old API as deprecate.
BUG=b/26894354
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1723123002
Review URL: https://codereview.chromium.org/1723123002
2016-02-23 06:18:14 -08:00
msarett
91c22b2ea6
Use new jpeg_crop_scanlines() API to optimize jpeg subset decodes
...
This was adapted from:
https://codereview.chromium.org/1530933003
Subset Decode Runtime (Original / Optimized) on Nexus 6P
TopLeft 0.51x
TopRight 0.56x
Middle 0.71x
BottomLeft 0.79x
BottomRight 0.79x
BUG=skia:4256
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1719073002
Review URL: https://codereview.chromium.org/1719073002
2016-02-22 12:27:46 -08:00
msarett
740668d907
Update libpng to 1.6.22beta
...
Intel SSE filter optimizations have been upstreamed. Let's test on
the upstream version (which we can use in Android).
BUG=skia:4573
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1710083007
Review URL: https://codereview.chromium.org/1710083007
2016-02-19 11:14:43 -08:00
scroggo
77b798ce8e
Update the version of libpng used by Skia tests
...
The version of libpng we were using has some security vulnerabilities.
Update to a newer version - 1.6.20 (047737496a
/).
Update pnglibconf.h. The new version is a copy of the newer version of
the file, with our /* custom settings */ tacked onto the end. (The
custom settings are unchanged from the last version.)
Update the LICENSE. The new version is a copy of the LICENSE that
libpng now includes as a separate file.
Update the README file to reflect the change in source of the LICENSE
file.
BUG=skia:4573
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1453373003
Review URL: https://codereview.chromium.org/1453373003
2016-02-19 06:33:07 -08:00
yujieqin
879adccf60
Update PIEX version. This should solve the stack buffer overflow issue
...
BUG=skia:4902
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1690853003
Review URL: https://codereview.chromium.org/1690853003
2016-02-17 06:12:12 -08:00
mtklein
0da8537555
MSAN: build libc++ with MSAN, link to it.
...
The errors that we see should now change to the unexplainable,
rather than the explainable errors at head.
We suspect that the original reason to blacklist was this,
not building libc++ with MSAN. So unblacklist everything to start fresh.
BUG=skia:4903,skia:4900
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1694353004
Review URL: https://codereview.chromium.org/1694353004
2016-02-16 14:03:15 -08:00
msarett
dae774eff4
Sync DEPS to clang compatible arm v8 assembly for libjpeg-turbo
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1697623002
Review URL: https://codereview.chromium.org/1697623002
2016-02-12 13:06:30 -08:00
mtklein
c089ba5d69
followups
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1693823005
Review URL: https://codereview.chromium.org/1693823005
2016-02-12 12:58:10 -08:00
mtklein
013475a272
Put all XSAN bots on the same DEPS-sourced build of Clang.
...
This adds LLVM, Clang, and compiler-rt (*san tools) to DEPS,
then uses them from xsan_build, building them if needed.
This is similar to how the CMake bots bootstrap CMake if needed.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1693733003
Review URL: https://codereview.chromium.org/1693733003
2016-02-12 12:15:23 -08:00
mtklein
4e79f33452
msan: build expat from source
...
This should let us test it on the MSAN bot.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1674053002
CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot
Review URL: https://codereview.chromium.org/1674053002
2016-02-07 13:31:23 -08:00
halcanary
7a76f9c8f4
SkMojo: test linking Skia against the Mojo SDK
...
TODO: build on systems other than Linux.
Add mojo_skd to the DEPS.
Add a DM::Via called `mojo-`.
everything is hidden behind the gyp variable `skia_mojo`.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1644043003
Review URL: https://codereview.chromium.org/1644043003
2016-02-03 11:53:19 -08:00
bungeman
84de5c86f9
Roll third_party/externals/gyp 08429da795..87ac4d0e63fc (63 commits).
...
08429da795..87ac4d0e63
This is primarily to pick up changes to the CMake generator for Mac.
Review URL: https://codereview.chromium.org/1669503003
2016-02-03 11:25:26 -08:00
yujieqin
8f9447cf60
Update the dng_sdk version. The new version handles the posix_memalign() better
...
Remove the '-DNO_POSIX_MEMALIGN'
With this change, most new Android (API>=17) should be able to use posix_memalign()
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1655933002
Review URL: https://codereview.chromium.org/1655933002
2016-02-03 00:50:10 -08:00
yujieqin
076d83d09a
Enable RAW codec for Windows
...
* Use new DNG SDK version from ASOP, which fixed some build issues.
* Fix SkRawCodec.
* Fix gyp files.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1641533004
Review URL: https://codereview.chromium.org/1641533004
2016-01-27 08:25:53 -08:00
yujieqin
8f5175842d
Update DEPS to use new PIEX version from AOSP.
...
Highlight:
* Better support for reading GPS tags
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1646433003
Review URL: https://codereview.chromium.org/1646433003
2016-01-27 07:32:43 -08:00
yujieqin
916de9ff18
Add RAW decoding into Skia.
...
TBR=reed@google.com
BUG=skia:
(Based on the work from ebrauer in https://codereview.chromium.org/1459473007 )
(Based on the work from adaubert in https://codereview.chromium.org/1494003003 )
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1520403003
Committed: https://skia.googlesource.com/skia/+/6bd8639f8c142eedf543f4e5f3b02d2bf11df308
Review URL: https://codereview.chromium.org/1520403003
2016-01-25 08:26:16 -08:00
msarett
c85a9fde77
Revert of Prototype of RAW decoding in Skia. (patchset #32 id:610001 of https://codereview.chromium.org/1520403003/ )
...
Reason for revert:
A few build failures on Chrome OS/Android.
Original issue's description:
> Add RAW decoding into Skia.
>
> TBR=reed@google.com
>
> BUG=skia:
>
> (Based on the work from ebrauer in https://codereview.chromium.org/1459473007 )
> (Based on the work from adaubert in https://codereview.chromium.org/1494003003 )
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1520403003
>
> Committed: https://skia.googlesource.com/skia/+/6bd8639f8c142eedf543f4e5f3b02d2bf11df308
TBR=scroggo@google.com ,adaubert@google.com,yujieqin@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1635443002
2016-01-25 06:05:19 -08:00
yujieqin
6bd8639f8c
Add RAW decoding into Skia.
...
TBR=reed@google.com
BUG=skia:
(Based on the work from ebrauer in https://codereview.chromium.org/1459473007 )
(Based on the work from adaubert in https://codereview.chromium.org/1494003003 )
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1520403003
Review URL: https://codereview.chromium.org/1520403003
2016-01-25 05:29:03 -08:00
joshualitt
e36d40e7fd
Update deps to pull microhttpd
...
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1620813004
Review URL: https://codereview.chromium.org/1620813004
2016-01-22 11:17:46 -08:00