From 5237993a929fa9030df4e6e359d6d9cacf7e2e97 Mon Sep 17 00:00:00 2001
From: David Turner <david@freetype.org>
Date: Thu, 7 Nov 2002 09:46:43 +0000
Subject: [PATCH] fixed a small bug in the sbit cache that caused problems with
 embedded bitmaps

---
 ChangeLog            | 3 +++
 src/cache/ftcsbits.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index bc1283172..c7fd0a2c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-11-07  David Turner  <david@freetype.org>
 
+        * src/cache/ftcsbit.c (ftc_sbit_node_load): fixed a small bug that caused
+	problems with embedded bitmaps
+
         * src/otlayout/otlayout.h, src/otlyaout/otlconf.h,
         src/otlayout/otlgsub.c, src/otlayout/otlgsub.h, src/otlayout/otlparse.c,
         src/otlayout/otlparse.h, src/otlayout/otlutils.h:
diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c
index 33e44ea50..663467616 100644
--- a/src/cache/ftcsbits.c
+++ b/src/cache/ftcsbits.c
@@ -189,6 +189,8 @@
           sbit->format    = (FT_Byte)bitmap->pixel_mode;
           sbit->max_grays = (FT_Byte)(bitmap->num_grays - 1);
 
+#if 0 /* this doesn't work well with embedded bitmaps !! */
+
           /* grab the bitmap when possible - this is a hack! */
           if ( slot->flags & FT_GLYPH_OWN_BITMAP )
           {
@@ -196,6 +198,7 @@
             sbit->buffer = bitmap->buffer;
           }
           else
+#endif
           {
             /* copy the bitmap into a new buffer -- ignore error */
             error = ftc_sbit_copy_bitmap( sbit, bitmap, memory );