Update to trunk

(bzr r13090.1.35)

4 files changed, 15 insertions, 20 deletions

diff --git a/src/libuemf/uemf.h b/src/libuemf/uemf.h
index a75ba801b..cde1b6c85 100644
--- a/src/libuemf/uemf.h
+++ b/src/libuemf/uemf.h
@@ -95,8 +95,8 @@ these WMF enumerations is by referencing the following table:
 
 /*
 File:      uemf.h
-Version:   0.0.25
-Date:      15-JAN-2014
+Version:   0.0.26
+Date:      27-MAR-2014
 Author:    David Mathog, Biology Division, Caltech
 email:     mathog@caltech.edu
 Copyright: 2014 David Mathog and California Institute of Technology (Caltech)
@@ -129,6 +129,8 @@ extern "C" {
 #define U_SYSPAL_NOSTATIC 2
 
 #define U_ELF_VENDOR_SIZE 4
+
+#define UNUSED_PARAMETER(x) (void)(x)
 /** \endcond */
 
 //  ***************************************************************************
diff --git a/src/libuemf/uemf_endian.c b/src/libuemf/uemf_endian.c
index 8f2be57da..2d19361e1 100644
--- a/src/libuemf/uemf_endian.c
+++ b/src/libuemf/uemf_endian.c
@@ -19,8 +19,8 @@
 
 /*
 File:      uemf_endian.c
-Version:   0.0.15
-Date:      24-MAR-2014
+Version:   0.0.16
+Date:      27-MAR-2014
 Author:    David Mathog, Biology Division, Caltech
 email:     mathog@caltech.edu
 Copyright: 2014 David Mathog and California Institute of Technology (Caltech)
@@ -36,10 +36,6 @@ extern "C" {
 #include "uemf.h"
 #include "uemf_endian.h"
 
-// Unfortunately, C does not allow unnamed function arguments, so use this macro instead...
-#define UNUSED(x) (void)(x)
-
-
 // hide almost everuything in here from Doxygen
 //! \cond
 
@@ -429,8 +425,7 @@ by end user code and to further that end prototypes are NOT provided and they ar
 // all core*_swap call this, U_EMRSETMARGN_swap and some others all it directly
 // numbered as core5 to be consistent with uemf.c, but must appear before the others as there is no prototype
 void core5_swap(char *record, int torev){
-   UNUSED(torev);
-
+   UNUSED_PARAMETER(torev);
    PU_ENHMETARECORD pEMR = (PU_ENHMETARECORD)(record);
    U_swap4(pEMR,2);                         // iType nSize
 }
diff --git a/src/libuemf/upmf.c b/src/libuemf/upmf.c
index 3c652c9b8..01f7ba3a4 100644
--- a/src/libuemf/upmf.c
+++ b/src/libuemf/upmf.c
@@ -21,8 +21,8 @@
 
 /*
 File:      upmf.c
-Version:   0.0.5
-Date:      24-MAR-2014
+Version:   0.0.6
+Date:      26-MAR-2014
 Author:    David Mathog, Biology Division, Caltech
 email:     mathog@caltech.edu
 Copyright: 2014 David Mathog and California Institute of Technology (Caltech)
diff --git a/src/libuemf/uwmf_endian.c b/src/libuemf/uwmf_endian.c
index 5fbb450dc..38a321ad0 100644
--- a/src/libuemf/uwmf_endian.c
+++ b/src/libuemf/uwmf_endian.c
@@ -6,11 +6,11 @@
 
 /*
 File:      uwmf_endian.c
-Version:   0.1.2
-Date:      18-FEB-2013
+Version:   0.1.3
+Date:      27-MAR-2014
 Author:    David Mathog, Biology Division, Caltech
 email:     mathog@caltech.edu
-Copyright: 2012 David Mathog and California Institute of Technology (Caltech)
+Copyright: 2014 David Mathog and California Institute of Technology (Caltech)
 */
 
 #ifdef __cplusplus
@@ -24,8 +24,6 @@ extern "C" {
 #include "uwmf.h"
 #include "uwmf_endian.h"
 
-#define UNUSED(x) (void)(x)
-
 // hide almost everything in this file from Doxygen
 //! \cond
 /* Prototypes for functions used here and defined in uemf_endian.c, but which are not supposed
@@ -284,7 +282,7 @@ by end user code and to further that end prototypes are NOT provided and they ar
 
 /* Size16 EVERY record type should call this, directly or indirectly*/
 void U_WMRCORE_SIZE16_swap(char *record, int torev){
-   UNUSED(torev);
+   UNUSED_PARAMETER(torev);
    U_swap4(record, 1); /* Size16_4 is at offset 0 in U_METARECORD */
 }
 
@@ -309,7 +307,7 @@ void U_WMRCORE_U16_N16_swap(char *record, int torev){
 
 /* all records that specify palette objects */
 void U_WMRCORE_PALETTE_swap(char *record, int torev){
-   UNUSED(torev);
+   UNUSED_PARAMETER(torev);
    U_WMRCORE_SIZE16_swap(record, torev);
    palette_swap(record + offsetof(U_WMRANIMATEPALETTE,Palette));
 }
@@ -702,7 +700,7 @@ void U_WMRDIBCREATEPATTERNBRUSH_swap(char *record, int torev){
 }
 
 void U_WMRSTRETCHDIB_swap(char *record, int torev){
-   UNUSED(torev);
+   UNUSED_PARAMETER(torev);
    U_WMRCORE_U32_N16_swap(record,9,torev);
    dibheader_swap(record + offsetof(U_WMRSTRETCHDIB,dib), torev);
 }