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

Getting rid of compile-time warnings

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

git-svn-id: http://skia.googlecode.com/svn/trunk@4868 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
chudy@google.com 2012-07-31 20:07:42 +00:00
parent 0b5bbb0f82
commit 751961d471
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debugger/QT/SkCanvasWidget.cpp
View File

@ -76,7 +76,7 @@ void SkCanvasWidget::mouseMoveEvent(QMouseEvent* event) {
void SkCanvasWidget::mousePressEvent(QMouseEvent* event) { void SkCanvasWidget::mousePressEvent(QMouseEvent* event) {
fPreviousPoint.set(event->globalX(), event->globalY()); fPreviousPoint.set(event->globalX(), event->globalY());
emit hitChanged(fDebugCanvas->getLayerAtPoint(event->x(), event->y(), emit hitChanged(fDebugCanvas->getCommandAtPoint(event->x(), event->y(),
fIndex, fTransform, fScaleFactor)); fIndex, fTransform, fScaleFactor));
} }

12
debugger/SkDebugCanvas.cpp
View File

@ -51,7 +51,7 @@ int SkDebugCanvas::getCommandAtPoint(int x, int y, int index,
} }
int layer = 0; int layer = 0;
int prev = bitmap.getColor(0,0); SkColor prev = bitmap.getColor(0,0);
for (int i = 0; i < index; i++) { for (int i = 0; i < index; i++) {
if (commandVector[i]->isVisible()) { if (commandVector[i]->isVisible()) {
commandVector[i]->execute(&canvas); commandVector[i]->execute(&canvas);
@ -67,7 +67,7 @@ int SkDebugCanvas::getCommandAtPoint(int x, int y, int index,
void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) { void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
int counter = 0; int counter = 0;
SkASSERT(!commandVector.empty()); SkASSERT(!commandVector.empty());
SkASSERT(index < commandVector.size()); SkASSERT(index < (int)commandVector.size());
for (int i = 0; i <= index; i++) { for (int i = 0; i <= index; i++) {
if (i == index && fFilter) { if (i == index && fFilter) {
SkPaint p; SkPaint p;
@ -90,17 +90,17 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
} }
SkDrawCommand* SkDebugCanvas::getDrawCommandAt(int index) { SkDrawCommand* SkDebugCanvas::getDrawCommandAt(int index) {
SkASSERT(index < commandVector.size()); SkASSERT(index < (int)commandVector.size());
return commandVector[index]; return commandVector[index];
} }
std::vector<std::string>* SkDebugCanvas::getCommandInfoAt(int index) { std::vector<std::string>* SkDebugCanvas::getCommandInfoAt(int index) {
SkASSERT(index < commandVector.size()); SkASSERT(index < (int)commandVector.size());
return commandVector[index]->Info(); return commandVector[index]->Info();
} }
bool SkDebugCanvas::getDrawCommandVisibilityAt(int index) { bool SkDebugCanvas::getDrawCommandVisibilityAt(int index) {
SkASSERT(index < commandVector.size()); SkASSERT(index < (int)commandVector.size());
return commandVector[index]->isVisible(); return commandVector[index]->isVisible();
} }
@ -266,6 +266,6 @@ bool SkDebugCanvas::translate(SkScalar dx, SkScalar dy) {
} }
void SkDebugCanvas::toggleCommand(int index, bool toggle) { void SkDebugCanvas::toggleCommand(int index, bool toggle) {
SkASSERT(index < commandVector.size()); SkASSERT(index < (int)commandVector.size());
commandVector[index]->setVisible(toggle); commandVector[index]->setVisible(toggle);
} }