diff --git a/ChangeLog b/ChangeLog
index 539ac03e9..b3b4a961c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-20  Werner Lemberg  <wl@gnu.org>
+
+	* src/cff/cffgload.c (cff_slot_load): Fix logic of 2007-05-28
+	change.
+
 2007-06-19  Werner Lemberg  <wl@gnu.org>
 
 	* src/type1/t1load.c (parse_encoding): Handle one more error.
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 8fef0ab33..0e2a179c7 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -2566,14 +2566,14 @@
         glyph->root.outline.flags |= FT_OUTLINE_REVERSE_FILL;
 
         /* apply the font matrix */
-        if ( font_matrix.xx != 0x10000L &&
-             font_matrix.yy != 0x10000L &&
-             font_matrix.xy != 0        &&
-             font_matrix.yx != 0        )
+        if ( !( font_matrix.xx == 0x10000L &&
+                font_matrix.yy == 0x10000L &&
+                font_matrix.xy == 0        &&
+                font_matrix.yx == 0        ) )
           FT_Outline_Transform( &glyph->root.outline, &font_matrix );
 
-        if ( font_offset.x != 0 ||
-             font_offset.y != 0 )
+        if ( !( font_offset.x == 0 &&
+                font_offset.y == 0 ) )
           FT_Outline_Translate( &glyph->root.outline,
                                 font_offset.x, font_offset.y );