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

Fix miscellaneous compiler warnings from Visual Studio 2010.

Browse Source 
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
This commit is contained in:
tomhudson@google.com 2012-04-10 17:42:21 +00:00
parent 56dd630c41
commit 75589257c6
9 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gm/bitmapcopy.cpp
View File

@ -30,13 +30,17 @@ SkBitmap::Config gConfigs[] = {
static void draw_checks(SkCanvas* canvas, int width, int height) {
SkPaint paint;
paint.setColor(SK_ColorRED);
canvas->drawRectCoords(0, 0, width / 2, height / 2, paint);
canvas->drawRectCoords(SkIntToScalar(0), SkIntToScalar(0),
SkIntToScalar(width / 2), SkIntToScalar(height / 2), paint);
paint.setColor(SK_ColorGREEN);
canvas->drawRectCoords(width / 2, 0, width, height / 2, paint);
canvas->drawRectCoords(SkIntToScalar(width / 2), SkIntToScalar(0),
SkIntToScalar(width), SkIntToScalar(height / 2), paint);
paint.setColor(SK_ColorBLUE);
canvas->drawRectCoords(0, height / 2, width / 2, height, paint);
canvas->drawRectCoords(SkIntToScalar(0), SkIntToScalar(height / 2),
SkIntToScalar(width / 2), SkIntToScalar(height), paint);
paint.setColor(SK_ColorYELLOW);
canvas->drawRectCoords(width / 2, height / 2, width, height, paint);
canvas->drawRectCoords(SkIntToScalar(width / 2), SkIntToScalar(height / 2),
SkIntToScalar(width), SkIntToScalar(height), paint);
}
class BitmapCopyGM : public GM {

3
gm/colormatrix.cpp
View File

@ -61,7 +61,8 @@ protected:
for (int x = 0; x < width; ++x) {
SkPaint paint;
paint.setColor(SkColorSetARGB(255, x * 255 / width, y * 255 / height, 0));
canvas.drawRect(SkRect::MakeXYWH(x, y, 1, 1), paint);
canvas.drawRect(SkRect::MakeXYWH(SkIntToScalar(x),
SkIntToScalar(y), SK_Scalar1, SK_Scalar1), paint);
}
}
return bm;

5
gm/imageblur.cpp
View File

@ -39,8 +39,9 @@ protected:
int x = rand() % WIDTH;
int y = rand() % HEIGHT;
paint.setColor(rand() % 0x1000000 | 0xFF000000);
paint.setTextSize(rand() % 300);
canvas->drawText(str, strlen(str), x, y, paint);
paint.setTextSize(SkIntToScalar(rand() % 300));
canvas->drawText(str, strlen(str), SkIntToScalar(x),
SkIntToScalar(y), paint);
}
canvas->restore();
}

3
gm/verttext2.cpp
View File

@ -73,7 +73,8 @@ protected:
paint.setTextSize(textHeight);
canvas->drawText(string.c_str(), string.size(), y,
alignment == SkPaint::kLeft_Align ? 10 : 240, paint);
SkIntToScalar(alignment == SkPaint::kLeft_Align ? 10 : 240),
paint);
y += textHeight;
}

8
src/effects/SkMorphologyImageFilter.cpp
View File

@ -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,

2
src/utils/win/SkHRESULT.cpp
View File

@ -11,7 +11,7 @@
void SkTraceHR(const char* file, unsigned long line,
HRESULT hr, const char* msg) {
if (NULL != msg) SkDEBUGF(("%s\n", msg));
SkDEBUGCODE(if (NULL != msg) SkDEBUGF(("%s\n", msg)));
SkDEBUGF(("%s(%lu) : error 0x%x: ", file, line, hr));
LPSTR errorText = NULL;

3
tests/FillPathTest.cpp
View File

@ -39,7 +39,8 @@ static void TestFillPathInverse(skiatest::Reporter* reporter) {
int expected_lines = 5;
clip.set(0, height - expected_lines, width, height);
path.moveTo(0.0, 0.0);
path.quadTo(width/2, height, width, 0.0);
path.quadTo(SkIntToScalar(width/2), SkIntToScalar(height),
SkIntToScalar(width), 0.0);
path.close();
path.setFillType(SkPath::kInverseWinding_FillType);
SkScan::FillPath(path, clip, &blitter);

12
tests/MathTest.cpp
View File

@ -245,8 +245,8 @@ static float make_zero() {
static void unittest_isfinite(skiatest::Reporter* reporter) {
#ifdef SK_SCALAR_IS_FLOAT
float nan = sk_float_asin(2);
float inf = 1.0 / make_zero();
float big = 3.40282e+038;
float inf = 1.0f / make_zero();
float big = 3.40282e+038f;
REPORTER_ASSERT(reporter, !SkScalarIsNaN(inf));
REPORTER_ASSERT(reporter, !SkScalarIsNaN(-inf));
@ -416,9 +416,13 @@ static void TestMath(skiatest::Reporter* reporter) {
for (i = 0; i < 10000; i++) {
SkPoint p;
p.setLength(rand.nextS(), rand.nextS(), SK_Scalar1);
// These random values are being treated as 32-bit-patterns, not as
// ints; calling SkIntToScalar() here produces crashes.
p.setLength(rand.nextS(),
rand.nextS(), SK_Scalar1);
check_length(reporter, p, SK_Scalar1);
p.setLength(rand.nextS() >> 13, rand.nextS() >> 13, SK_Scalar1);
p.setLength(rand.nextS() >> 13,
rand.nextS() >> 13, SK_Scalar1);
check_length(reporter, p, SK_Scalar1);
}

4
tests/PointTest.cpp
View File

@ -36,10 +36,10 @@ static void test_Normalize(skiatest::Reporter* reporter,
void PointTest(skiatest::Reporter* reporter) {
test_length(reporter, SkIntToScalar(3), SkIntToScalar(4), SkIntToScalar(5));
test_length(reporter, SkFloatToScalar(0.6), SkFloatToScalar(0.8),
test_length(reporter, SkFloatToScalar(0.6f), SkFloatToScalar(0.8f),
SK_Scalar1);
test_Normalize(reporter, SkIntToScalar(3), SkIntToScalar(4));
test_Normalize(reporter, SkFloatToScalar(0.6), SkFloatToScalar(0.8));
test_Normalize(reporter, SkFloatToScalar(0.6f), SkFloatToScalar(0.8f));
}
#include "TestClassDef.h"