Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Unified Diff: src/core/SkDescriptor.h

Issue 795223002: Fix some win64 warnings. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/core/SkVarAlloc.h » ('j') | src/gpu/GrDistanceFieldTextContext.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkDescriptor.h
diff --git a/src/core/SkDescriptor.h b/src/core/SkDescriptor.h
index d550863568ef16e569c742d8fd50c099c1061537..22ec29316fd30094ed6ad36cff8150acde8808cd 100644
--- a/src/core/SkDescriptor.h
+++ b/src/core/SkDescriptor.h
@@ -42,7 +42,7 @@ public:
SkASSERT(SkAlign4(length) == length);
SkASSERT(this->findEntry(tag, NULL) == NULL);
- Entry* entry = (Entry*)((char*)this + fLength);
+ Entry* entry = (Entry*)((char*)this + fLength);
entry->fTag = tag;
entry->fLen = SkToU32(length);
if (data) {
@@ -50,7 +50,7 @@ public:
}
fCount += 1;
- fLength += sizeof(Entry) + length;
+ fLength = SkToU32(fLength + sizeof(Entry) + length);
return (entry + 1); // return its data
}
« no previous file with comments | « no previous file | src/core/SkVarAlloc.h » ('j') | src/gpu/GrDistanceFieldTextContext.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698