merged patches from dvipdfmx; bumped version

git-svn-id: svn://tug.org/texlive/trunk@8896 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 7 insertions, 7 deletions

diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure
index 4a6f13ddd48..fb83d510c20 100755
--- a/Build/source/texk/xdvipdfmx/configure
+++ b/Build/source/texk/xdvipdfmx/configure
@@ -2429,7 +2429,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=xdvipdfmx
- VERSION=0.7.1
+ VERSION=0.7.2
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/Build/source/texk/xdvipdfmx/configure.in b/Build/source/texk/xdvipdfmx/configure.in
index 1186a0248d6..bcb6d9bb5d6 100644
--- a/Build/source/texk/xdvipdfmx/configure.in
+++ b/Build/source/texk/xdvipdfmx/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/dvipdfmx.c)
-AM_INIT_AUTOMAKE(xdvipdfmx, 0.7.1)
+AM_INIT_AUTOMAKE(xdvipdfmx, 0.7.2)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
diff --git a/Build/source/texk/xdvipdfmx/src/pdfnames.c b/Build/source/texk/xdvipdfmx/src/pdfnames.c
index a935593af53..1d3b6116e3c 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfnames.c
+++ b/Build/source/texk/xdvipdfmx/src/pdfnames.c
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/pdfnames.c,v 1.2 2008/06/07 09:54:38 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/pdfnames.c,v 1.3 2008/06/18 15:11:45 matthias Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
@@ -177,6 +177,7 @@ pdf_names_add_object (struct ht_table *names,
         if (pdf_obj_get_verbose()) {
 	  WARN("Object reference with key \"%s\" is in use.", printable_key(key, keylen));
         }
+	pdf_release_obj(object);
 	return -1;
       } else {
 	value->object = object;
diff --git a/Build/source/texk/xdvipdfmx/src/spc_pdfm.c b/Build/source/texk/xdvipdfmx/src/spc_pdfm.c
index 7044090b4ba..2d508d436ce 100644
--- a/Build/source/texk/xdvipdfmx/src/spc_pdfm.c
+++ b/Build/source/texk/xdvipdfmx/src/spc_pdfm.c
@@ -1,4 +1,4 @@
-/*  $Header: /home/cvsroot/dvipdfmx/src/spc_pdfm.c,v 1.41 2008/06/16 01:47:13 chofchof Exp $
+/*  $Header: /home/cvsroot/dvipdfmx/src/spc_pdfm.c,v 1.43 2008/06/20 23:18:45 chofchof Exp $
 
     This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
@@ -1013,8 +1013,8 @@ spc_handler_pdfm_bead (struct spc_env *spe, struct spc_arg *args)
   } else {
     rect.llx = cp.x;
     rect.lly = cp.y - spe->mag * ti.depth;
-    rect.urx = rect.llx + spe->mag * ti.width;
-    rect.ury = rect.lly + spe->mag * ti.height;
+    rect.urx = cp.x + spe->mag * ti.width;
+    rect.ury = cp.y + spe->mag * ti.height;
   }
 
   skip_white(&args->curptr, args->endptr);
@@ -1159,7 +1159,6 @@ spc_handler_pdfm_dest (struct spc_env *spe, struct spc_arg *args)
                             pdf_string_value (name),
                             pdf_string_length(name),
                             array);
-  if (error) pdf_release_obj(array);
   pdf_release_obj(name);
 
   return  0;