diff options
| author | Stephen Hines <srhines@google.com> | 2014-08-21 23:27:46 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-08-21 23:27:46 -0700 |
| commit | 61db21cef81cbc8439b34a8f1d32952339ffc190 (patch) | |
| tree | 62a54045fbfe51a5ebb65c0ae6e7c67fa1037549 /cpu_ref/rsCpuIntrinsicBlur.cpp | |
| parent | 4c513c12f0f620c336efce7b92b8f26aae39ffdd (diff) | |
| parent | 81cfa2c51d4e8316f9e3519917b7dae7ceeb500d (diff) | |
| download | rs-61db21cef81cbc8439b34a8f1d32952339ffc190.tar.gz | |
resolved conflicts for merge of 81cfa2c5 to lmp-dev-plus-aosp
Change-Id: Ia3a7f084693825d4e46a4864788332a7d039d38f
Diffstat (limited to 'cpu_ref/rsCpuIntrinsicBlur.cpp')
| -rw-r--r-- | cpu_ref/rsCpuIntrinsicBlur.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu_ref/rsCpuIntrinsicBlur.cpp b/cpu_ref/rsCpuIntrinsicBlur.cpp index eb5f7481..6287790c 100644 --- a/cpu_ref/rsCpuIntrinsicBlur.cpp +++ b/cpu_ref/rsCpuIntrinsicBlur.cpp @@ -418,7 +418,7 @@ RsdCpuScriptIntrinsicBlur::RsdCpuScriptIntrinsicBlur(RsdCpuReferenceImpl *ctx, const Script *s, const Element *e) : RsdCpuScriptIntrinsic(ctx, s, e, RS_SCRIPT_INTRINSIC_ID_BLUR) { - mRootPtr = NULL; + mRootPtr = nullptr; if (e->getType() == RS_TYPE_UNSIGNED_8) { switch (e->getVectorSize()) { case 1: |