summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-11 19:11:35 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-11 19:11:49 +0000
commitf73fe50588c034495fc5c12f0183cd0cd914778d (patch)
tree773f2ab47cc826c7d0164d9c890fa7e72e6ddc27
parentReleasing progress-linux version 0.1.40-1~dschinn1. (diff)
downloadbabl-f73fe50588c034495fc5c12f0183cd0cd914778d.zip
babl-f73fe50588c034495fc5c12f0183cd0cd914778d.tar.xz
Merging upstream version 0.1.42.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--INSTALL10
-rw-r--r--NEWS3
-rw-r--r--README6
-rw-r--r--babl/babl-cache.c2
-rw-r--r--babl/babl-fish-path.c6
-rw-r--r--babl/babl-internal.h1
-rw-r--r--babl/babl-space.c13
-rw-r--r--babl/babl-version.h2
-rwxr-xr-xconfigure30
-rw-r--r--configure.ac2
10 files changed, 42 insertions, 33 deletions
diff --git a/INSTALL b/INSTALL
index ca84018..9661316 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-babl 0.1.40
+babl 0.1.42
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.40.tar.bz2
- foo$ tar jxf babl-0.1.40.tar.gz
- foo$ cd babl-0.1.40
- foo/babl-0.1.40$ ./configure && make && sudo make install
+ 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
------------------------------------------------------------
diff --git a/NEWS b/NEWS
index 253def8..2e154e9 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ the news section both in the README and the webpage.
-->
+2018-01-23 babl-0.1.42 </dt><dd>
+Fully initialize fishes when loading from cache. <br/>
+ </dd><dt>
2018-01-16 babl-0.1.40 </dt><dd>
Added format "CIE XYZ alpha" color model and formats.
New API babl_process_rows for reduced overhead in some scenarios; though bigger
diff --git a/README b/README
index eff3461..a118fab 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Babl-0.1.40
+Babl-0.1.42
Contents
@@ -64,6 +64,8 @@ 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
+ 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
babl_process_rows for reduced overhead in some scenarios; though
@@ -2280,4 +2282,4 @@ Massimo Valentini
Ell
fast paths
-/babl-0.1.40
+/babl-0.1.42
diff --git a/babl/babl-cache.c b/babl/babl-cache.c
index 75780b5..33d030d 100644
--- a/babl/babl-cache.c
+++ b/babl/babl-cache.c
@@ -289,6 +289,8 @@ void babl_init_db (void)
babl->fish.source = from_format;
babl->fish.destination = to_format;
babl->fish_path.conversion_list = babl_list_init_with_size (10);
+ _babl_fish_prepare_bpp (babl);
+ _babl_fish_rig_dispatch (babl);
token2 = strtok_r (&token[1], seps2, &tokp2);
while( token2 != NULL )
diff --git a/babl/babl-fish-path.c b/babl/babl-fish-path.c
index d387fa8..54e9ee4 100644
--- a/babl/babl-fish-path.c
+++ b/babl/babl-fish-path.c
@@ -433,8 +433,8 @@ alias_conversion (Babl *babl,
return 0;
}
-static void
-babl_fish_prepare_bpp (Babl *babl)
+void
+_babl_fish_prepare_bpp (Babl *babl)
{
const Babl *babl_source = babl->fish.source;
const Babl *babl_dest = babl->fish.destination;
@@ -604,7 +604,7 @@ babl_fish_path2 (const Babl *source,
return NULL;
}
- babl_fish_prepare_bpp (babl);
+ _babl_fish_prepare_bpp (babl);
_babl_fish_rig_dispatch (babl);
/* Since there is not an already registered instance by the required
* name, inserting newly created class into database.
diff --git a/babl/babl-internal.h b/babl/babl-internal.h
index 415bc5e..896ae81 100644
--- a/babl/babl-internal.h
+++ b/babl/babl-internal.h
@@ -498,5 +498,6 @@ babl_conversion_process (const Babl *babl,
}
void _babl_fish_rig_dispatch (Babl *babl);
+void _babl_fish_prepare_bpp (Babl *babl);
#endif
diff --git a/babl/babl-space.c b/babl/babl-space.c
index 781e419..6794c2c 100644
--- a/babl/babl-space.c
+++ b/babl/babl-space.c
@@ -575,7 +575,7 @@ static void prep_conversion (const Babl *babl)
static inline void
-universal_nonlinear_rgb_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)
{
const Babl *source_space = babl_conversion_get_source_space (conversion);
const Babl *destination_space = babl_conversion_get_destination_space (conversion);
@@ -681,6 +681,7 @@ universal_nonlinear_rgb_u8_converter (const Babl *conversion,unsigned char *src_
rgba_out[i*4+0]=in_trc_lut[rgb_in_u8[i*3+0]];
rgba_out[i*4+1]=in_trc_lut[rgb_in_u8[i*3+1]];
rgba_out[i*4+2]=in_trc_lut[rgb_in_u8[i*3+2]];
+ rgba_out[i*4+3]=rgb_in_u8[i*3+2] * 255.5f;
}
babl_matrix_mul_vectorff_buf4 (matrixf, rgba_out, rgba_out, samples);
@@ -730,7 +731,7 @@ static inline void babl_matrix_mul_vectorff_buf4_sse2 (const float *mat,
static inline void
-universal_nonlinear_rgb_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)
{
const Babl *source_space = babl_conversion_get_source_space (conversion);
const Babl *destination_space = babl_conversion_get_destination_space (conversion);
@@ -862,11 +863,11 @@ add_rgb_adapter (Babl *babl,
NULL));
prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A float", space),
babl_format_with_space("R'G'B'A float", babl),
- "linear", universal_nonlinear_rgb_converter_sse2,
+ "linear", universal_nonlinear_rgba_converter_sse2,
NULL));
prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A float", babl),
babl_format_with_space("R'G'B'A float", space),
- "linear", universal_nonlinear_rgb_converter_sse2,
+ "linear", universal_nonlinear_rgba_converter_sse2,
NULL));
prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A u8", space),
babl_format_with_space("R'G'B'A u8", babl),
@@ -899,11 +900,11 @@ add_rgb_adapter (Babl *babl,
NULL));
prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A float", space),
babl_format_with_space("R'G'B'A float", babl),
- "linear", universal_nonlinear_rgb_converter,
+ "linear", universal_nonlinear_rgba_converter,
NULL));
prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A float", babl),
babl_format_with_space("R'G'B'A float", space),
- "linear", universal_nonlinear_rgb_converter,
+ "linear", universal_nonlinear_rgba_converter,
NULL));
prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A u8", space),
babl_format_with_space("R'G'B'A u8", babl),
diff --git a/babl/babl-version.h b/babl/babl-version.h
index 7e5e690..86fc548 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 40
+#define BABL_MICRO_VERSION 42
/** Get the version information on the babl library */
void babl_get_version (int *major,
diff --git a/configure b/configure
index 8a5bf7a..7cdc7ff 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.40.
+# Generated by GNU Autoconf 2.69 for babl 0.1.42.
#
#
# 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.40'
-PACKAGE_STRING='babl 0.1.40'
+PACKAGE_VERSION='0.1.42'
+PACKAGE_STRING='babl 0.1.42'
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.40 to adapt to many kinds of systems.
+\`configure' configures babl 0.1.42 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.40:";;
+ short | recursive ) echo "Configuration of babl 0.1.42:";;
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.40
+babl configure 0.1.42
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.40, which was
+It was created by babl $as_me 0.1.42, 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=40
+BABL_MICRO_VERSION=42
BABL_INTERFACE_AGE=1
-BABL_BINARY_AGE=140
-BABL_VERSION=0.1.40
-BABL_REAL_VERSION=0.1.40
+BABL_BINARY_AGE=142
+BABL_VERSION=0.1.42
+BABL_REAL_VERSION=0.1.42
BABL_API_VERSION=0.1
@@ -2333,7 +2333,7 @@ fi
-BABL_LIBRARY_VERSION="139:1:139"
+BABL_LIBRARY_VERSION="141:1:141"
BABL_CURRENT_MINUS_AGE=0
@@ -2965,7 +2965,7 @@ fi
# Define the identity of the package.
PACKAGE='babl'
- VERSION='0.1.40'
+ VERSION='0.1.42'
# 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.40, which was
+This file was extended by babl $as_me 0.1.42, 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.40
+babl config.status 0.1.42
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index bbb7fa2..7499762 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], [40])
+m4_define([babl_micro_version], [42])
m4_define([babl_real_version],
[babl_major_version.babl_minor_version.babl_micro_version])
m4_define([babl_version], [babl_real_version])