Commit 1fd89653 authored by Michael Biebl's avatar Michael Biebl

Updated version 1.9.4 from 'upstream/1.9.4'

with Debian dir 9841abb904b24cd2832a5bec5874b33a5b892f53
parents ba240ce1 9102aa2d
NEW in 1.9.4 - 2017-08-11
=========================
Brown paper bag release, export some missing methods that went
unintentionally hidden.
NEW in 1.9.3 - 2017-08-09
=========================
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for libmediaart 1.9.3.
# Generated by GNU Autoconf 2.69 for libmediaart 1.9.4.
#
# Report bugs to <http://bugzilla.gnome.org/>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libmediaart'
PACKAGE_TARNAME='libmediaart'
PACKAGE_VERSION='1.9.3'
PACKAGE_STRING='libmediaart 1.9.3'
PACKAGE_VERSION='1.9.4'
PACKAGE_STRING='libmediaart 1.9.4'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/'
PACKAGE_URL='https://wiki.gnome.org/MediaArtStorageSpec'
......@@ -1439,7 +1439,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libmediaart 1.9.3 to adapt to many kinds of systems.
\`configure' configures libmediaart 1.9.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1509,7 +1509,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libmediaart 1.9.3:";;
short | recursive ) echo "Configuration of libmediaart 1.9.4:";;
esac
cat <<\_ACEOF
......@@ -1669,7 +1669,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libmediaart configure 1.9.3
libmediaart configure 1.9.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2213,7 +2213,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libmediaart $as_me 1.9.3, which was
It was created by libmediaart $as_me 1.9.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -3082,7 +3082,7 @@ fi
# Define the identity of the package.
PACKAGE='libmediaart'
VERSION='1.9.3'
VERSION='1.9.4'
# Some tools Automake needs.
......@@ -3325,10 +3325,10 @@ AM_BACKSLASH='\'
LIBMEDIAART_MAJOR_VERSION=1
LIBMEDIAART_MINOR_VERSION=9
LIBMEDIAART_MICRO_VERSION=3
LIBMEDIAART_MICRO_VERSION=4
LIBMEDIAART_INTERFACE_AGE=0
LIBMEDIAART_BINARY_AGE=903
LIBMEDIAART_VERSION=1.9.3
LIBMEDIAART_BINARY_AGE=904
LIBMEDIAART_VERSION=1.9.4
LIBMEDIAART_API_VERSION=2.0
LIBMEDIAART_BINARY_VERSION=2.0.0
......@@ -3350,20 +3350,20 @@ $as_echo "#define LIBMEDIAART_MAJOR_VERSION 1" >>confdefs.h
$as_echo "#define LIBMEDIAART_MINOR_VERSION 9" >>confdefs.h
$as_echo "#define LIBMEDIAART_MICRO_VERSION 3" >>confdefs.h
$as_echo "#define LIBMEDIAART_MICRO_VERSION 4" >>confdefs.h
$as_echo "#define LIBMEDIAART_INTERFACE_AGE 0" >>confdefs.h
$as_echo "#define LIBMEDIAART_BINARY_AGE 903" >>confdefs.h
$as_echo "#define LIBMEDIAART_BINARY_AGE 904" >>confdefs.h
# libtool versioning
LT_RELEASE=1.9
LT_CURRENT=903
LT_CURRENT=904
LT_REVISION=0
LT_AGE=903
LT_AGE=904
LT_CURRENT_MINUS_AGE=0
......@@ -19780,7 +19780,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libmediaart $as_me 1.9.3, which was
This file was extended by libmediaart $as_me 1.9.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -19847,7 +19847,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libmediaart config.status 1.9.3
libmediaart config.status 1.9.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -13,7 +13,7 @@ AC_PREREQ([2.64])
# set LIBMEDIAART_BINARY_AGE and LIBMEDIAART_INTERFACE_AGE to 0.
m4_define([libmediaart_major_version], [1])
m4_define([libmediaart_minor_version], [9])
m4_define([libmediaart_micro_version], [3])
m4_define([libmediaart_micro_version], [4])
m4_define([libmediaart_interface_age], [0])
m4_define([libmediaart_binary_age],
[m4_eval(100 * libmediaart_minor_version + libmediaart_micro_version)])
......
......@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libmediaart Library Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
for libmediaart 1.9.3
for libmediaart 1.9.4
.
The latest version of this documentation can be found on-line at
<a class="ulink" href="http://library.gnome.org/devel/libmediaart/unstable/" target="_top">
......
......@@ -57,7 +57,7 @@
</tr>
<tr>
<td class="function_type">
<span class="returnvalue">gboolean</span>
<a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
</td>
<td class="function_name">
<a class="link" href="libmediaart-Plugins.html#media-art-file-to-jpeg" title="media_art_file_to_jpeg ()">media_art_file_to_jpeg</a> <span class="c_punctuation">()</span>
......@@ -65,7 +65,7 @@
</tr>
<tr>
<td class="function_type">
<span class="returnvalue">gboolean</span>
<a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
</td>
<td class="function_name">
<a class="link" href="libmediaart-Plugins.html#media-art-buffer-to-jpeg" title="media_art_buffer_to_jpeg ()">media_art_buffer_to_jpeg</a> <span class="c_punctuation">()</span>
......@@ -91,7 +91,7 @@ to be provided.</p>
<div class="refsect2">
<a name="media-art-plugin-init"></a><h3>media_art_plugin_init ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span>
media_art_plugin_init (<em class="parameter"><code><span class="type">gint</span> max_width</code></em>);</pre>
media_art_plugin_init (<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#gint"><span class="type">gint</span></a> max_width</code></em>);</pre>
<p>This function facilitates a plugin's need to create any
internal caches before anything else is done. This function must
exist in each plugin and is called immediately after the plugin is
......@@ -128,10 +128,10 @@ called immediately after the plugin is loaded. Conversely,
<hr>
<div class="refsect2">
<a name="media-art-file-to-jpeg"></a><h3>media_art_file_to_jpeg ()</h3>
<pre class="programlisting"><span class="returnvalue">gboolean</span>
media_art_file_to_jpeg (<em class="parameter"><code>const <span class="type">gchar</span> *filename</code></em>,
<em class="parameter"><code>const <span class="type">gchar</span> *target</code></em>,
<em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
media_art_file_to_jpeg (<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *filename</code></em>,
<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *target</code></em>,
<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
<p>Save <em class="parameter"><code>filename</code></em>
to <em class="parameter"><code>target</code></em>
as JPEG format. The <em class="parameter"><code>filename</code></em>
......@@ -158,7 +158,7 @@ a JPEG in the first place.</p>
</tr>
<tr>
<td class="parameter_name"><p>error</p></td>
<td class="parameter_description"><p>A <span class="type">GError</span> to use upon failure, or <code class="literal">NULL</code></p></td>
<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> to use upon failure, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
<td class="parameter_annotations"> </td>
</tr>
</tbody>
......@@ -166,7 +166,7 @@ a JPEG in the first place.</p>
</div>
<div class="refsect3">
<a name="media-art-file-to-jpeg.returns"></a><h4>Returns</h4>
<p> <code class="literal">TRUE</code> if conversion was successful, otherwise <code class="literal">FALSE</code> is
<p> <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if conversion was successful, otherwise <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is
returned if <em class="parameter"><code>error</code></em>
is set.</p>
</div>
......@@ -175,12 +175,12 @@ is set.</p>
<hr>
<div class="refsect2">
<a name="media-art-buffer-to-jpeg"></a><h3>media_art_buffer_to_jpeg ()</h3>
<pre class="programlisting"><span class="returnvalue">gboolean</span>
<pre class="programlisting"><a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
media_art_buffer_to_jpeg (<em class="parameter"><code>const unsigned <span class="type">char</span> *buffer</code></em>,
<em class="parameter"><code><span class="type">size_t</span> len</code></em>,
<em class="parameter"><code>const <span class="type">gchar</span> *buffer_mime</code></em>,
<em class="parameter"><code>const <span class="type">gchar</span> *target</code></em>,
<em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *buffer_mime</code></em>,
<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glibglib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *target</code></em>,
<em class="parameter"><code><a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
<p>This function performs the same operation as
<a class="link" href="libmediaart-Plugins.html#media-art-file-to-jpeg" title="media_art_file_to_jpeg ()"><code class="function">media_art_file_to_jpeg()</code></a> with the exception that a raw <em class="parameter"><code>buffer</code></em>
can
......@@ -220,7 +220,7 @@ to use</p></td>
</tr>
<tr>
<td class="parameter_name"><p>error</p></td>
<td class="parameter_description"><p>A <span class="type">GError</span> to use upon failure, or <code class="literal">NULL</code></p></td>
<td class="parameter_description"><p>A <a href="/usr/share/gtk-doc/html/glibglib-Error-Reporting.html#GError"><span class="type">GError</span></a> to use upon failure, or <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
<td class="parameter_annotations"> </td>
</tr>
</tbody>
......@@ -228,7 +228,7 @@ to use</p></td>
</div>
<div class="refsect3">
<a name="media-art-buffer-to-jpeg.returns"></a><h4>Returns</h4>
<p> <code class="literal">TRUE</code> if conversion was successful, otherwise <code class="literal">FALSE</code> is
<p> <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if conversion was successful, otherwise <a href="/usr/share/gtk-doc/html/glibglib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is
returned if <em class="parameter"><code>error</code></em>
is set.</p>
</div>
......
version_xml = configure_file(input: 'version.xml.in',
output: 'version.xml',
configuration: conf)
if get_option('with-docs') != 'no'
version_xml = configure_file(input: 'version.xml.in',
output: 'version.xml',
configuration: conf)
gnome.gtkdoc('libmediaart',
src_dir: 'libmediaart',
main_xml: 'libmediaart-docs.xml',
install: true)
gnome.gtkdoc('libmediaart',
src_dir: 'libmediaart',
main_xml: 'libmediaart-docs.xml',
install: true)
endif
......@@ -20,6 +20,8 @@
* Philip Van Hoof <philip@codeminded.be>
*/
#include "config.h"
#include "extractgeneric.h"
/**
......
......@@ -20,6 +20,8 @@
* Philip Van Hoof <philip@codeminded.be>
*/
#include "config.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "extractgeneric.h"
......
#include "marshal.h"
#include <glib-object.h>
#include <glib-object.h>
#ifdef G_ENABLE_DEBUG
#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
......@@ -47,6 +49,7 @@
#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer
#endif /* !G_ENABLE_DEBUG */
/* VOID:STRING,STRING (marshal.list:1) */
void
media_art_marshal_VOID__STRING_STRING (GClosure *closure,
......@@ -56,13 +59,13 @@ media_art_marshal_VOID__STRING_STRING (GClosure *closure,
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1,
gpointer arg1,
gpointer arg2,
gpointer data2);
GCClosure *cc = (GCClosure *) closure;
gpointer data1, data2;
typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1,
gpointer arg_1,
gpointer arg_2,
gpointer data2);
GMarshalFunc_VOID__STRING_STRING callback;
GCClosure *cc = (GCClosure*) closure;
gpointer data1, data2;
g_return_if_fail (n_param_values == 3);
......@@ -93,16 +96,16 @@ media_art_marshal_VOID__STRING_STRING_STRING_BOOLEAN_BOOLEAN (GClosure *clos
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING_BOOLEAN_BOOLEAN) (gpointer data1,
gpointer arg1,
gpointer arg2,
gpointer arg3,
gboolean arg4,
gboolean arg5,
gpointer data2);
GCClosure *cc = (GCClosure *) closure;
gpointer data1, data2;
typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING_BOOLEAN_BOOLEAN) (gpointer data1,
gpointer arg_1,
gpointer arg_2,
gpointer arg_3,
gboolean arg_4,
gboolean arg_5,
gpointer data2);
GMarshalFunc_VOID__STRING_STRING_STRING_BOOLEAN_BOOLEAN callback;
GCClosure *cc = (GCClosure*) closure;
gpointer data1, data2;
g_return_if_fail (n_param_values == 6);
......
/* This file is generated, all changes will be lost */
#ifndef __MEDIA_ART_MARSHAL_MARSHAL_H__
#define __MEDIA_ART_MARSHAL_MARSHAL_H__
#include <glib-object.h>
#ifndef __media_art_marshal_MARSHAL_H__
#define __media_art_marshal_MARSHAL_H__
#include <glib-object.h>
G_BEGIN_DECLS
/* VOID:STRING,STRING (marshal.list:1) */
extern
void media_art_marshal_VOID__STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
extern void media_art_marshal_VOID__STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:STRING,STRING,STRING,BOOLEAN,BOOLEAN (marshal.list:2) */
extern
void media_art_marshal_VOID__STRING_STRING_STRING_BOOLEAN_BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
extern void media_art_marshal_VOID__STRING_STRING_STRING_BOOLEAN_BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
G_END_DECLS
#endif /* __MEDIA_ART_MARSHAL_MARSHAL_H__ */
#endif /* __media_art_marshal_MARSHAL_H__ */
libmediaart_public_headers = [
'mediaart-macros.h',
'cache.h',
'extract.h',
'extractgeneric.h',
......
project('libmediaart', 'c', 'cpp',
version: '1.9.3',
version: '1.9.4',
default_options: [ 'warning_level=1' ])
gnome = import('gnome')
......
option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'qt5'],
description: 'Which image processing backend to use')
option('with-docs', type : 'combo', choices : ['auto', 'yes', 'no'], value : 'auto')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment