[cairo-commit] src/cairo-pdf-surface.c

[Adrian Johnson]

 src/cairo-pdf-surface.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

New commits:
diff-tree dc0043383b24425282ce38ba06422991c37c1d7e (from 7d03fe94d76eee7b3e4bcc274effaa26bc9bd9af)
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Thu Mar 1 23:39:10 2007 +1030

    PDF: Ensure ToUnicode CMap name is unique
    
    and remove an unused printf argument.

diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
index 938a4f0..611c7c7 100644
--- a/src/cairo-pdf-surface.c
+++ b/src/cairo-pdf-surface.c
@@ -1665,16 +1665,19 @@ _cairo_pdf_surface_emit_toUnicode_stream
                                  "12 dict begin\r\n"
                                  "begincmap\r\n"
                                  "/CIDSystemInfo\r\n"
-                                 "<< /Registry (Adobe)\r\n"
-                                 "   /Ordering (UCS)\r\n"
+                                 "<< /Registry (Cairo)\r\n"
+                                 "   /Ordering (ToUnicode-%d-%d)\r\n"
                                  "   /Supplement 0\r\n"
                                  ">> def\r\n"
-                                 "/CMapName /Adobe-Identity-UCS def\r\n"
+                                 "/CMapName /Cairo-ToUnicode-%d-%d def\r\n"
                                  "/CMapType 2 def\r\n"
                                  "1 begincodespacerange\r\n"
                                  "<00> <ff>\r\n"
                                  "endcodespacerange\r\n",
-                                 stream.id);
+                                 font_subset->font_id,
+                                 font_subset->subset_id,
+                                 font_subset->font_id,
+                                 font_subset->subset_id);
 
     /* The CMap specification has a limit of 100 characters per beginbfchar operator */
     _cairo_output_stream_printf (surface->output,