Commit Graph

12175 Commits

Author SHA1 Message Date
commit-bot@chromium.org
212b211ce8 Update expectations for etc1bitmap
R=robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/300063007

git-svn-id: http://skia.googlecode.com/svn/trunk@14893 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-27 15:04:57 +00:00
commit-bot@chromium.org
81da061f72 Implement sk_atomic_conditional_inc with sk_atomic_cas.
Now that we have sk_atomic_cas, we can replace all the platform-specific CAS loops with one.

BUG=skia:
R=bungeman@google.com, mtklein@google.com, reed@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/300553003

git-svn-id: http://skia.googlecode.com/svn/trunk@14892 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-27 15:00:32 +00:00
commit-bot@chromium.org
29239a0f4b Move SkDecodingImageGenerator.h to include/
This will allow Android to access it and remove SkImageRef.

Depends on https://codereview.chromium.org/293283002/

BUG=skia:2389
R=reed@google.com, djsollen@google.com, halcanary@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/228613003

git-svn-id: http://skia.googlecode.com/svn/trunk@14891 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-27 14:59:47 +00:00
commit-bot@chromium.org
c2dbbb6ac2 Add OpenGL Compressed Texture enum values
R=bsalomon@google.com, robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/293263004

git-svn-id: http://skia.googlecode.com/svn/trunk@14890 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-27 14:35:25 +00:00
commit-bot@chromium.org
2d970b5128 hide discardable factory from public imagegenerator api
BUG=skia:
R=halcanary@google.com, scroggo@google.com, djsollen@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/295243006

git-svn-id: http://skia.googlecode.com/svn/trunk@14889 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-27 14:14:22 +00:00
commit-bot@chromium.org
851155c28e remove SK_SUPPORT_LEGACY_BITMAPFLATTEN code
BUG=skia:
R=scroggo@google.com, reed@google.com

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/303563002

git-svn-id: http://skia.googlecode.com/svn/trunk@14888 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-27 14:03:51 +00:00
commit-bot@chromium.org
067fe48266 Adding new filters to fuzzer
New image filters were added since the last time I worked on the fuzzer, so I added them to the fuzzer. Same changes will be made to the clusterfuzz fuzzer.

BUG=skia:
R=bsalomon@google.com

Author: sugoi@chromium.org

Review URL: https://codereview.chromium.org/300153002

git-svn-id: http://skia.googlecode.com/svn/trunk@14887 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-27 13:52:51 +00:00
commit-bot@chromium.org
b0c769abe1 sk_memcpy32 should fall back on libc memcpy.
Writing it out ourselves was a ~2x slowdown on ARM.

BUG=skia:
R=henrik.smiding@intel.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/292663013

git-svn-id: http://skia.googlecode.com/svn/trunk@14886 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-27 12:45:42 +00:00
commit-bot@chromium.org
53c63a5136 remove SK_SUPPORT_LEGACY_BUILDMIPMAP
TBR=scroggo

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/293393007

