texlive[42744] Build/source/texk/dvipdfm-x: dvipdfm-x: recover the

[commits+kakuto at tug.org]

Revision: 42744
          http://tug.org/svn/texlive?view=revision&revision=42744
Author:   kakuto
Date:     2016-12-18 23:34:22 +0100 (Sun, 18 Dec 2016)
Log Message:
-----------
dvipdfm-x: recover the original type0.c and tt_cmap.c for [x]dvipdfmx

Modified Paths:
--------------
    trunk/Build/source/texk/dvipdfm-x/tt_cmap.c
    trunk/Build/source/texk/dvipdfm-x/type0.c

Modified: trunk/Build/source/texk/dvipdfm-x/tt_cmap.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tt_cmap.c	2016-12-18 22:04:28 UTC (rev 42743)
+++ trunk/Build/source/texk/dvipdfm-x/tt_cmap.c	2016-12-18 22:34:22 UTC (rev 42744)
@@ -902,6 +902,7 @@
         }
 #undef MAX_UNICODES
         if (unicode_count == -1) {
+#if defined(LIBDPX)
           if(verbose > VERBOSE_LEVEL_MIN) {
             if (name)
               MESG("No Unicode mapping available: GID=%u, name=%s\n", gid, name);
@@ -908,6 +909,12 @@
             else
               MESG("No Unicode mapping available: GID=%u\n", gid);
           }
+#else
+          if (name)
+            MESG("No Unicode mapping available: GID=%u, name=%s\n", gid, name);
+          else
+            MESG("No Unicode mapping available: GID=%u\n", gid);
+#endif /* LIBDPX */
         } else {
           /* the Unicode characters go into wbuf[2] and following, in UTF16BE */
           /* we rely on WBUF_SIZE being more than adequate for MAX_UNICODES  */
@@ -1269,7 +1276,11 @@
       break;
     }
   }
+#if defined(LIBDPX)
   if (cmap_obj == NULL && verbose > VERBOSE_LEVEL_MIN)
+#else
+  if (cmap_obj == NULL)
+#endif /* LIBDPX */
     WARN("Unable to read OpenType/TrueType Unicode cmap table.");
   tt_cmap_release(ttcmap);
   CMap_set_silent(0);

Modified: trunk/Build/source/texk/dvipdfm-x/type0.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/type0.c	2016-12-18 22:04:28 UTC (rev 42743)
+++ trunk/Build/source/texk/dvipdfm-x/type0.c	2016-12-18 22:34:22 UTC (rev 42744)
@@ -254,8 +254,12 @@
     pdf_add_dict(font->fontdict,
                  pdf_new_name("ToUnicode"), tounicode);
   } else {
+#if defined(LIBDPX)
     if (__verbose)
       WARN("Failed to load ToUnicode CMap for font \"%s\"", fontname);
+#else
+    WARN("Failed to load ToUnicode CMap for font \"%s\"", fontname);
+#endif /* LIBDPX */
   }
 
   return;