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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/utils/win/SkDWriteFontFileStream.cpp

Issue 18503009: Fix SkTFits in to work properly with signed/unsigned mixtures. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Remove enable_if, use SK_COMPILE_ASSERT instead. Created 7 years, 5 months 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
« src/utils/SkTLogic.h ('K') | « src/utils/SkTLogic.h ('k') | tests/FitsInTest.cpp » ('j') | tests/FitsInTest.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/win/SkDWriteFontFileStream.cpp
===================================================================
--- src/utils/win/SkDWriteFontFileStream.cpp (revision 9972)
+++ src/utils/win/SkDWriteFontFileStream.cpp (working copy)
@@ -9,10 +9,10 @@
#include "SkDWriteFontFileStream.h"
#include "SkHRESULT.h"
#include "SkTemplates.h"
+#include "SkTFitsIn.h"
#include "SkTScopedComPtr.h"
#include <dwrite.h>
-#include <limits>
///////////////////////////////////////////////////////////////////////////////
// SkIDWriteFontFileStream
@@ -183,7 +183,7 @@
return E_FAIL;
}
- if (fileOffset + fragmentSize > (std::numeric_limits<size_t>::max)()) {
+ if (!SkTFitsIn<size_t>(fileOffset + fragmentSize)) {
return E_FAIL;
}
« src/utils/SkTLogic.h ('K') | « src/utils/SkTLogic.h ('k') | tests/FitsInTest.cpp » ('j') | tests/FitsInTest.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698