git-svn-id: http://skia.googlecode.com/svn/trunk@14885 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-27 00:23:36 +00:00
skia.committer@gmail.com
3c134a97ed Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14884 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-24 03:05:26 +00:00
commit-bot@chromium.org
5e565d1140 Revert of Add compressed texture capabilities for GPU devices (https://codereview.chromium.org/292323003/)
Reason for revert:
Signeness comparison breaks build. After working some more, I think the API design will be cleaner without the Uncompressed enum, so I'm removing it and retesting everything.

Original issue's description:
> Add compressed texture capabilities for GPU devices
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=14880

R=bsalomon@google.com, robertphillips@google.com, halcanary@google.com
TBR=bsalomon@google.com, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/296313003

git-svn-id: http://skia.googlecode.com/svn/trunk@14883 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 20:40:26 +00:00
commit-bot@chromium.org
e5a8e66668 move ashmem switching logic to SkDiscardableMemory::Create
R=scroggo@google.com, reed@google.com

Author: halcanary@google.com

Review URL: https://codereview.chromium.org/293283002

git-svn-id: http://skia.googlecode.com/svn/trunk@14882 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 20:25:15 +00:00
commit-bot@chromium.org
4c4506441c Change the PKM decoder to adhere to sampler size
This fixes a bug where the red and blue channels seemed to be swapped on some platforms after decoding, and brings it more in line with the logic already in libbmp.

BUG=skia:
R=halcanary@google.com, robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/297853005

git-svn-id: http://skia.googlecode.com/svn/trunk@14881 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 20:00:59 +00:00
commit-bot@chromium.org
2dcd24375b Add compressed texture capabilities for GPU devices
BUG=skia:
R=bsalomon@google.com, robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/292323003

git-svn-id: http://skia.googlecode.com/svn/trunk@14880 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 20:00:54 +00:00
commit-bot@chromium.org
778873acdb rather than committing new unreviewed expectations, just ignore the failures
This way, subsequent runs of the bots will try to re-upload the image file.  (They don't try to upload images for passing tests.)

BUG=skia:2603
NOTREECHECKS=True
NOTRY=True
R=fmalita@google.com
TBR=fmalita

Author: epoger@google.com

Review URL: https://codereview.chromium.org/297853007

git-svn-id: http://skia.googlecode.com/svn/trunk@14879 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 19:22:13 +00:00
commit-bot@chromium.org
f21991b104 Revert of Modify sample buffer size for larger displays. (https://codereview.chromium.org/240433002/)
Reason for revert:
This also changes verylargebitmap, and the difference appears to be meaningful. Henrik, I have emailed you the images that differ.

Original issue's description:
> Modify sample buffer size for larger displays.
>
> Increases the intermediate buffer size for sample pixel indexes,
> used in the sample proc function calls. If the operation is bigger
> than the buffer it's split into multiple calls, creating overhead.
> This would especially impact the performance of SIMD optimizations.
> Also, aligns the start address of the buffer to 16 bytes, to enable
> more efficient SIMD optimizations.
>
> Author: henrik.smiding@intel.com
>
> Signed-off-by: Henrik Smiding <henrik.smiding@intel.com>
>
> Committed: http://code.google.com/p/skia/source/detail?r=14825
>
> Committed: http://code.google.com/p/skia/source/detail?r=14872

R=reed@google.com, mtklein@google.com, tomhudson@google.com, djsollen@google.com, joakim.landberg@intel.com, bsalomon@chromium.org, bsalomon@google.com, henrik.smiding@intel.com
TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/294023016

git-svn-id: http://skia.googlecode.com/svn/trunk@14878 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 19:13:56 +00:00
commit-bot@chromium.org
334ec00234 Revert of Suppress more GMs pending rebaseline after 0533146d00 (https://codereview.chromium.org/296173009/)
Reason for revert:
The CL for which these were added needs to be reverted. The best example of its breakage is in verylargebitmap.

Original issue's description:
> Suppress more GMs pending rebaseline after 0533146d00
>
> TBR=scroggo@google.com
>
> Committed: https://code.google.com/p/skia/source/detail?r=14874

R=fmalita@chromium.org
TBR=fmalita@chromium.org
NOTREECHECKS=true
NOTRY=true

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/298973008

git-svn-id: http://skia.googlecode.com/svn/trunk@14877 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 19:09:46 +00:00
commit-bot@chromium.org
446aefe2af instead of ignoring testimagefilters EVERYWHERE, just ignore particular failures
BUG=skia:2603
NOTREECHECKS=True
NOTRY=True
R=fmalita@google.com
TBR=fmalita

Author: epoger@google.com

Review URL: https://codereview.chromium.org/296213009

git-svn-id: http://skia.googlecode.com/svn/trunk@14876 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 19:08:17 +00:00
fmalita@google.com
720b703ee7 Suppress testimagefilters GM.
Failing on Android, but results missing.

BUG=skia:2603
TBR=epoger@google.com

Review URL: https://codereview.chromium.org/299143006

git-svn-id: http://skia.googlecode.com/svn/trunk@14875 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 18:44:21 +00:00
fmalita@google.com
af6d1701f9 Suppress more GMs pending rebaseline after 0533146d00
TBR=scroggo@google.com

Review URL: https://codereview.chromium.org/296173009

git-svn-id: http://skia.googlecode.com/svn/trunk@14874 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 18:34:18 +00:00
commit-bot@chromium.org
08f4f90aad manual bench rebase after f757fd3
R=robertphillips@google.com
TBR=robertphillips@google.com

Bypassing trybots:
NOTRY=true

Author: fmalita@chromium.org

Review URL: https://codereview.chromium.org/293093007

git-svn-id: http://skia.googlecode.com/svn/trunk@14873 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 16:26:57 +00:00
commit-bot@chromium.org
0533146d00 Modify sample buffer size for larger displays.
Increases the intermediate buffer size for sample pixel indexes,
used in the sample proc function calls. If the operation is bigger
than the buffer it's split into multiple calls, creating overhead.
This would especially impact the performance of SIMD optimizations.
Also, aligns the start address of the buffer to 16 bytes, to enable
more efficient SIMD optimizations.

Author: henrik.smiding@intel.com

Signed-off-by: Henrik Smiding <henrik.smiding@intel.com>

Committed: http://code.google.com/p/skia/source/detail?r=14825

R=reed@google.com, mtklein@google.com, tomhudson@google.com, djsollen@google.com, joakim.landberg@intel.com, scroggo@google.com, bsalomon@chromium.org, bsalomon@google.com

Author: henrik.smiding@intel.com

Review URL: https://codereview.chromium.org/240433002

git-svn-id: http://skia.googlecode.com/svn/trunk@14872 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 16:05:43 +00:00
commit-bot@chromium.org
a3746a0f41 (bad) rebaselines for shader change
TBR=halcanary
NOTRY=True

Author: reed@google.com

Review URL: https://codereview.chromium.org/296983013

git-svn-id: http://skia.googlecode.com/svn/trunk@14871 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 16:01:31 +00:00
commit-bot@chromium.org
4bdb2415ff Adds more bots for bench alerts.
Bypassing trybots:
NOTRY=true
R=borenet@google.com

Author: bensong@google.com

Review URL: https://codereview.chromium.org/291343008

git-svn-id: http://skia.googlecode.com/svn/trunk@14870 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 16:01:09 +00:00
commit-bot@chromium.org
41e2ff2bff fix bench rebase tool to cope with wider range of bots.
BUG=skia:2373
R=kelvinly@google.com
TBR=kelvinly@google.com
NOTRY=true

Author: bensong@google.com

Review URL: https://codereview.chromium.org/292623005

git-svn-id: http://skia.googlecode.com/svn/trunk@14869 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 15:31:02 +00:00
commit-bot@chromium.org
f757fd3238 rebaseline after unitmapper shader change
TBR=epoger
NOTRY=True

Author: reed@google.com

Review URL: https://codereview.chromium.org/294973012

git-svn-id: http://skia.googlecode.com/svn/trunk@14868 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 13:55:44 +00:00
commit-bot@chromium.org
968edcafa6 stop calling SkBitmap::flatten
BUG=skia:
R=scroggo@google.com, halcanary@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/295793002

git-svn-id: http://skia.googlecode.com/svn/trunk@14867 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 13:21:55 +00:00
commit-bot@chromium.org
5f640a30b9 Adds angle to bench expectation configs.
BUG=skia:2576
R=robertphillips@google.com
TBR=robertphillips@google.com
NOTRY=true

Author: bensong@google.com

Review URL: https://codereview.chromium.org/293033013

git-svn-id: http://skia.googlecode.com/svn/trunk@14866 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 13:05:33 +00:00
commit-bot@chromium.org
4e82cdb90a fix stroking large drawPosText
BUG=skia:
R=bungeman@google.com, yunchao.he@intel.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/288983004

git-svn-id: http://skia.googlecode.com/svn/trunk@14865 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 12:32:23 +00:00
commit-bot@chromium.org
368bc6cf8b manual bench rebase after 7693dbf
R=robertphillips@google.com
TBR=robertphillips@google.com

Bypassing trybots:
NOTRY=true

Author: bensong@google.com

Review URL: https://codereview.chromium.org/297943002

git-svn-id: http://skia.googlecode.com/svn/trunk@14864 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 11:51:16 +00:00
commit-bot@chromium.org
c93e68161f fix the visual diff of raster vs gpu -- vertices_80. The sw-raster is correct, all images are blurry.
While some images generated by gpu doesn't respect SkPaint's alpha value.

In gpu path, when pass SkPaint's alpha and color to GrPaint by SkPaint2GrPaintNoShader,
either alpha or colors can't not be passed. We can't pass both of them by the API.
Premultiply paint's alpha to colors's alpha in drawVertices, and pass colors to GrPaint.
The rendering result will respect colors in drawVertices, and the alpha value set in SkPaint as well.

BUG=skia:2592
R=bsalomon@google.com

Author: yunchao.he@intel.com

Review URL: https://codereview.chromium.org/292943002

git-svn-id: http://skia.googlecode.com/svn/trunk@14863 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 08:09:26 +00:00
skia.committer@gmail.com
7693dbf46e Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14862 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 03:03:34 +00:00
commit-bot@chromium.org
ba7aedd6ea Revert of Turn on preprocessing by default (https://codereview.chromium.org/299033002/)
Reason for revert:
Don't want this enabled by default right now

Original issue's description:
> Turn on preprocessing by default
>
> The idea is to commit this late at night and then revert it after all the perf bots are running. It should only effect the GPU configs.
>
> Committed: http://code.google.com/p/skia/source/detail?r=14860

R=bsalomon@google.com
TBR=bsalomon@google.com
NOTREECHECKS=true
NOTRY=true

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/299123002

git-svn-id: http://skia.googlecode.com/svn/trunk@14861 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-23 01:02:21 +00:00
commit-bot@chromium.org
0df2e8d5a6 Turn on preprocessing by default
The idea is to commit this late at night and then revert it after all the perf bots are running. It should only effect the GPU configs.

R=bsalomon@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/299033002

git-svn-id: http://skia.googlecode.com/svn/trunk@14860 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 23:27:27 +00:00
commit-bot@chromium.org
39123f4c0b temporarily add back in the factores that took a unitmapper
BUG=skia:
R=fmalita@google.com, fmalita@chromium.org, reed@chromium.org

Author: reed@google.com

Review URL: https://codereview.chromium.org/292513006

git-svn-id: http://skia.googlecode.com/svn/trunk@14859 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 22:35:24 +00:00
robertphillips@google.com
ca96902077 Add pkm missing from r14852 (Simple PKM image decoder - https://codereview.chromium.org/292663011/) commit
git-svn-id: http://skia.googlecode.com/svn/trunk@14858 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 21:29:20 +00:00
commit-bot@chromium.org
55e8f3baee remove bit rotted gyp from most
BUG=skia:2597
R=epoger@google.com
TBR=epoger
NOTRY=true

Author: caryclark@google.com

Review URL: https://codereview.chromium.org/297823004

git-svn-id: http://skia.googlecode.com/svn/trunk@14857 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 20:09:05 +00:00
commit-bot@chromium.org
9e34473d73 remove bit rot test gyp
BUG=skia:2597
R=epoger@google.com
TBR=epoger
NOTRY=true

Author: caryclark@google.com

Review URL: https://codereview.chromium.org/296053016

git-svn-id: http://skia.googlecode.com/svn/trunk@14856 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 19:58:22 +00:00
commit-bot@chromium.org
738a9218b8 If our gyp does not exist, use chromium's.
The previous version had faith that if the third_party folder
existed, it must contain externals/gyp. A recent change added
third_party (in git, as opposed to using DEPS), so now Android
has third_party but not externals/gyp.

Now check the full filepath. If it's not there, back up to
chromium's version.

Fixes Android canary bot.

R=halcanary@google.com
TBR=halcanary@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/295103008

git-svn-id: http://skia.googlecode.com/svn/trunk@14855 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 19:30:54 +00:00
reed@google.com
6f4e473676 turn assert into not_implemented_yet for patheffects on text
git-svn-id: http://skia.googlecode.com/svn/trunk@14854 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 18:53:10 +00:00
commit-bot@chromium.org
de5553ae8b re-expose hasLocalMatrix for now (can't hurt) -- unblocks blink
BUG=skia:
R=fmalita@google.com, fmalita@chromium.org

Author: reed@google.com

Review URL: https://codereview.chromium.org/299043002

git-svn-id: http://skia.googlecode.com/svn/trunk@14853 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 18:43:05 +00:00
robertphillips@google.com
8cf81e0f4f Simple PKM image decoder.
https://codereview.chromium.org/292663011/



git-svn-id: http://skia.googlecode.com/svn/trunk@14852 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 18:40:29 +00:00
commit-bot@chromium.org
0be2d8354b Fix memcpy32_sse2_unalign.
The whole point of mempcy32_sse2_unalign is that we didn't align dst128
and src128.  So it's not safe at all to cast them back to dst and src.
That tells the compiler that dst/src are 128-bit aligned, and then it
autovectorizes the cleanup while-loop using that (false) knowledge with
aligned SSE instructions.

This leads to crashes on memcpy32_sse2_unalign_10, which is small enough
that we actually get non-16-byte aligned memory.  The larger size
benches could be crashing too, but they're big enough allocations that
they're probably always 16-byte aligned anyway.

BUG=skia:2589
R=fmalita@chromium.org, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/291893008

git-svn-id: http://skia.googlecode.com/svn/trunk@14851 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 18:24:42 +00:00
reed@google.com
7cb5e4797e tweak stroketext GM to actually test dashing
git-svn-id: http://skia.googlecode.com/svn/trunk@14850 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 17:59:51 +00:00
bungeman@google.com
4a867a6356 Remove SK_IGNORE_UNDERLINE_POSITION_FIX now that it is no longer used.
R=reed@google.com

Review URL: https://codereview.chromium.org/294663016

git-svn-id: http://skia.googlecode.com/svn/trunk@14849 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 17:59:21 +00:00
commit-bot@chromium.org
74266814a0 update stroketext gm
TBR=bungeman

Author: reed@google.com

Review URL: https://codereview.chromium.org/293983016

git-svn-id: http://skia.googlecode.com/svn/trunk@14848 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 17:41:41 +00:00
bsalomon@google.com
df1d83d786 Rebaseline two GMs that subtly changed in perspective after convexity fix.
BUG=skia:

Review URL: https://codereview.chromium.org/292983015

git-svn-id: http://skia.googlecode.com/svn/trunk@14847 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 17:06:31 +00:00
tfarina@chromium.org
6627a76e87 Don't try to remove xcodebuild directory on Windows.
make.py is a python script to be run *only* on Windows and thus
xcodebuild directory should not exist there. If we never create it on Windows,
then why should we try to remove something we don't create there?

R=epoger@google.com

Review URL: https://codereview.chromium.org/299443005

git-svn-id: http://skia.googlecode.com/svn/trunk@14846 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 15:54:05 +00:00
commit-bot@chromium.org
8be07bb12d In convexity checker don't advance last vector when x-product isn't significant.
BUG=skia:2235
R=caryclark@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/298973004

git-svn-id: http://skia.googlecode.com/svn/trunk@14845 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 14:58:53 +00:00
commit-bot@chromium.org
ab08437e39 Revert "Temporarily disable NEON on Android framework builds."
R=scroggo@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/294183002

git-svn-id: http://skia.googlecode.com/svn/trunk@14844 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 13:42:34 +00:00