AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up some Windows compiler warnings.

Browse Source 
Review URL: https://codereview.appspot.com/6844111

git-svn-id: http://skia.googlecode.com/svn/trunk@6628 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
senorblanco@chromium.org 2012-11-29 22:39:10 +00:00
parent 123a0b5fbf
commit 528952b5af
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/effects/SkMatrixConvolutionImageFilter.cpp
View File

@ -47,8 +47,8 @@ SkMatrixConvolutionImageFilter::SkMatrixConvolutionImageFilter(SkFlattenableRead
SkASSERT(readSize == size); SkASSERT(readSize == size);
fGain = buffer.readScalar(); fGain = buffer.readScalar();
fBias = buffer.readScalar(); fBias = buffer.readScalar();
fTarget.fX = buffer.readScalar(); fTarget.fX = buffer.readInt();
fTarget.fY = buffer.readScalar(); fTarget.fY = buffer.readInt();
fTileMode = (TileMode) buffer.readInt(); fTileMode = (TileMode) buffer.readInt();
fConvolveAlpha = buffer.readBool(); fConvolveAlpha = buffer.readBool();
} }
@ -60,8 +60,8 @@ void SkMatrixConvolutionImageFilter::flatten(SkFlattenableWriteBuffer& buffer) c
buffer.writeScalarArray(fKernel, fKernelSize.fWidth * fKernelSize.fHeight); buffer.writeScalarArray(fKernel, fKernelSize.fWidth * fKernelSize.fHeight);
buffer.writeScalar(fGain); buffer.writeScalar(fGain);
buffer.writeScalar(fBias); buffer.writeScalar(fBias);
buffer.writeScalar(fTarget.fX); buffer.writeInt(fTarget.fX);
buffer.writeScalar(fTarget.fY); buffer.writeInt(fTarget.fY);
buffer.writeInt((int) fTileMode); buffer.writeInt((int) fTileMode);
buffer.writeBool(fConvolveAlpha); buffer.writeBool(fConvolveAlpha);
} }
@ -478,8 +478,8 @@ GrMatrixConvolutionEffect::GrMatrixConvolutionEffect(GrTexture* texture,
for (int i = 0; i < kernelSize.width() * kernelSize.height(); i++) { for (int i = 0; i < kernelSize.width() * kernelSize.height(); i++) {
fKernel[i] = SkScalarToFloat(kernel[i]); fKernel[i] = SkScalarToFloat(kernel[i]);
} }
fTarget[0] = target.x(); fTarget[0] = static_cast<float>(target.x());
fTarget[1] = target.y(); fTarget[1] = static_cast<float>(target.y());
} }
GrMatrixConvolutionEffect::~GrMatrixConvolutionEffect() { GrMatrixConvolutionEffect::~GrMatrixConvolutionEffect() {