[cairo-commit] 3 commits - boilerplate/cairo-test-directfb.c src/cairo-type1-fallback.c

[Christian Biesinger]

 boilerplate/cairo-test-directfb.c |    1 +
 src/cairo-type1-fallback.c        |   16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
diff-tree bd5d7c1fb2331c487c934c20f6067455e0a4ca3d (from 2313f69066152034ac977776bee88f0c77b76aca)
Author: Christian Biesinger <cbiesinger at web.de>
Date:   Sun Oct 22 20:08:07 2006 +0200

    Don't return an uninitialized value if _cairo_output_stream_create fails

diff --git a/src/cairo-type1-fallback.c b/src/cairo-type1-fallback.c
index f71c3c8..0229e0d 100644
--- a/src/cairo-type1-fallback.c
+++ b/src/cairo-type1-fallback.c
@@ -553,8 +553,10 @@ cairo_type1_font_write_private_dict (cai
         cairo_type1_write_stream_encrypted,
         NULL,
         font);
-    if (encrypted_output == NULL)
+    if (encrypted_output == NULL) {
+	status = CAIRO_STATUS_NO_MEMORY;
 	goto fail;
+    }
 
     /* Note: the first four spaces at the start of this private dict
      * are the four "random" bytes of plaintext required by the
diff-tree 2313f69066152034ac977776bee88f0c77b76aca (from 153f2d1cad171eba7b63d6ceefea2a26ffd8b532)
Author: Christian Biesinger <cbiesinger at web.de>
Date:   Sun Oct 22 20:07:57 2006 +0200

    Fix prototype warning by including cairo-test-directfb.h

diff --git a/boilerplate/cairo-test-directfb.c b/boilerplate/cairo-test-directfb.c
index aecb822..3d216b3 100644
--- a/boilerplate/cairo-test-directfb.c
+++ b/boilerplate/cairo-test-directfb.c
@@ -14,6 +14,7 @@ make check
 #include "cairo-boilerplate.h"
 #include <directfb.h>
 #include "cairo-directfb.h"
+#include "cairo-test-directfb.h"
 
 /* macro for a safe call to DirectFB functions */
 #define DFBCHECK(x...) \
diff-tree 153f2d1cad171eba7b63d6ceefea2a26ffd8b532 (from d6ebe07be214461b6d456ebdbdc5acfd432e0178)
Author: Christian Biesinger <cbiesinger at web.de>
Date:   Sun Oct 22 20:07:25 2006 +0200

    Actually return a value from _cairo_type1_fallback_init_*

diff --git a/src/cairo-type1-fallback.c b/src/cairo-type1-fallback.c
index 485ec01..f71c3c8 100644
--- a/src/cairo-type1-fallback.c
+++ b/src/cairo-type1-fallback.c
@@ -746,9 +746,9 @@ _cairo_type1_fallback_init_binary (cairo
                                    const char		      *name,
                                    cairo_scaled_font_subset_t *scaled_font_subset)
 {
-    _cairo_type1_fallback_init_internal (type1_subset,
-                                         name,
-                                         scaled_font_subset, FALSE);
+    return _cairo_type1_fallback_init_internal (type1_subset,
+                                                name,
+                                                scaled_font_subset, FALSE);
 }
 
 cairo_status_t
@@ -756,9 +756,9 @@ _cairo_type1_fallback_init_hex (cairo_ty
                                 const char		   *name,
                                 cairo_scaled_font_subset_t *scaled_font_subset)
 {
-    _cairo_type1_fallback_init_internal (type1_subset,
-                                         name,
-                                         scaled_font_subset, TRUE);
+    return _cairo_type1_fallback_init_internal (type1_subset,
+                                                name,
+                                                scaled_font_subset, TRUE);
 }
 
 void