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

More Windows 64b compilation warning fixes

Browse Source 
https://codereview.chromium.org/47513017/



git-svn-id: http://skia.googlecode.com/svn/trunk@12337 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2013-11-21 14:24:16 +00:00
parent bcd431e177
commit a4662865e3
12 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bench/benchmain.cpp
View File

@ -443,13 +443,13 @@ int tool_main(int argc, char** argv) {
// Find the longest name of the benches we're going to run to make the output pretty.
Iter names;
SkBenchmark* bench;
int longestName = 0;
size_t longestName = 0;
while ((bench = names.next()) != NULL) {
SkAutoTUnref<SkBenchmark> benchUnref(bench);
if (SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getName())) {
continue;
}
const int length = strlen(bench->getName());
const size_t length = strlen(bench->getName());
longestName = length > longestName ? length : longestName;
}
@ -539,7 +539,7 @@ int tool_main(int argc, char** argv) {
loggedBenchName = true;
SkString str;
str.printf("running bench [%3d %3d] %*s ",
dim.fX, dim.fY, longestName, bench->getName());
dim.fX, dim.fY, (int)longestName, bench->getName());
logger.logProgress(str);
}

5
include/core/SkUtils.h
View File

@ -71,8 +71,7 @@ size_t SkUTF8_FromUnichar(SkUnichar uni, char utf8[] = NULL);
#define SkUTF16_IsLowSurrogate(c) (((c) & 0xFC00) == 0xDC00)
int SkUTF16_CountUnichars(const uint16_t utf16[]);
int SkUTF16_CountUnichars(const uint16_t utf16[],
int numberOf16BitValues);
int SkUTF16_CountUnichars(const uint16_t utf16[], int numberOf16BitValues);
// returns the current unichar and then moves past it (*p++)
SkUnichar SkUTF16_NextUnichar(const uint16_t**);
// this guy backs up to the previus unichar value, and returns it (*--p)
@ -80,7 +79,7 @@ SkUnichar SkUTF16_PrevUnichar(const uint16_t**);
size_t SkUTF16_FromUnichar(SkUnichar uni, uint16_t utf16[] = NULL);
size_t SkUTF16_ToUTF8(const uint16_t utf16[], int numberOf16BitValues,
char utf8[] = NULL);
char utf8[] = NULL);
inline bool SkUnichar_IsVariationSelector(SkUnichar uni) {
/* The 'true' ranges are:

2
src/gpu/SkGpuDevice.cpp
View File

@ -571,7 +571,7 @@ void SkGpuDevice::drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
fContext->drawVertices(grPaint,
gPointMode2PrimtiveType[mode],
count,
SkToS32(count),
(GrPoint*)pts,
NULL,
NULL,

2
src/gpu/gl/GrGLProgramDesc.cpp
View File

@ -105,7 +105,7 @@ void GrGLProgramDesc::Build(const GrDrawState& drawState,
memset(desc->header(), 0, kHeaderSize);
}
// write the key length
*desc->atOffset<uint32_t, kLengthOffset>() = newKeyLength;
*desc->atOffset<uint32_t, kLengthOffset>() = SkToU32(newKeyLength);
KeyHeader* header = desc->header();
EffectKey* effectKeys = desc->effectKeys();

2
src/gpu/gl/GrGpuGL_program.cpp
View File

@ -291,7 +291,7 @@ bool GrGpuGL::flushGraphicsState(DrawType type, const GrDeviceCoordTexture* dstC
void GrGpuGL::setupGeometry(const DrawInfo& info, size_t* indexOffsetInBytes) {
GrGLsizei stride = this->getDrawState().getVertexSize();
GrGLsizei stride = static_cast<GrGLsizei>(this->getDrawState().getVertexSize());
size_t vertexOffsetInBytes = stride * info.startVertex();

10
src/images/bmpdecoderhelper.cpp
View File

@ -18,7 +18,7 @@ static const int kBmpOS2InfoSize = 12;
static const int kMaxDim = SHRT_MAX / 2;
bool BmpDecoderHelper::DecodeImage(const char* p,
int len,
size_t len,
int max_pixels,
BmpDecoderCallback* callback) {
data_ = reinterpret_cast<const uint8*>(p);
@ -153,7 +153,7 @@ bool BmpDecoderHelper::DecodeImage(const char* p,
rowLen += rowPad_;
}
if (offset > 0 && offset > pos_ && offset < len_) {
if (offset > 0 && (size_t)offset > pos_ && (size_t)offset < len_) {
pos_ = offset;
}
// Deliberately off-by-one; a load of BMPs seem to have their last byte
@ -182,7 +182,7 @@ void BmpDecoderHelper::DoRLEDecode() {
static const uint8 RLE_DELTA = 2;
int x = 0;
int y = height_ - 1;
while (pos_ < len_ - 1) {
while (pos_ + 1 < len_) {
uint8 cmd = GetByte();
if (cmd != RLE_ESCAPE) {
uint8 pixels = GetByte();
@ -210,7 +210,7 @@ void BmpDecoderHelper::DoRLEDecode() {
return;
}
} else if (cmd == RLE_DELTA) {
if (pos_ < len_ - 1) {
if (pos_ + 1 < len_) {
uint8 dx = GetByte();
uint8 dy = GetByte();
x += dx;
@ -336,7 +336,7 @@ int BmpDecoderHelper::GetShort() {
}
uint8 BmpDecoderHelper::GetByte() {
CHECK(pos_ >= 0 && pos_ <= len_);
CHECK(pos_ <= len_);
// We deliberately allow this off-by-one access to cater for BMPs with their
// last byte missing.
if (pos_ == len_) {

6
src/images/bmpdecoderhelper.h
View File

@ -72,7 +72,7 @@ class BmpDecoderHelper {
BmpDecoderHelper() { }
~BmpDecoderHelper() { }
bool DecodeImage(const char* data,
int len,
size_t len,
int max_pixels,
BmpDecoderCallback* callback);
@ -90,8 +90,8 @@ class BmpDecoderHelper {
int CalcShiftLeft(uint32 mask);
const uint8* data_;
int pos_;
int len_;
size_t pos_;
size_t len_;
int width_;
int height_;
int bpp_;

2
src/pdf/SkPDFDevice.cpp
View File

@ -123,7 +123,7 @@ static void align_text(SkDrawCacheProc glyphCacheProc, const SkPaint& paint,
*y = *y - yAdj;
}
static size_t max_glyphid_for_typeface(SkTypeface* typeface) {
static int max_glyphid_for_typeface(SkTypeface* typeface) {
SkAutoResolveDefaultTypeface autoResolve(typeface);
typeface = autoResolve.get();
return typeface->countGlyphs() - 1;

2
src/pdf/SkPDFDeviceFlattener.cpp
View File

@ -43,7 +43,7 @@ void SkPDFDeviceFlattener::drawPoints(const SkDraw& d, SkCanvas::PointMode mode,
flattenPaint(d, &paintFlatten);
SkPoint* flattenedPoints = SkNEW_ARRAY(SkPoint, count);
d.fMatrix->mapPoints(flattenedPoints, points, count);
d.fMatrix->mapPoints(flattenedPoints, points, SkToS32(count));
SkDraw draw(d);
SkMatrix identity = SkMatrix::I();
draw.fMatrix = &identity;

2
src/pdf/SkPDFImage.cpp
View File

@ -426,7 +426,7 @@ static SkBitmap unpremultiply_bitmap(const SkBitmap& bitmap,
SkBitmap outBitmap;
outBitmap.setConfig(bitmap.config(), srcRect.width(), srcRect.height());
outBitmap.allocPixels();
size_t dstRow = 0;
int dstRow = 0;
outBitmap.lockPixels();
bitmap.lockPixels();

6
src/utils/debugger/SkObjectParser.cpp
View File

@ -335,9 +335,11 @@ SkString* SkObjectParser::TextToString(const void* text, size_t byteLength,
}
case SkPaint::kUTF16_TextEncoding: {
decodedText->append("UTF-16: ");
size_t sizeNeeded = SkUTF16_ToUTF8((uint16_t*)text, byteLength / 2, NULL);
size_t sizeNeeded = SkUTF16_ToUTF8((uint16_t*)text,
SkToS32(byteLength / 2),
NULL);
SkAutoSTMalloc<0x100, char> utf8(sizeNeeded);
SkUTF16_ToUTF8((uint16_t*)text, byteLength / 2, utf8);
SkUTF16_ToUTF8((uint16_t*)text, SkToS32(byteLength / 2), utf8);
decodedText->append(utf8, sizeNeeded);
break;
}

7
src/views/win/SkOSWindow_win.cpp
View File

@ -130,9 +130,12 @@ bool SkOSWindow::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
this->handleChar(SkUTF8_ToUnichar((char*)&wParam));
return true;
} break;
case WM_SIZE:
this->resize(lParam & 0xFFFF, lParam >> 16);
case WM_SIZE: {
INT width = LOWORD(lParam);
INT height = HIWORD(lParam);
this->resize(width, height);
break;
}
case WM_PAINT: {
PAINTSTRUCT ps;
HDC hdc = BeginPaint(hWnd, &ps);