diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-01 16:09:37 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-01 16:09:37 +0000 |
| commit | 9fbbcca1c958e6df2cff24d3ccdb7ebd89b8486b (patch) | |
| tree | 9c4d964cb6437a119bce07ae31c07f57d367fb56 | |
| parent | 079d2986002a6eb407ba4699bae58920fdc355a0 (diff) | |
SkPerlinNoiseShader::CreateTubulenceNoise() is misspelled
Add missing 'r'.
BUG=skia:2329
R=bsalomon@google.com, hcm@google.com, sugoi@chromium.org
Author: siglesias@igalia.com
Review URL: https://codereview.chromium.org/207543008
git-svn-id: http://skia.googlecode.com/svn/trunk@14008 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | bench/PerlinNoiseBench.cpp | 2 | ||||
| -rw-r--r-- | gm/perlinnoise.cpp | 2 | ||||
| -rw-r--r-- | include/effects/SkPerlinNoiseShader.h | 12 | ||||
| -rw-r--r-- | samplecode/SampleFilterFuzz.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkPerlinNoiseShader.cpp | 4 |
6 files changed, 17 insertions, 6 deletions
@@ -15,6 +15,7 @@ ACCESS CO., LTD. <*@access-company.com> ARM <*@arm.com> George Wright <george@mozilla.com> Google Inc. <*@google.com> +Igalia <*@igalia.com> Intel <*@intel.com> Jacek Caban <cjacek@gmail.com> NVIDIA <*@nvidia.com> diff --git a/bench/PerlinNoiseBench.cpp b/bench/PerlinNoiseBench.cpp index 85b536bcfb..ff0baf35fc 100644 --- a/bench/PerlinNoiseBench.cpp +++ b/bench/PerlinNoiseBench.cpp @@ -44,7 +44,7 @@ private: SkShader* shader = (type == SkPerlinNoiseShader::kFractalNoise_Type) ? SkPerlinNoiseShader::CreateFractalNoise(baseFrequencyX, baseFrequencyY, numOctaves, seed, stitchTiles ? &fSize : NULL) : - SkPerlinNoiseShader::CreateTubulence(baseFrequencyX, baseFrequencyY, numOctaves, + SkPerlinNoiseShader::CreateTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, seed, stitchTiles ? &fSize : NULL); SkPaint paint; paint.setShader(shader)->unref(); diff --git a/gm/perlinnoise.cpp b/gm/perlinnoise.cpp index 164c0213cd..cce5b02627 100644 --- a/gm/perlinnoise.cpp +++ b/gm/perlinnoise.cpp @@ -43,7 +43,7 @@ protected: SkShader* shader = (type == SkPerlinNoiseShader::kFractalNoise_Type) ? SkPerlinNoiseShader::CreateFractalNoise(baseFrequencyX, baseFrequencyY, numOctaves, seed, stitchTiles ? &fSize : NULL) : - SkPerlinNoiseShader::CreateTubulence(baseFrequencyX, baseFrequencyY, numOctaves, + SkPerlinNoiseShader::CreateTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, seed, stitchTiles ? &fSize : NULL); SkPaint paint; paint.setShader(shader)->unref(); diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h index 03ae3832ca..9b06b2a572 100644 --- a/include/effects/SkPerlinNoiseShader.h +++ b/include/effects/SkPerlinNoiseShader.h @@ -58,9 +58,19 @@ public: static SkShader* CreateFractalNoise(SkScalar baseFrequencyX, SkScalar baseFrequencyY, int numOctaves, SkScalar seed, const SkISize* tileSize = NULL); - static SkShader* CreateTubulence(SkScalar baseFrequencyX, SkScalar baseFrequencyY, + static SkShader* CreateTurbulence(SkScalar baseFrequencyX, SkScalar baseFrequencyY, int numOctaves, SkScalar seed, const SkISize* tileSize = NULL); + /** + * Create alias for CreateTurbulunce until all Skia users changed + * its code to use the new naming + */ + static SkShader* CreateTubulence(SkScalar baseFrequencyX, SkScalar baseFrequencyY, + int numOctaves, SkScalar seed, + const SkISize* tileSize = NULL) { + return CreateTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, seed, tileSize); + } + virtual bool setContext(const SkBitmap& device, const SkPaint& paint, const SkMatrix& matrix); diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index 074452fb3a..28671d6b99 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -284,7 +284,7 @@ static SkImageFilter* make_image_filter(bool canBeNull = true) { SkAutoTUnref<SkShader> shader((R(2) == 1) ? SkPerlinNoiseShader::CreateFractalNoise( make_scalar(true), make_scalar(true), R(10.0f), make_scalar()) : - SkPerlinNoiseShader::CreateTubulence( + SkPerlinNoiseShader::CreateTurbulence( make_scalar(true), make_scalar(true), R(10.0f), make_scalar())); SkImageFilter::CropRect cropR(SkRect::MakeWH(SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize))); diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index 8abbdbd16b..7494a54ac4 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -256,7 +256,7 @@ SkShader* SkPerlinNoiseShader::CreateFractalNoise(SkScalar baseFrequencyX, SkSca numOctaves, seed, tileSize)); } -SkShader* SkPerlinNoiseShader::CreateTubulence(SkScalar baseFrequencyX, SkScalar baseFrequencyY, +SkShader* SkPerlinNoiseShader::CreateTurbulence(SkScalar baseFrequencyX, SkScalar baseFrequencyY, int numOctaves, SkScalar seed, const SkISize* tileSize) { return SkNEW_ARGS(SkPerlinNoiseShader, (kTurbulence_Type, baseFrequencyX, baseFrequencyY, @@ -706,7 +706,7 @@ GrEffectRef* GrPerlinNoiseEffect::TestCreate(SkRandom* random, SkShader* shader = random->nextBool() ? SkPerlinNoiseShader::CreateFractalNoise(baseFrequencyX, baseFrequencyY, numOctaves, seed, stitchTiles ? &tileSize : NULL) : - SkPerlinNoiseShader::CreateTubulence(baseFrequencyX, baseFrequencyY, numOctaves, seed, + SkPerlinNoiseShader::CreateTurbulence(baseFrequencyX, baseFrequencyY, numOctaves, seed, stitchTiles ? &tileSize : NULL); SkPaint paint; |