Hello community, here is the log from the commit of package libgxps for openSUSE:Factory checked in at 2019-02-04 21:18:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgxps (Old) and /work/SRC/openSUSE:Factory/.libgxps.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgxps" Mon Feb 4 21:18:05 2019 rev:19 rq:666152 version:0.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libgxps/libgxps.changes 2018-03-08 10:54:31.483762353 +0100 +++ /work/SRC/openSUSE:Factory/.libgxps.new.28833/libgxps.changes 2019-02-04 21:18:06.411720827 +0100 @@ -1,0 +2,14 @@ +Sat Jan 5 17:04:54 UTC 2019 - [email protected] + +- Update to version 0.3.1: + + Fix font scaling when converting xps to pdf. + + Handle errors returned by archive_read_data in GXPSArchive. + + Ensure gxps_archive_read_entry() fills the GError in case of + failure. + + Make the pdf generated by xpstopdf to be 96 dpi. + + Fix OUTPUT FILE description in man pages. + + Clear the GError before trying to load an image again in + gxps_images_get_image(). + + Fix integer overflow in png decoder. + +------------------------------------------------------------------- Old: ---- libgxps-0.3.0.tar.xz New: ---- libgxps-0.3.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgxps.spec ++++++ --- /var/tmp/diff_new_pack.yr0E0L/_old 2019-02-04 21:18:08.223720144 +0100 +++ /var/tmp/diff_new_pack.yr0E0L/_new 2019-02-04 21:18:08.223720144 +0100 @@ -1,7 +1,7 @@ # # spec file for package libgxps # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: libgxps -Version: 0.3.0 +Version: 0.3.1 Release: 0 Summary: Library for rendering XPS documents License: LGPL-2.1-or-later @@ -25,6 +25,7 @@ URL: https://live.gnome.org/libgxps Source0: https://download.gnome.org/sources/libgxps/0.3/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc + BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: libjpeg-devel @@ -84,7 +85,7 @@ documents. %prep -%setup -q +%autosetup -p1 %build %meson \ ++++++ libgxps-0.3.0.tar.xz -> libgxps-0.3.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/NEWS new/libgxps-0.3.1/NEWS --- old/libgxps-0.3.0/NEWS 2017-08-09 14:57:59.000000000 +0200 +++ new/libgxps-0.3.1/NEWS 2019-01-05 09:30:40.000000000 +0100 @@ -1,3 +1,21 @@ +libgxps 0.3.1 (5 January 2019) +============================== + +Bug fixes: + + - Fix font scaling when converting xps to pdf (#1, Ignazio Pillai) + - Handle errors returned by archive_read_data in GXPSArchive + (Carlos Garcia Campos) + - Ensure gxps_archive_read_entry() fills the GError in case of + failure (Carlos Garcia Campos) + - Make the pdf generated by xpstopdf to be 96 dpi (Ignacio Casal + Quinteiro) + - Fix OUTPUT FILE description in man pages (Jason Crain) + - Clear the GError before trying to load an image again in + gxps_images_get_image() (Carlos Garcia Campos) + - Fix integer overflow in png decoder (Carlos Garcia Campos) + + libgxps 0.3.0 (8 August 2017) ================================ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/GXPSCoreProperties.html new/libgxps-0.3.1/docs/reference/html/GXPSCoreProperties.html --- old/libgxps-0.3.0/docs/reference/html/GXPSCoreProperties.html 2017-08-09 14:58:20.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/GXPSCoreProperties.html 2019-01-05 09:39:21.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="GXPS"> <link rel="prev" href="GXPSDocumentStructure.html" title="GXPSDocumentStructure"> <link rel="next" href="libgxps-GXPSError.html" title="GXPSError"> -<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -690,6 +690,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25.1</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/GXPSDocument.html new/libgxps-0.3.1/docs/reference/html/GXPSDocument.html --- old/libgxps-0.3.0/docs/reference/html/GXPSDocument.html 2017-08-09 14:58:20.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/GXPSDocument.html 2019-01-05 09:39:21.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="GXPS"> <link rel="prev" href="GXPSFile.html" title="GXPSFile"> <link rel="next" href="GXPSPage.html" title="GXPSPage"> -<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -213,7 +213,7 @@ </div> <div class="refsect3"> <a name="gxps-document-get-page.returns"></a><h4>Returns</h4> -<p> a new <a class="link" href="GXPSPage.html" title="GXPSPage"><span class="type">GXPSPage</span></a> or <code class="literal">NULL</code> on error. +<p>a new <a class="link" href="GXPSPage.html" title="GXPSPage"><span class="type">GXPSPage</span></a> or <code class="literal">NULL</code> on error. Free the returned object with <code class="function">g_object_unref()</code>. </p> <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p> </div> @@ -259,13 +259,13 @@ </tr> <tr> <td class="parameter_name"><p>width</p></td> -<td class="parameter_description"><p> return location for the width of <em class="parameter"><code>n_page</code></em> +<td class="parameter_description"><p>return location for the width of <em class="parameter"><code>n_page</code></em> . </p></td> <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td> </tr> <tr> <td class="parameter_name"><p>height</p></td> -<td class="parameter_description"><p> return location for the height of <em class="parameter"><code>n_page</code></em> +<td class="parameter_description"><p>return location for the height of <em class="parameter"><code>n_page</code></em> . </p></td> <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td> </tr> @@ -340,7 +340,7 @@ </div> <div class="refsect3"> <a name="gxps-document-get-structure.returns"></a><h4>Returns</h4> -<p> a new <a class="link" href="GXPSDocumentStructure.html" title="GXPSDocumentStructure"><span class="type">GXPSDocumentStructure</span></a> or <code class="literal">NULL</code> if document doesn't have a structure. +<p>a new <a class="link" href="GXPSDocumentStructure.html" title="GXPSDocumentStructure"><span class="type">GXPSDocumentStructure</span></a> or <code class="literal">NULL</code> if document doesn't have a structure. Free the returned object with <code class="function">g_object_unref()</code>. </p> <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p> </div> @@ -378,6 +378,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25.1</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/GXPSDocumentStructure.html new/libgxps-0.3.1/docs/reference/html/GXPSDocumentStructure.html --- old/libgxps-0.3.0/docs/reference/html/GXPSDocumentStructure.html 2017-08-09 14:58:20.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/GXPSDocumentStructure.html 2019-01-05 09:39:21.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="GXPS"> <link rel="prev" href="libgxps-GXPS-Links.html" title="GXPS Links"> <link rel="next" href="GXPSCoreProperties.html" title="GXPSCoreProperties"> -<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -219,25 +219,25 @@ 17 18 19</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="type">static</span> <span class="type">void</span> -walk_outline (GXPSOutlineIter *iter) -{ - <span class="keyword">do</span> { - GXPSOutlineIter child_iter; - <span class="type">const</span> gchar *description = gxps_outline_iter_get_description (iter); - GXPSLinkTarget *target = gxps_outline_iter_get_target (iter); + <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static void</span> +<span class="function">walk_outline</span> <span class="gtkdoc opt">(</span>GXPSOutlineIter <span class="gtkdoc opt">*</span>iter<span class="gtkdoc opt">)</span> +<span class="gtkdoc opt">{</span> + <span class="keyword">do</span> <span class="gtkdoc opt">{</span> + GXPSOutlineIter child_iter<span class="gtkdoc opt">;</span> + <span class="gtkdoc kwb">const</span> gchar <span class="gtkdoc opt">*</span>description <span class="gtkdoc opt">=</span> <span class="function"><a href="GXPSDocumentStructure.html#gxps-outline-iter-get-description">gxps_outline_iter_get_description</a></span> <span class="gtkdoc opt">(</span>iter<span class="gtkdoc opt">);</span> + GXPSLinkTarget <span class="gtkdoc opt">*</span>target <span class="gtkdoc opt">=</span> <span class="function"><a href="GXPSDocumentStructure.html#gxps-outline-iter-get-target">gxps_outline_iter_get_target</a></span> <span class="gtkdoc opt">(</span>iter<span class="gtkdoc opt">);</span> - <span class="comment">/*</span><span class="comment"> Do something with description and taregt </span><span class="comment">*/</span> - <span class="keyword">if</span> (gxps_outline_iter_children (&child_iter, iter)) - walk_outline (&child_iter); - } <span class="keyword">while</span> (gxps_outline_iter_next (iter)); -} -... -{ - GXPSOutlineIter iter; - <span class="keyword">if</span> (gxps_document_structure_outline_iter_init (&iter, structure)) - walk_outline (&iter); -}</pre></td> + <span class="comment">/* Do something with description and taregt */</span> + <span class="keyword">if</span> <span class="gtkdoc opt">(</span><span class="function"><a href="GXPSDocumentStructure.html#gxps-outline-iter-children">gxps_outline_iter_children</a></span> <span class="gtkdoc opt">(&</span>child_iter<span class="gtkdoc opt">,</span> iter<span class="gtkdoc opt">))</span> + <span class="function">walk_outline</span> <span class="gtkdoc opt">(&</span>child_iter<span class="gtkdoc opt">);</span> + <span class="gtkdoc opt">}</span> <span class="keyword">while</span> <span class="gtkdoc opt">(</span><span class="function"><a href="GXPSDocumentStructure.html#gxps-outline-iter-next">gxps_outline_iter_next</a></span> <span class="gtkdoc opt">(</span>iter<span class="gtkdoc opt">));</span> +<span class="gtkdoc opt">}</span> +<span class="gtkdoc opt">...</span> +<span class="gtkdoc opt">{</span> + GXPSOutlineIter iter<span class="gtkdoc opt">;</span> + <span class="keyword">if</span> <span class="gtkdoc opt">(</span><span class="function"><a href="GXPSDocumentStructure.html#gxps-document-structure-outline-iter-init">gxps_document_structure_outline_iter_init</a></span> <span class="gtkdoc opt">(&</span>iter<span class="gtkdoc opt">,</span> structure<span class="gtkdoc opt">))</span> + <span class="function">walk_outline</span> <span class="gtkdoc opt">(&</span>iter<span class="gtkdoc opt">);</span> +<span class="gtkdoc opt">}</span></pre></td> </tr> </tbody> </table> @@ -448,6 +448,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25.1</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/GXPSFile.html new/libgxps-0.3.1/docs/reference/html/GXPSFile.html --- old/libgxps-0.3.0/docs/reference/html/GXPSFile.html 2017-08-09 14:58:20.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/GXPSFile.html 2019-01-05 09:39:21.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="GXPS"> <link rel="prev" href="ch01.html" title="GXPS"> <link rel="next" href="GXPSDocument.html" title="GXPSDocument"> -<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -250,7 +250,7 @@ </div> <div class="refsect3"> <a name="gxps-file-get-document.returns"></a><h4>Returns</h4> -<p> a new <a class="link" href="GXPSDocument.html" title="GXPSDocument"><span class="type">GXPSDocument</span></a> or <code class="literal">NULL</code> on error. +<p>a new <a class="link" href="GXPSDocument.html" title="GXPSDocument"><span class="type">GXPSDocument</span></a> or <code class="literal">NULL</code> on error. Free the returned object with <code class="function">g_object_unref()</code>. </p> <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p> </div> @@ -335,7 +335,7 @@ </div> <div class="refsect3"> <a name="gxps-file-get-core-properties.returns"></a><h4>Returns</h4> -<p> a new <a class="link" href="GXPSCoreProperties.html" title="GXPSCoreProperties"><span class="type">GXPSCoreProperties</span></a> or <code class="literal">NULL</code>. +<p>a new <a class="link" href="GXPSCoreProperties.html" title="GXPSCoreProperties"><span class="type">GXPSCoreProperties</span></a> or <code class="literal">NULL</code>. Free the returned object with <code class="function">g_object_unref()</code>. </p> <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p> </div> @@ -396,6 +396,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25.1</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/GXPSPage.html new/libgxps-0.3.1/docs/reference/html/GXPSPage.html --- old/libgxps-0.3.0/docs/reference/html/GXPSPage.html 2017-08-09 14:58:20.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/GXPSPage.html 2019-01-05 09:39:21.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="GXPS"> <link rel="prev" href="GXPSDocument.html" title="GXPSDocument"> <link rel="next" href="libgxps-GXPS-Links.html" title="GXPS Links"> -<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -173,12 +173,12 @@ </tr> <tr> <td class="parameter_name"><p>width</p></td> -<td class="parameter_description"><p> return location for the page width. </p></td> +<td class="parameter_description"><p>return location for the page width. </p></td> <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td> </tr> <tr> <td class="parameter_name"><p>height</p></td> -<td class="parameter_description"><p> return location for the page height. </p></td> +<td class="parameter_description"><p>return location for the page height. </p></td> <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td> </tr> </tbody> @@ -264,7 +264,7 @@ </div> <div class="refsect3"> <a name="gxps-page-get-links.returns"></a><h4>Returns</h4> -<p> a <span class="type">GList</span> +<p>a <span class="type">GList</span> of <a class="link" href="libgxps-GXPS-Links.html#GXPSLink"><span class="type">GXPSLink</span></a> items. </p> <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> GXPS.Link][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p> </div> @@ -306,7 +306,7 @@ </tr> <tr> <td class="parameter_name"><p>area</p></td> -<td class="parameter_description"><p> return location for page area of <em class="parameter"><code>anchor</code></em> +<td class="parameter_description"><p>return location for page area of <em class="parameter"><code>anchor</code></em> . </p></td> <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td> </tr> @@ -405,6 +405,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25.1</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/annotation-glossary.html new/libgxps-0.3.1/docs/reference/html/annotation-glossary.html --- old/libgxps-0.3.0/docs/reference/html/annotation-glossary.html 2017-08-09 14:58:20.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/annotation-glossary.html 2019-01-05 09:39:21.000000000 +0100 @@ -7,7 +7,7 @@ <link rel="home" href="index.html" title="GXPS Reference Manual"> <link rel="up" href="index.html" title="GXPS Reference Manual"> <link rel="prev" href="api-index-0-2-3.html" title="Index of new symbols in 0.2.3"> -<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -43,6 +43,6 @@ <dd class="glossdef"><p>Don't free data after the code is done.</p></dd> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25.1</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/api-index-0-2-1.html new/libgxps-0.3.1/docs/reference/html/api-index-0-2-1.html --- old/libgxps-0.3.0/docs/reference/html/api-index-0-2-1.html 2017-08-09 14:58:20.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/api-index-0-2-1.html 2019-01-05 09:39:21.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="GXPS Reference Manual"> <link rel="prev" href="api-index-full.html" title="Index of all symbols"> <link rel="next" href="api-index-0-2-3.html" title="Index of new symbols in 0.2.3"> -<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -29,6 +29,6 @@ <dd></dd> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25.1</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/api-index-0-2-3.html new/libgxps-0.3.1/docs/reference/html/api-index-0-2-3.html --- old/libgxps-0.3.0/docs/reference/html/api-index-0-2-3.html 2017-08-09 14:58:20.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/api-index-0-2-3.html 2019-01-05 09:39:21.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="GXPS Reference Manual"> <link rel="prev" href="api-index-0-2-1.html" title="Index of new symbols in 0.2.1"> <link rel="next" href="annotation-glossary.html" title="Annotation Glossary"> -<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -89,6 +89,6 @@ <dd></dd> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25.1</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/api-index-full.html new/libgxps-0.3.1/docs/reference/html/api-index-full.html --- old/libgxps-0.3.0/docs/reference/html/api-index-full.html 2017-08-09 14:58:20.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/api-index-full.html 2019-01-05 09:39:21.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="GXPS Reference Manual"> <link rel="prev" href="libgxps-Version-Information.html" title="Version Information"> <link rel="next" href="api-index-0-2-1.html" title="Index of new symbols in 0.2.1"> -<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -341,6 +341,6 @@ <dd></dd> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25.1</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/ch01.html new/libgxps-0.3.1/docs/reference/html/ch01.html --- old/libgxps-0.3.0/docs/reference/html/ch01.html 2017-08-09 14:58:20.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/ch01.html 2019-01-05 09:39:21.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="GXPS Reference Manual"> <link rel="prev" href="index.html" title="GXPS Reference Manual"> <link rel="next" href="GXPSFile.html" title="GXPSFile"> -<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -50,6 +50,6 @@ </dl></div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25.1</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/index.html new/libgxps-0.3.1/docs/reference/html/index.html --- old/libgxps-0.3.0/docs/reference/html/index.html 2017-08-09 14:58:20.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/index.html 2019-01-05 09:39:21.000000000 +0100 @@ -6,7 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets V1.79.1"> <link rel="home" href="index.html" title="GXPS Reference Manual"> <link rel="next" href="ch01.html" title="GXPS"> -<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GXPS Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for libgxps 0.3.0 + for libgxps 0.3.1 </p></div> </div> @@ -56,6 +56,6 @@ </dl></div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25.1</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/libgxps-GXPS-Links.html new/libgxps-0.3.1/docs/reference/html/libgxps-GXPS-Links.html --- old/libgxps-0.3.0/docs/reference/html/libgxps-GXPS-Links.html 2017-08-09 14:58:20.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/libgxps-GXPS-Links.html 2019-01-05 09:39:21.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="GXPS"> <link rel="prev" href="GXPSPage.html" title="GXPSPage"> <link rel="next" href="GXPSDocumentStructure.html" title="GXPSDocumentStructure"> -<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -373,7 +373,7 @@ </div> <div class="refsect3"> <a name="gxps-link-get-target.returns"></a><h4>Returns</h4> -<p> the <a class="link" href="libgxps-GXPS-Links.html#GXPSLinkTarget"><span class="type">GXPSLinkTarget</span></a> of <em class="parameter"><code>link</code></em> +<p>the <a class="link" href="libgxps-GXPS-Links.html#GXPSLinkTarget"><span class="type">GXPSLinkTarget</span></a> of <em class="parameter"><code>link</code></em> . </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p> </div> @@ -403,7 +403,7 @@ </tr> <tr> <td class="parameter_name"><p>area</p></td> -<td class="parameter_description"><p> return location for page area. </p></td> +<td class="parameter_description"><p>return location for page area. </p></td> <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td> </tr> </tbody> @@ -431,6 +431,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25.1</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/libgxps-GXPSError.html new/libgxps-0.3.1/docs/reference/html/libgxps-GXPSError.html --- old/libgxps-0.3.0/docs/reference/html/libgxps-GXPSError.html 2017-08-09 14:58:20.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/libgxps-GXPSError.html 2019-01-05 09:39:21.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="GXPS"> <link rel="prev" href="GXPSCoreProperties.html" title="GXPSCoreProperties"> <link rel="next" href="libgxps-Version-Information.html" title="Version Information"> -<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -113,6 +113,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25.1</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/libgxps-Version-Information.html new/libgxps-0.3.1/docs/reference/html/libgxps-Version-Information.html --- old/libgxps-0.3.0/docs/reference/html/libgxps-Version-Information.html 2017-08-09 14:58:20.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/libgxps-Version-Information.html 2019-01-05 09:39:21.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="GXPS"> <link rel="prev" href="libgxps-GXPSError.html" title="GXPSError"> <link rel="next" href="api-index-full.html" title="Index of all symbols"> -<meta name="generator" content="GTK-Doc V1.25.1 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -156,6 +156,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25.1</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/reference/html/style.css new/libgxps-0.3.1/docs/reference/html/style.css --- old/libgxps-0.3.0/docs/reference/html/style.css 2017-08-09 14:58:19.000000000 +0200 +++ new/libgxps-0.3.1/docs/reference/html/style.css 2019-01-05 09:39:21.000000000 +0100 @@ -30,6 +30,10 @@ vertical-align: top; } +span.nowrap { + white-space: nowrap; +} + div.gallery-float { float: left; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/tools/xpstojpeg.1 new/libgxps-0.3.1/docs/tools/xpstojpeg.1 --- old/libgxps-0.3.0/docs/tools/xpstojpeg.1 2017-08-09 14:56:24.000000000 +0200 +++ new/libgxps-0.3.1/docs/tools/xpstojpeg.1 2019-01-05 09:38:37.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: xpstojpeg .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 08/09/2017 +.\" Date: 01/05/2019 .\" Manual: XPS Tools .\" Source: XPS Tools .\" Language: English .\" -.TH "XPSTOJPEG" "1" "08/09/2017" "XPS Tools" "XPS Tools" +.TH "XPSTOJPEG" "1" "01/05/2019" "XPS Tools" "XPS Tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/tools/xpstopdf.1 new/libgxps-0.3.1/docs/tools/xpstopdf.1 --- old/libgxps-0.3.0/docs/tools/xpstopdf.1 2017-08-09 14:56:24.000000000 +0200 +++ new/libgxps-0.3.1/docs/tools/xpstopdf.1 2019-01-05 09:38:37.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: xpstopdf .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 08/09/2017 +.\" Date: 01/05/2019 .\" Manual: XPS Tools .\" Source: XPS Tools .\" Language: English .\" -.TH "XPSTOPDF" "1" "08/09/2017" "XPS Tools" "XPS Tools" +.TH "XPSTOPDF" "1" "01/05/2019" "XPS Tools" "XPS Tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -42,7 +42,7 @@ \fIOUTPUT FILE\fR\&. If \fIOUTPUT FILE\fR is not specified the output filename will be derived from the -\fIOUTPUT FILE\fR +\fIFILE\fR filename\&. .SH "OPTIONS" .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/tools/xpstopdf.xml new/libgxps-0.3.1/docs/tools/xpstopdf.xml --- old/libgxps-0.3.0/docs/tools/xpstopdf.xml 2017-08-09 14:57:59.000000000 +0200 +++ new/libgxps-0.3.1/docs/tools/xpstopdf.xml 2019-01-05 09:30:40.000000000 +0100 @@ -27,7 +27,7 @@ <command>xpstopdf</command> reads the XPS file, <replaceable>FILE</replaceable>, and writes a PDF file, <replaceable>OUTPUT FILE</replaceable>. If <replaceable>OUTPUT FILE</replaceable> is not specified the output - filename will be derived from the <replaceable>OUTPUT FILE</replaceable> + filename will be derived from the <replaceable>FILE</replaceable> filename. </para> </refsect1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/tools/xpstopng.1 new/libgxps-0.3.1/docs/tools/xpstopng.1 --- old/libgxps-0.3.0/docs/tools/xpstopng.1 2017-08-09 14:56:24.000000000 +0200 +++ new/libgxps-0.3.1/docs/tools/xpstopng.1 2019-01-05 09:38:37.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: xpstopng .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 08/09/2017 +.\" Date: 01/05/2019 .\" Manual: XPS Tools .\" Source: XPS Tools .\" Language: English .\" -.TH "XPSTOPNG" "1" "08/09/2017" "XPS Tools" "XPS Tools" +.TH "XPSTOPNG" "1" "01/05/2019" "XPS Tools" "XPS Tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/tools/xpstops.1 new/libgxps-0.3.1/docs/tools/xpstops.1 --- old/libgxps-0.3.0/docs/tools/xpstops.1 2017-08-09 14:56:24.000000000 +0200 +++ new/libgxps-0.3.1/docs/tools/xpstops.1 2019-01-05 09:38:37.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: xpstops .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 08/09/2017 +.\" Date: 01/05/2019 .\" Manual: XPS Tools .\" Source: XPS Tools .\" Language: English .\" -.TH "XPSTOPS" "1" "08/09/2017" "XPS Tools" "XPS Tools" +.TH "XPSTOPS" "1" "01/05/2019" "XPS Tools" "XPS Tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -42,7 +42,7 @@ \fIOUTPUT FILE\fR\&. If \fIOUTPUT FILE\fR is not specified the output filename will be derived from the -\fIOUTPUT FILE\fR +\fIFILE\fR filename\&. .SH "OPTIONS" .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/tools/xpstops.xml new/libgxps-0.3.1/docs/tools/xpstops.xml --- old/libgxps-0.3.0/docs/tools/xpstops.xml 2017-08-09 14:57:59.000000000 +0200 +++ new/libgxps-0.3.1/docs/tools/xpstops.xml 2019-01-05 09:30:40.000000000 +0100 @@ -27,7 +27,7 @@ <command>xpstops</command> reads the XPS file, <replaceable>FILE</replaceable>, and writes a PostScript file, <replaceable>OUTPUT FILE</replaceable>. If <replaceable>OUTPUT FILE</replaceable> is not specified the output - filename will be derived from the <replaceable>OUTPUT FILE</replaceable> + filename will be derived from the <replaceable>FILE</replaceable> filename. </para> </refsect1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/tools/xpstosvg.1 new/libgxps-0.3.1/docs/tools/xpstosvg.1 --- old/libgxps-0.3.0/docs/tools/xpstosvg.1 2017-08-09 14:56:24.000000000 +0200 +++ new/libgxps-0.3.1/docs/tools/xpstosvg.1 2019-01-05 09:38:37.000000000 +0100 @@ -2,12 +2,12 @@ .\" Title: xpstosvg .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 08/09/2017 +.\" Date: 01/05/2019 .\" Manual: XPS Tools .\" Source: XPS Tools .\" Language: English .\" -.TH "XPSTOSVG" "1" "08/09/2017" "XPS Tools" "XPS Tools" +.TH "XPSTOSVG" "1" "01/05/2019" "XPS Tools" "XPS Tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -42,7 +42,7 @@ \fIOUTPUT FILE\fR\&. If \fIOUTPUT FILE\fR is not specified the output filename will be derived from the -\fIOUTPUT FILE\fR +\fIFILE\fR filename\&. .SH "OPTIONS" .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/docs/tools/xpstosvg.xml new/libgxps-0.3.1/docs/tools/xpstosvg.xml --- old/libgxps-0.3.0/docs/tools/xpstosvg.xml 2017-08-09 14:57:59.000000000 +0200 +++ new/libgxps-0.3.1/docs/tools/xpstosvg.xml 2019-01-05 09:30:40.000000000 +0100 @@ -27,7 +27,7 @@ <command>xpstosvg</command> reads the XPS file, <replaceable>FILE</replaceable>, and writes a SVG file, <replaceable>OUTPUT FILE</replaceable>. If <replaceable>OUTPUT FILE</replaceable> is not specified the output - filename will be derived from the <replaceable>OUTPUT FILE</replaceable> + filename will be derived from the <replaceable>FILE</replaceable> filename. </para> </refsect1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/libgxps/gxps-archive.c new/libgxps-0.3.1/libgxps/gxps-archive.c --- old/libgxps-0.3.0/libgxps/gxps-archive.c 2017-08-09 14:57:59.000000000 +0200 +++ new/libgxps-0.3.1/libgxps/gxps-archive.c 2019-01-05 09:30:40.000000000 +0100 @@ -406,9 +406,13 @@ gboolean retval; stream = gxps_archive_open (archive, path); - if (!stream) - /* TODO: Error */ + if (!stream) { + g_set_error (error, + G_IO_ERROR, + G_IO_ERROR_NOT_FOUND, + "The entry '%s' was not found in archive", path); return FALSE; + } entry_size = archive_entry_size (GXPS_ARCHIVE_INPUT_STREAM (stream)->entry); if (entry_size <= 0) { @@ -423,7 +427,7 @@ *buffer = g_malloc (buffer_size); do { bytes = g_input_stream_read (stream, &buf, BUFFER_SIZE, NULL, error); - if (*error != NULL) { + if (bytes < 0) { g_free (*buffer); g_object_unref (stream); @@ -441,7 +445,10 @@ g_object_unref (stream); if (*bytes_read == 0) { - /* TODO: Error */ + g_set_error (error, + G_IO_ERROR, + G_IO_ERROR_INVALID_DATA, + "The entry '%s' is empty in archive", path); g_free (*buffer); return FALSE; } @@ -513,6 +520,13 @@ return -1; bytes_read = archive_read_data (istream->zip->archive, buffer, count); + if (bytes_read < 0) { + g_set_error_literal (error, + G_IO_ERROR, + g_io_error_from_errno (archive_errno (istream->zip->archive)), + archive_error_string (istream->zip->archive)); + return -1; + } if (bytes_read == 0 && istream->is_interleaved && !gxps_archive_input_stream_is_last_piece (istream)) { /* Read next piece */ gxps_archive_input_stream_next_piece (istream); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/libgxps/gxps-fonts.c new/libgxps-0.3.1/libgxps/gxps-fonts.c --- old/libgxps-0.3.0/libgxps/gxps-fonts.c 2017-08-09 14:57:59.000000000 +0200 +++ new/libgxps-0.3.1/libgxps/gxps-fonts.c 2019-01-05 09:30:40.000000000 +0100 @@ -220,19 +220,12 @@ cairo_font_face_t *font_face; guchar *font_data; gsize font_data_len; - gboolean res; - res = gxps_archive_read_entry (zip, font_uri, - &font_data, &font_data_len, - error); - if (!res) { - g_set_error (error, - GXPS_ERROR, - GXPS_ERROR_SOURCE_NOT_FOUND, - "Font source %s not found in archive", - font_uri); - return NULL; - } + if (!gxps_archive_read_entry (zip, font_uri, + &font_data, &font_data_len, + error)) { + return NULL; + } ft_face.font_data = font_data; ft_face.font_data_len = (gssize)font_data_len; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/libgxps/gxps-images.c new/libgxps-0.3.1/libgxps/gxps-images.c --- old/libgxps-0.3.0/libgxps/gxps-images.c 2017-08-09 14:57:59.000000000 +0200 +++ new/libgxps-0.3.1/libgxps/gxps-images.c 2019-01-05 09:30:40.000000000 +0100 @@ -286,7 +286,7 @@ } stride = cairo_format_stride_for_width (format, png_width); - if (stride < 0) { + if (stride < 0 || png_height >= INT_MAX / stride) { fill_png_error (error, image_uri, NULL); g_object_unref (stream); png_destroy_read_struct (&png, &info, NULL); @@ -742,17 +742,12 @@ guchar *data; guchar *p; - if (!gxps_archive_read_entry (zip, image_uri, - &buffer.buffer, - &buffer.buffer_len, - error)) { - g_set_error (error, - GXPS_ERROR, - GXPS_ERROR_SOURCE_NOT_FOUND, - "Image source %s not found in archive", - image_uri); - return NULL; - } + if (!gxps_archive_read_entry (zip, image_uri, + &buffer.buffer, + &buffer.buffer_len, + error)) { + return NULL; + } buffer.pos = 0; @@ -925,6 +920,8 @@ if (!image) { gchar *mime_type; + g_clear_error(error); + mime_type = gxps_images_guess_content_type (zip, image_uri); if (g_strcmp0 (mime_type, "image/png") == 0) { image = gxps_images_create_from_png (zip, image_uri, error); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/libgxps/gxps-page.c new/libgxps-0.3.1/libgxps/gxps-page.c --- old/libgxps-0.3.0/libgxps/gxps-page.c 2017-08-09 14:57:59.000000000 +0200 +++ new/libgxps-0.3.1/libgxps/gxps-page.c 2019-01-05 09:30:40.000000000 +0100 @@ -989,6 +989,7 @@ font_options = cairo_font_options_create (); cairo_get_font_options (ctx->cr, font_options); + cairo_font_options_set_hint_metrics (font_options, CAIRO_HINT_METRICS_OFF); cairo_matrix_init_identity (&font_matrix); cairo_matrix_scale (&font_matrix, glyphs->em_size, glyphs->em_size); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/meson.build new/libgxps-0.3.1/meson.build --- old/libgxps-0.3.0/meson.build 2017-08-09 14:57:59.000000000 +0200 +++ new/libgxps-0.3.1/meson.build 2019-01-05 09:30:40.000000000 +0100 @@ -1,10 +1,10 @@ project('libgxps', 'c', - version: '0.3.0', + version: '0.3.1', default_options: [ 'buildtype=debugoptimized' ], license: 'LGPL2+', - meson_version: '>= 0.36.0') + meson_version: '>= 0.43.0') gxps_version = meson.project_version() version_array = gxps_version.split('.') @@ -23,7 +23,7 @@ # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A current = 4 -revision = 2 +revision = 3 age = 2 soversion = '@0@'.format(current - age) libversion = '@0@.@1@.@2@'.format(current - age, age, revision) @@ -40,30 +40,10 @@ # Compiler flags if cc.get_id() == 'msvc' - # Make MSVC more pedantic, this is a recommended pragma list - # from _Win32_Programming_ by Rector and Newcomer. Taken from - # glib's msvc_recommended_pragmas.h--please see that file for - # the meaning of the warning codes used here - test_cflags = [ - '-we4002', # too many actual parameters for macro - '-we4003', # not enough actual parameters for macro - '-w14010', # single-line comment contains line-continuation character - '-we4013', # 'function' undefined; assuming extern returning int - '-w14016', # no function return type; using int as default - '-we4020', # too many actual parameters - '-we4021', # too few actual parameters - '-we4027', # function declared without formal parameter list - '-we4029', # declared formal parameter list different from definition - '-we4033', # 'function' must return a value - '-we4035', # 'function' : no return value - '-we4045', # array bounds overflow - '-we4047', # different levels of indirection - '-we4049', # terminating line number emission - '-we4053', # an expression of type void was used as an operand - '-we4071', # no function prototype given - '-we4819', # the file contains a character that cannot be represented in the current code page - ] -elif cc.get_id() == 'gcc' or cc.get_id() == 'clang' + # Compiler options taken from msvc_recommended_pragmas.h + # in GLib, based on _Win32_Programming_ by Rector and Newcomer + common_flags = ['-FImsvc_recommended_pragmas.h'] +else test_cflags = [ '-Wpointer-arith', '-Wmissing-declarations', @@ -97,15 +77,9 @@ '-fno-strict-aliasing', '-Wno-int-conversion', ] -else - test_cflags = [] + + common_flags = cc.get_supported_arguments(test_cflags) endif -common_flags = [] -foreach cflag: test_cflags - if cc.has_argument(cflag) - common_flags += [ cflag ] - endif -endforeach extra_args= [] @@ -153,7 +127,7 @@ cdata.set('HAVE_LIBTIFF', tiff_dep.found()) # Maths functions might be implemented in libm -libm_dep = cc.find_library('m') +libm_dep = cc.find_library('m', required: false) gnome = import('gnome') gir = find_program('g-ir-scanner', required: false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgxps-0.3.0/tools/gxps-print-converter.c new/libgxps-0.3.1/tools/gxps-print-converter.c --- old/libgxps-0.3.0/tools/gxps-print-converter.c 2017-08-09 14:57:59.000000000 +0200 +++ new/libgxps-0.3.1/tools/gxps-print-converter.c 2019-01-05 09:30:40.000000000 +0100 @@ -266,13 +266,17 @@ gxps_page_get_size (page, &page_width, &page_height); + /* The page width is in points, Windows expects a dpi of 96 while + * cairo will handle the dpi in 72. We need to make the conversion + * ourselves so we have the right output size + */ if (output_width) { *output_width = converter->paper_width == 0 ? - page_width : converter->paper_width; + page_width * 72.0 / 96.0 : converter->paper_width; } if (output_height) { *output_height = converter->paper_height == 0 ? - page_height : converter->paper_height; + page_height * 72.0 / 96.0 : converter->paper_height; } }
