From e0db93c6570729095cddcb65e57c57cdd6a760ad Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Thu, 24 May 2012 09:16:01 +0100 Subject: [PATCH] bug 757871 - don't generate warnings from FT2FontEntry::GetFontTable during normal control flow. r=jdaggett --- gfx/thebes/gfxFT2FontList.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gfx/thebes/gfxFT2FontList.cpp b/gfx/thebes/gfxFT2FontList.cpp index d8e0048fd674..2a0414275423 100644 --- a/gfx/thebes/gfxFT2FontList.cpp +++ b/gfx/thebes/gfxFT2FontList.cpp @@ -369,15 +369,16 @@ FT2FontEntry::GetFontTable(PRUint32 aTableTag, FT_Error status; FT_ULong len = 0; status = FT_Load_Sfnt_Table(mFTFace, aTableTag, 0, nsnull, &len); - NS_ENSURE_TRUE(status == 0, NS_ERROR_FAILURE); - NS_ENSURE_TRUE(len != 0, NS_ERROR_FAILURE); + if (status != FT_Err_Ok || len == 0) { + return NS_ERROR_FAILURE; + } if (!aBuffer.SetLength(len)) { return NS_ERROR_OUT_OF_MEMORY; } PRUint8 *buf = aBuffer.Elements(); status = FT_Load_Sfnt_Table(mFTFace, aTableTag, 0, buf, &len); - NS_ENSURE_TRUE(status == 0, NS_ERROR_FAILURE); + NS_ENSURE_TRUE(status == FT_Err_Ok, NS_ERROR_FAILURE); return NS_OK; }