[freetype2] master 0bcb664de: [psaux] Delay the upem validity assertion.

[Werner Lemberg]

branch: master
commit 0bcb664de8ea44299f57c45d01433328596bc2a7
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    [psaux] Delay the upem validity assertion.
    
    Fixes #1194.
    
    * src/psaux/psft.c (cf2_getUnitsPerEm): Remove the upem assert.
    (cf2_checkTransform): Assert the upem validity after checking the scale.
---
 src/psaux/psft.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/psaux/psft.c b/src/psaux/psft.c
index ac72d8259..618864e6e 100644
--- a/src/psaux/psft.c
+++ b/src/psaux/psft.c
@@ -68,11 +68,10 @@
     CF2_Fixed  maxScale;
 
 
-    FT_ASSERT( unitsPerEm > 0 );
-
     if ( transform->a <= 0 || transform->d <= 0 )
       return FT_THROW( Invalid_Size_Handle );
 
+    FT_ASSERT( unitsPerEm > 0 );
     FT_ASSERT( transform->b == 0 && transform->c == 0 );
     FT_ASSERT( transform->tx == 0 && transform->ty == 0 );
 
@@ -297,7 +296,6 @@
   cf2_getUnitsPerEm( PS_Decoder*  decoder )
   {
     FT_ASSERT( decoder && decoder->builder.face );
-    FT_ASSERT( decoder->builder.face->units_per_EM );
 
     return decoder->builder.face->units_per_EM;
   }