diff options
| author |  tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-10 17:42:21 +0000 |
|---|---|---|
| committer | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-10 17:42:21 +0000 |
| commit | 75589257c6ac7fc55a66502b74b8bc09c0212fea (patch) | |
| tree | 24d452385ad37eba7f91a17aec9b5a7851007229 /src/effects/SkMorphologyImageFilter.cpp | |
| parent | 56dd630c41d662bcf2a3f08100f2c6accda05ba9 (diff) | |
Fix miscellaneous compiler warnings from Visual Studio 2010.
Changes serialization path for MorphologyImageFilter, handling of Windows
HRESULTS; otherwise just tweaks tests.
git-svn-id: http://skia.googlecode.com/svn/trunk@3642 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkMorphologyImageFilter.cpp')
| -rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index aac6f846ea..2de4b3c5cd 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -10,8 +10,8 @@ SkMorphologyImageFilter::SkMorphologyImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) { - fRadius.fWidth = buffer.readScalar(); - fRadius.fHeight = buffer.readScalar(); + fRadius.fWidth = buffer.readInt(); + fRadius.fHeight = buffer.readInt(); } SkMorphologyImageFilter::SkMorphologyImageFilter(int radiusX, int radiusY) @@ -21,8 +21,8 @@ SkMorphologyImageFilter::SkMorphologyImageFilter(int radiusX, int radiusY) void SkMorphologyImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const { this->INHERITED::flatten(buffer); - buffer.writeScalar(fRadius.fWidth); - buffer.writeScalar(fRadius.fHeight); + buffer.writeInt(fRadius.fWidth); + buffer.writeInt(fRadius.fHeight); } static void erode(const SkPMColor* src, SkPMColor* dst, |