summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-11 19:12:49 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-11 19:13:01 +0000
commit8990f3b39f1f074f033d89da96f283d50125514f (patch)
treeca9c228e71a19981ebba089cebc16ee492534368
parentReleasing progress-linux version 0.1.42-1~dschinn1. (diff)
downloadbabl-8990f3b39f1f074f033d89da96f283d50125514f.zip
babl-8990f3b39f1f074f033d89da96f283d50125514f.tar.xz
Merging upstream version 0.1.44.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--AUTHORS2
-rw-r--r--INSTALL10
-rw-r--r--NEWS3
-rw-r--r--README10
-rw-r--r--babl/babl-fish-path.c2
-rw-r--r--babl/babl-fish.h4
-rw-r--r--babl/babl-format.c2
-rw-r--r--babl/babl-space.c44
-rw-r--r--babl/babl-version.h2
-rwxr-xr-xconfigure30
-rw-r--r--configure.ac2
11 files changed, 63 insertions, 48 deletions
diff --git a/AUTHORS b/AUTHORS
index d574ee0..1770cc5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -76,4 +76,6 @@
<dd>stability fixes</dd>
<dt>Ell</dt>
<dd>fast paths</dd>
+ <dt>Félix Piédallu</dt>
+ <dd>Initial meson build</dd>
</dl>
diff --git a/INSTALL b/INSTALL
index 9661316..e236cbe 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-babl 0.1.42
+babl 0.1.44
Dynamic; any to any, pixel format conversion library.
@@ -12,10 +12,10 @@ From a released version the following is the expected method of
installation (or a variation on this theme):
------------------------------------------------------------
- foo$ wget ftp://ftp.gtk.org/pub/babl/0.1/babl-0.1.42.tar.bz2
- foo$ tar jxf babl-0.1.42.tar.gz
- foo$ cd babl-0.1.42
- foo/babl-0.1.42$ ./configure && make && sudo make install
+ foo$ wget ftp://ftp.gtk.org/pub/babl/0.1/babl-0.1.44.tar.bz2
+ foo$ tar jxf babl-0.1.44.tar.gz
+ foo$ cd babl-0.1.44
+ foo/babl-0.1.44$ ./configure && make && sudo make install
------------------------------------------------------------
diff --git a/NEWS b/NEWS
index 2e154e9..9af9184 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ the news section both in the README and the webpage.
-->
+2018-02-18 babl-0.1.44 </dt><dd>
+Fix bug in custom primaries/ICC fast paths, improve meson build<br/>
+
2018-01-23 babl-0.1.42 </dt><dd>
Fully initialize fishes when loading from cache. <br/>
</dd><dt>
diff --git a/README b/README
index a118fab..19294d3 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Babl-0.1.42
+Babl-0.1.44
Contents
@@ -64,7 +64,9 @@ babl release. If there are significant improvements to babl when a GEGL
release is done a babl release is most often put out just prior to the
GEGL release.
-2018-01-23 babl-0.1.42
+2018-02-18 babl-0.1.44
+ Fix bug in custom primaries/ICC fast paths, improve meson build
+ 2018-01-23 babl-0.1.42
Fully initialize fishes when loading from cache.
2018-01-16 babl-0.1.40
Added format "CIE XYZ alpha" color model and formats. New API
@@ -2281,5 +2283,7 @@ Massimo Valentini
stability fixes
Ell
fast paths
+Félix Piédallu
+ Initial meson build
-/babl-0.1.42
+/babl-0.1.44
diff --git a/babl/babl-fish-path.c b/babl/babl-fish-path.c
index 54e9ee4..c5aca9b 100644
--- a/babl/babl-fish-path.c
+++ b/babl/babl-fish-path.c
@@ -697,7 +697,7 @@ _babl_fish_rig_dispatch (Babl *babl)
/* lift out conversion from single step conversion and make it be the dispatch function
* itself
*/
- babl->fish.data = &babl->fish_simple.conversion->data;
+ babl->fish.data = &(babl->fish_simple.conversion->data);
babl->fish.dispatch = babl->fish_simple.conversion->dispatch;
}
else
diff --git a/babl/babl-fish.h b/babl/babl-fish.h
index a26a032..db4e06f 100644
--- a/babl/babl-fish.h
+++ b/babl/babl-fish.h
@@ -47,6 +47,10 @@ typedef struct
{
BablFish fish;
BablConversion *conversion;
+ double cost; /* number of ticks *10 + chain_length */
+ int source_bpp;
+ int dest_bpp;
+ void *foo;
} BablFishSimple;
diff --git a/babl/babl-format.c b/babl/babl-format.c
index 1db5f02..bc5ef6b 100644
--- a/babl/babl-format.c
+++ b/babl/babl-format.c
@@ -737,6 +737,8 @@ babl_format_with_space (const char *name, const Babl *space)
sprintf (new_name, "%s-%s", name, babl_get_name ((Babl*)space));
ret = babl_db_exist_by_name (db, new_name);
+
+ babl_free (new_name);
if (ret)
return ret;
diff --git a/babl/babl-space.c b/babl/babl-space.c
index 6794c2c..b5557fb 100644
--- a/babl/babl-space.c
+++ b/babl/babl-space.c
@@ -575,12 +575,12 @@ static void prep_conversion (const Babl *babl)
static inline void
-universal_nonlinear_rgba_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+universal_nonlinear_rgba_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples, void *data)
{
const Babl *source_space = babl_conversion_get_source_space (conversion);
const Babl *destination_space = babl_conversion_get_destination_space (conversion);
- float * matrixf = conversion->conversion.data;
+ float * matrixf = data;
float *rgba_in = (void*)src_char;
float *rgba_out = (void*)dst_char;
@@ -592,10 +592,10 @@ universal_nonlinear_rgba_converter (const Babl *conversion,unsigned char *src_ch
}
static inline void
-universal_nonlinear_rgb_linear_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+universal_nonlinear_rgb_linear_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples, void *data)
{
const Babl *source_space = babl_conversion_get_source_space (conversion);
- float * matrixf = conversion->conversion.data;
+ float * matrixf = data;
float *rgba_in = (void*)src_char;
float *rgba_out = (void*)dst_char;
@@ -605,11 +605,11 @@ universal_nonlinear_rgb_linear_converter (const Babl *conversion,unsigned char *
}
static inline void
-universal_nonlinear_rgba_u8_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+universal_nonlinear_rgba_u8_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples, void *data)
{
const Babl *destination_space = conversion->conversion.destination->format.space;
- float * matrixf = conversion->conversion.data;
+ float * matrixf = data;
float * in_trc_lut = matrixf + 9;
int i;
uint8_t *rgba_in_u8 = (void*)src_char;
@@ -643,9 +643,9 @@ universal_nonlinear_rgba_u8_converter (const Babl *conversion,unsigned char *src
static inline void
-universal_rgba_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+universal_rgba_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples, void *data)
{
- float *matrixf = conversion->conversion.data;
+ float *matrixf = data;
float *rgba_in = (void*)src_char;
float *rgba_out = (void*)dst_char;
@@ -653,9 +653,9 @@ universal_rgba_converter (const Babl *conversion,unsigned char *src_char, unsign
}
static inline void
-universal_rgb_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+universal_rgb_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples, void *data)
{
- float *matrixf = conversion->conversion.data;
+ float *matrixf = data;
float *rgb_in = (void*)src_char;
float *rgb_out = (void*)dst_char;
@@ -664,11 +664,11 @@ universal_rgb_converter (const Babl *conversion,unsigned char *src_char, unsigne
static inline void
-universal_nonlinear_rgb_u8_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+universal_nonlinear_rgb_u8_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples, void *data)
{
const Babl *destination_space = conversion->conversion.destination->format.space;
- float * matrixf = conversion->conversion.data;
+ float * matrixf = data;
float * in_trc_lut = matrixf + 9;
int i;
uint8_t *rgb_in_u8 = (void*)src_char;
@@ -731,11 +731,11 @@ static inline void babl_matrix_mul_vectorff_buf4_sse2 (const float *mat,
static inline void
-universal_nonlinear_rgba_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+universal_nonlinear_rgba_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples, void *data)
{
const Babl *source_space = babl_conversion_get_source_space (conversion);
const Babl *destination_space = babl_conversion_get_destination_space (conversion);
- float * matrixf = conversion->conversion.data;
+ float * matrixf = data;
float *rgba_in = (void*)src_char;
float *rgba_out = (void*)dst_char;
@@ -748,9 +748,9 @@ universal_nonlinear_rgba_converter_sse2 (const Babl *conversion,unsigned char *s
static inline void
-universal_rgba_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+universal_rgba_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples, void *data)
{
- float *matrixf = conversion->conversion.data;
+ float *matrixf = data;
float *rgba_in = (void*)src_char;
float *rgba_out = (void*)dst_char;
@@ -758,11 +758,11 @@ universal_rgba_converter_sse2 (const Babl *conversion,unsigned char *src_char, u
}
static inline void
-universal_nonlinear_rgba_u8_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+universal_nonlinear_rgba_u8_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples, void *data)
{
const Babl *destination_space = conversion->conversion.destination->format.space;
- float * matrixf = conversion->conversion.data;
+ float * matrixf = data;
float * in_trc_lut = matrixf + 9;
int i;
uint8_t *rgba_in_u8 = (void*)src_char;
@@ -793,11 +793,11 @@ universal_nonlinear_rgba_u8_converter_sse2 (const Babl *conversion,unsigned char
}
static inline void
-universal_nonlinear_rgb_u8_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+universal_nonlinear_rgb_u8_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples, void *data)
{
const Babl *destination_space = conversion->conversion.destination->format.space;
- float * matrixf = conversion->conversion.data;
+ float * matrixf = data;
float * in_trc_lut = matrixf + 9;
int i;
uint8_t *rgb_in_u8 = (void*)src_char;
@@ -828,10 +828,10 @@ universal_nonlinear_rgb_u8_converter_sse2 (const Babl *conversion,unsigned char
static inline void
-universal_nonlinear_rgb_linear_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
+universal_nonlinear_rgb_linear_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples, void *data)
{
const Babl *source_space = babl_conversion_get_source_space (conversion);
- float * matrixf = conversion->conversion.data;
+ float * matrixf = data;
float *rgba_in = (void*)src_char;
float *rgba_out = (void*)dst_char;
diff --git a/babl/babl-version.h b/babl/babl-version.h
index 86fc548..c218d1e 100644
--- a/babl/babl-version.h
+++ b/babl/babl-version.h
@@ -34,7 +34,7 @@
#define BABL_MAJOR_VERSION 0
#define BABL_MINOR_VERSION 1
-#define BABL_MICRO_VERSION 42
+#define BABL_MICRO_VERSION 44
/** Get the version information on the babl library */
void babl_get_version (int *major,
diff --git a/configure b/configure
index 7cdc7ff..78d3726 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for babl 0.1.42.
+# Generated by GNU Autoconf 2.69 for babl 0.1.44.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='babl'
PACKAGE_TARNAME='babl'
-PACKAGE_VERSION='0.1.42'
-PACKAGE_STRING='babl 0.1.42'
+PACKAGE_VERSION='0.1.44'
+PACKAGE_STRING='babl 0.1.44'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1381,7 +1381,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 babl 0.1.42 to adapt to many kinds of systems.
+\`configure' configures babl 0.1.44 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1453,7 +1453,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of babl 0.1.42:";;
+ short | recursive ) echo "Configuration of babl 0.1.44:";;
esac
cat <<\_ACEOF
@@ -1573,7 +1573,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-babl configure 0.1.42
+babl configure 0.1.44
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1938,7 +1938,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 babl $as_me 0.1.42, which was
+It was created by babl $as_me 0.1.44, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2294,11 +2294,11 @@ ac_config_headers="$ac_config_headers config.h"
BABL_MAJOR_VERSION=0
BABL_MINOR_VERSION=1
-BABL_MICRO_VERSION=42
+BABL_MICRO_VERSION=44
BABL_INTERFACE_AGE=1
-BABL_BINARY_AGE=142
-BABL_VERSION=0.1.42
-BABL_REAL_VERSION=0.1.42
+BABL_BINARY_AGE=144
+BABL_VERSION=0.1.44
+BABL_REAL_VERSION=0.1.44
BABL_API_VERSION=0.1
@@ -2333,7 +2333,7 @@ fi
-BABL_LIBRARY_VERSION="141:1:141"
+BABL_LIBRARY_VERSION="143:1:143"
BABL_CURRENT_MINUS_AGE=0
@@ -2965,7 +2965,7 @@ fi
# Define the identity of the package.
PACKAGE='babl'
- VERSION='0.1.42'
+ VERSION='0.1.44'
# Some tools Automake needs.
@@ -14864,7 +14864,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 babl $as_me 0.1.42, which was
+This file was extended by babl $as_me 0.1.44, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14930,7 +14930,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="\\
-babl config.status 0.1.42
+babl config.status 0.1.44
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 7499762..9d3abdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_PREREQ(2.54)
m4_define([babl_major_version], [0])
m4_define([babl_minor_version], [1])
-m4_define([babl_micro_version], [42])
+m4_define([babl_micro_version], [44])
m4_define([babl_real_version],
[babl_major_version.babl_minor_version.babl_micro_version])
m4_define([babl_version], [babl_real_version])