Index: src/base/ftmm.c |
diff --git a/src/base/ftmm.c b/src/base/ftmm.c |
index 0307729811fbee522ea4008845149c712320fab7..18ff879bfc417844196a92844b110b4660282623 100644 |
--- a/src/base/ftmm.c |
+++ b/src/base/ftmm.c |
@@ -4,7 +4,7 @@ |
/* */ |
/* Multiple Master font support (body). */ |
/* */ |
-/* Copyright 1996-2001, 2003, 2004, 2009 by */ |
+/* Copyright 1996-2001, 2003, 2004, 2009, 2013 by */ |
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -17,6 +17,8 @@ |
#include <ft2build.h> |
+#include FT_INTERNAL_DEBUG_H |
+ |
#include FT_MULTIPLE_MASTERS_H |
#include FT_INTERNAL_OBJECTS_H |
#include FT_SERVICE_MULTIPLE_MASTERS_H |
@@ -42,9 +44,9 @@ |
*aservice = NULL; |
if ( !face ) |
- return FT_Err_Invalid_Face_Handle; |
+ return FT_THROW( Invalid_Face_Handle ); |
- error = FT_Err_Invalid_Argument; |
+ error = FT_ERR( Invalid_Argument ); |
if ( FT_HAS_MULTIPLE_MASTERS( face ) ) |
{ |
@@ -73,7 +75,7 @@ |
error = ft_face_get_mm_service( face, &service ); |
if ( !error ) |
{ |
- error = FT_Err_Invalid_Argument; |
+ error = FT_ERR( Invalid_Argument ); |
if ( service->get_mm ) |
error = service->get_mm( face, amaster ); |
} |
@@ -95,7 +97,7 @@ |
error = ft_face_get_mm_service( face, &service ); |
if ( !error ) |
{ |
- error = FT_Err_Invalid_Argument; |
+ error = FT_ERR( Invalid_Argument ); |
if ( service->get_mm_var ) |
error = service->get_mm_var( face, amaster ); |
} |
@@ -118,7 +120,7 @@ |
error = ft_face_get_mm_service( face, &service ); |
if ( !error ) |
{ |
- error = FT_Err_Invalid_Argument; |
+ error = FT_ERR( Invalid_Argument ); |
if ( service->set_mm_design ) |
error = service->set_mm_design( face, num_coords, coords ); |
} |
@@ -141,7 +143,7 @@ |
error = ft_face_get_mm_service( face, &service ); |
if ( !error ) |
{ |
- error = FT_Err_Invalid_Argument; |
+ error = FT_ERR( Invalid_Argument ); |
if ( service->set_var_design ) |
error = service->set_var_design( face, num_coords, coords ); |
} |
@@ -164,7 +166,7 @@ |
error = ft_face_get_mm_service( face, &service ); |
if ( !error ) |
{ |
- error = FT_Err_Invalid_Argument; |
+ error = FT_ERR( Invalid_Argument ); |
if ( service->set_mm_blend ) |
error = service->set_mm_blend( face, num_coords, coords ); |
} |
@@ -190,7 +192,7 @@ |
error = ft_face_get_mm_service( face, &service ); |
if ( !error ) |
{ |
- error = FT_Err_Invalid_Argument; |
+ error = FT_ERR( Invalid_Argument ); |
if ( service->set_mm_blend ) |
error = service->set_mm_blend( face, num_coords, coords ); |
} |