Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 755031 - Clear warnings in gfx/2d/ScaledFontDWrite.cpp. r=jmuizelaar

Browse Source
This commit is contained in:
Filippo Cristofoletti 2013-01-15 07:21:00 -05:00
parent 880df492b1
commit ddef8c2fb1
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gfx/2d/ScaledFontDWrite.cpp
View File

@ -176,7 +176,7 @@ readShort(const char *aBuf)
}
static bool
DoGrayscale(IDWriteFontFace *aDWFace, unsigned int ppem)
DoGrayscale(IDWriteFontFace *aDWFace, Float ppem)
{
void *tableContext;
char *tableData;
@ -266,11 +266,15 @@ DWriteFontFileStream::ReadFileFragment(const void **fragmentStart,
void **fragmentContext)
{
// We are required to do bounds checking.
if (fileOffset + fragmentSize > (UINT64)mData.size()) {
if (fileOffset + fragmentSize > mData.size()) {
return E_FAIL;
}
// truncate the 64 bit fileOffset to size_t sized index into mData
size_t index = static_cast<size_t>(fileOffset);
// We should be alive for the duration of this.
*fragmentStart = &mData[fileOffset];
*fragmentStart = &mData[index];
*fragmentContext = NULL;
return S_OK;
}
@ -379,9 +383,14 @@ ScaledFontDWrite::GetFontFileData(FontFileDataOutput aDataCallback, void *aBaton
RefPtr<IDWriteFontFileStream> stream;
loader->CreateStreamFromKey(referenceKey, refKeySize, byRef(stream));
UINT64 fileSize;
stream->GetFileSize(&fileSize);
UINT64 fileSize64;
stream->GetFileSize(&fileSize64);
if (fileSize64 > UINT32_MAX) {
MOZ_ASSERT(false);
return false;
}
uint32_t fileSize = static_cast<uint32_t>(fileSize64);
const void *fragmentStart;
void *context;
stream->ReadFileFragment(&fragmentStart, 0, fileSize, &context);