Hello community,
here is the log from the commit of package pfstools
checked in at Mon Aug 6 23:11:50 CEST 2007.
--------
--- pfstools/pfstools.changes 2007-06-11 23:43:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/pfstools/pfstools.changes 2007-08-06 11:03:18.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug 6 09:45:38 CEST 2007 - postadal@suse.cz
+
+- updated to version 1.6.1
+ * bug-fix release, with a major fix for the sRGB color transform
+- temporary removed octave support (changed octave API)
+
+-------------------------------------------------------------------
Old:
----
pfstools-1.6.1.tar.bz2
New:
----
pfstools-1.6.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pfstools.spec ++++++
--- /var/tmp/diff_new_pack.qa5062/_old 2007-08-06 23:11:25.000000000 +0200
+++ /var/tmp/diff_new_pack.qa5062/_new 2007-08-06 23:11:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package pfstools (Version 1.6.1)
+# spec file for package pfstools (Version 1.6.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,9 +10,9 @@
Name: pfstools
-Version: 1.6.1
-Release: 20
-License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+Version: 1.6.2
+Release: 1
+License: GPL v2 or later, LGPL v2 or later
Source: %{name}-%{version}.tar.bz2
Patch: %{name}-octave.patch
Patch1: %{name}-gcc.patch
@@ -65,9 +65,11 @@
%build
autoreconf -f -i
+#temporary disabled octave (changed octave API)
CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \
./configure \
+ --disable-octave \
--prefix=/usr \
--mandir=%{_mandir} \
--libdir=%{_libdir}
@@ -91,8 +93,9 @@
%{_bindir}/*
%{_mandir}/man?/*
%{_libdir}/*.so.*
-%{_libdir}/octave/*/site/oct/*/pfstools
-%_datadir/octave/*/site/m/pfstools
+# temporary removed
+#%{_libdir}/octave/*/site/oct/*/pfstools
+#%_datadir/octave/*/site/m/pfstools
%files devel
%defattr(-,root,root)
@@ -104,6 +107,10 @@
%{_libdir}/*.a
%changelog
+* Mon Aug 06 2007 - postadal@suse.cz
+- updated to version 1.6.1
+ * bug-fix release, with a major fix for the sRGB color transform
+- temporary removed octave support (changed octave API)
* Mon Jun 11 2007 - ro@suse.de
- avoid stringcompare with char literal
* Wed Jun 06 2007 - ro@suse.de
++++++ pfstools-1.6.1.tar.bz2 -> pfstools-1.6.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pfstools-1.6.1/ChangeLog new/pfstools-1.6.2/ChangeLog
--- old/pfstools-1.6.1/ChangeLog 2007-04-24 13:34:12.000000000 +0200
+++ new/pfstools-1.6.2/ChangeLog 2007-07-04 16:44:43.000000000 +0200
@@ -1,4 +1,10 @@
-pfstools 1.6.1 <24.04.2006>
+pfstools 1.6.2 <04.07.2007>
+ * matlab: pfsview can now display 2D cell arrays
+ * pfs library: quite serious bug in sRGB transforms fixed
+ * added: check for GLUT library (unix only)
+ * added: man page for pfsglview
+
+pfstools 1.6.1 <24.04.2007>
* added: pfsin accepts all extensions supported by dcraw (thanks to L. David Baron)
* fixed: tiff logluv reader - segfault bug and wrong colorspace conversions (thanks to Giuseppe Rota)
* updated: some documentation files
@@ -6,7 +12,7 @@
* fixed: matlab/pfs_put or _get handles tags in pfs stream
* fixed: pfsview under different shell than bash
-pfstools 1.6 <01.03.2006>
+pfstools 1.6 <01.03.2007>
* added: preliminary support for matlab (see README.matlab)
* added: --disable-octave option
* fixed: configure.ac honors CXXFLAGS instead of overwriting them with -O3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pfstools-1.6.1/configure new/pfstools-1.6.2/configure
--- old/pfstools-1.6.1/configure 2007-04-24 14:38:27.000000000 +0200
+++ new/pfstools-1.6.2/configure 2007-07-04 16:42:58.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for pfstools 1.6.1.
+# Generated by GNU Autoconf 2.59 for pfstools 1.6.2.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -421,8 +421,8 @@
# Identity of this package.
PACKAGE_NAME='pfstools'
PACKAGE_TARNAME='pfstools'
-PACKAGE_VERSION='1.6.1'
-PACKAGE_STRING='pfstools 1.6.1'
+PACKAGE_VERSION='1.6.2'
+PACKAGE_STRING='pfstools 1.6.2'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -979,7 +979,7 @@
# 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 pfstools 1.6.1 to adapt to many kinds of systems.
+\`configure' configures pfstools 1.6.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1045,7 +1045,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pfstools 1.6.1:";;
+ short | recursive ) echo "Configuration of pfstools 1.6.2:";;
esac
cat <<\_ACEOF
@@ -1217,7 +1217,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-pfstools configure 1.6.1
+pfstools configure 1.6.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1231,7 +1231,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by pfstools $as_me 1.6.1, which was
+It was created by pfstools $as_me 1.6.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1842,7 +1842,7 @@
# Define the identity of the package.
PACKAGE='pfstools'
- VERSION='1.6.1'
+ VERSION='1.6.2'
cat >>confdefs.h <<_ACEOF
@@ -20432,13 +20432,84 @@
echo "${ECHO_T}$ac_cv_lib_GL_glDisable" >&6
if test $ac_cv_lib_GL_glDisable = yes; then
+ echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
+echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
+if test "${ac_cv_lib_glut_glutInit+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lglut $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char glutInit ();
+int
+main ()
+{
+glutInit ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_glut_glutInit=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_glut_glutInit=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_glut_glutInit" >&5
+echo "${ECHO_T}$ac_cv_lib_glut_glutInit" >&6
+if test $ac_cv_lib_glut_glutInit = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBOPENGL 1
_ACEOF
- GL_LIBS="$LIBS -lglut -lGLU -lGL -lpthread"
- gl_support="yes"
+ GL_LIBS="$LIBS -lglut -lGLU -lGL -lpthread"
+ gl_support="yes"
+else
+ { echo "$as_me:$LINENO: WARNING: GLUT library not found. pfsglview will not be compiled " >&5
+echo "$as_me: WARNING: GLUT library not found. pfsglview will not be compiled " >&2;}
+ gl_support="no"
+fi
+
+
else
{ echo "$as_me:$LINENO: WARNING: OpenGL test failed. pfsglview will not be compiled " >&5
echo "$as_me: WARNING: OpenGL test failed. pfsglview will not be compiled " >&2;}
@@ -20818,8 +20889,27 @@
- ac_config_files="$ac_config_files Makefile src/Makefile src/pfs/Makefile src/pfs/pfs.pc src/fileformat/Makefile src/filter/Makefile src/octave/Makefile src/pfsview/Makefile src/pfsglview/Makefile src/matlab/Makefile doc/Makefile"
+ ac_config_files="$ac_config_files Makefile"
+
+ ac_config_files="$ac_config_files src/Makefile"
+
+ ac_config_files="$ac_config_files src/pfs/Makefile"
+
+ ac_config_files="$ac_config_files src/pfs/pfs.pc"
+
+ ac_config_files="$ac_config_files src/fileformat/Makefile"
+
+ ac_config_files="$ac_config_files src/filter/Makefile"
+
+ ac_config_files="$ac_config_files src/octave/Makefile"
+
+ ac_config_files="$ac_config_files src/pfsview/Makefile"
+
+ ac_config_files="$ac_config_files src/pfsglview/Makefile"
+
+ ac_config_files="$ac_config_files src/matlab/Makefile"
+ ac_config_files="$ac_config_files doc/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -21274,7 +21364,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by pfstools $as_me 1.6.1, which was
+This file was extended by pfstools $as_me 1.6.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21337,7 +21427,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-pfstools config.status 1.6.1
+pfstools config.status 1.6.2
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pfstools-1.6.1/configure.ac new/pfstools-1.6.2/configure.ac
--- old/pfstools-1.6.1/configure.ac 2007-04-24 14:38:16.000000000 +0200
+++ new/pfstools-1.6.2/configure.ac 2007-07-04 16:37:40.000000000 +0200
@@ -1,7 +1,7 @@
dnl
dnl Initialization part
dnl
-AC_INIT(pfstools, 1.6.1)
+AC_INIT(pfstools, 1.6.2)
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
@@ -344,15 +344,19 @@
*)
AC_CHECK_LIB(GL, glDisable,
[
- AC_DEFINE( HAVE_LIBOPENGL, 1, [OpenGL libraries are required.])
- GL_LIBS="$LIBS -lglut -lGLU -lGL -lpthread"
- gl_support="yes"],
+ AC_CHECK_LIB(glut, glutInit,
+ AC_DEFINE( HAVE_LIBOPENGL, 1, [OpenGL libraries are required.])
+ GL_LIBS="$LIBS -lglut -lGLU -lGL -lpthread"
+ gl_support="yes",
+ AC_MSG_WARN( [GLUT library not found. pfsglview will not be compiled] )
+ gl_support="no" )
+ ],
[AC_MSG_WARN( [OpenGL test failed. pfsglview will not be compiled] )
gl_support="no"]
,)
;;
esac
-
+
else
gl_support="no"
fi
@@ -497,19 +501,17 @@
AC_SUBST(OCTAVE_M_DIR)
AC_SUBST(OCTAVE_OCT_DIR)
-AC_CONFIG_FILES([ Makefile \
- src/Makefile \
- src/pfs/Makefile \
- src/pfs/pfs.pc \
- src/fileformat/Makefile \
- src/filter/Makefile \
- src/octave/Makefile \
- src/pfsview/Makefile \
- src/pfsglview/Makefile \
- src/matlab/Makefile \
- doc/Makefile \
- ])
-
+AC_CONFIG_FILES([ Makefile ])
+AC_CONFIG_FILES([ src/Makefile ])
+AC_CONFIG_FILES([ src/pfs/Makefile ])
+AC_CONFIG_FILES([ src/pfs/pfs.pc ])
+AC_CONFIG_FILES([ src/fileformat/Makefile ])
+AC_CONFIG_FILES([ src/filter/Makefile ])
+AC_CONFIG_FILES([ src/octave/Makefile ])
+AC_CONFIG_FILES([ src/pfsview/Makefile ])
+AC_CONFIG_FILES([ src/pfsglview/Makefile ])
+AC_CONFIG_FILES([ src/matlab/Makefile ])
+AC_CONFIG_FILES([ doc/Makefile ])
AC_OUTPUT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pfstools-1.6.1/doc/Makefile.am new/pfstools-1.6.2/doc/Makefile.am
--- old/pfstools-1.6.1/doc/Makefile.am 2006-03-16 11:13:48.000000000 +0100
+++ new/pfstools-1.6.2/doc/Makefile.am 2007-06-28 10:53:11.000000000 +0200
@@ -1,7 +1,7 @@
EXTRA_DIST = faq.txt pfs_format_spec.tex pfs_format_spec.pdf data_model.png
TARGET=pfs_format_spec
-SOURCES=pfs_format_spec.tex
+SOURCES=$(top_srcdir)/doc/pfs_format_spec.tex
# make pdf by default
all: ${TARGET}.pdf
@@ -10,7 +10,7 @@
# (pdflatex ${TARGET} || rm ${TARGET}.pdf) && bibtex ${TARGET} && pdflatex ${TARGET}
${TARGET}.pdf: ${SOURCES} ${TARGET}.tex
- @((pdflatex ${TARGET} && pdflatex ${TARGET}) || rm ${TARGET}.pdf)
+ @((TEXINPUTS=$(top_srcdir)/doc: && pdflatex ${TARGET} && pdflatex ${TARGET}) || rm ${TARGET}.pdf)
clean:
rm -f ${TARGET}.{log,aux,ps,dvi,bbl,blg,log,pdf}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pfstools-1.6.1/doc/Makefile.in new/pfstools-1.6.2/doc/Makefile.in
--- old/pfstools-1.6.1/doc/Makefile.in 2007-04-24 14:39:15.000000000 +0200
+++ new/pfstools-1.6.2/doc/Makefile.in 2007-07-04 16:43:26.000000000 +0200
@@ -172,7 +172,7 @@
EXTRA_DIST = faq.txt pfs_format_spec.tex pfs_format_spec.pdf data_model.png
TARGET = pfs_format_spec
-SOURCES = pfs_format_spec.tex
+SOURCES = $(top_srcdir)/doc/pfs_format_spec.tex
subdir = doc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -180,7 +180,7 @@
CONFIG_CLEAN_FILES =
DIST_SOURCES =
DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-SOURCES = pfs_format_spec.tex
+SOURCES = $(top_srcdir)/doc/pfs_format_spec.tex
all: all-am
@@ -329,7 +329,7 @@
# (pdflatex ${TARGET} || rm ${TARGET}.pdf) && bibtex ${TARGET} && pdflatex ${TARGET}
${TARGET}.pdf: ${SOURCES} ${TARGET}.tex
- @((pdflatex ${TARGET} && pdflatex ${TARGET}) || rm ${TARGET}.pdf)
+ @((TEXINPUTS=$(top_srcdir)/doc: && pdflatex ${TARGET} && pdflatex ${TARGET}) || rm ${TARGET}.pdf)
clean:
rm -f ${TARGET}.{log,aux,ps,dvi,bbl,blg,log,pdf}
Files old/pfstools-1.6.1/doc/pfs_format_spec.pdf and new/pfstools-1.6.2/doc/pfs_format_spec.pdf differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pfstools-1.6.1/doc/pfs_format_spec.tex new/pfstools-1.6.2/doc/pfs_format_spec.tex
--- old/pfstools-1.6.1/doc/pfs_format_spec.tex 2006-08-18 02:31:23.000000000 +0200
+++ new/pfstools-1.6.2/doc/pfs_format_spec.tex 2007-06-28 11:22:58.000000000 +0200
@@ -28,7 +28,7 @@
\begin{document}
-\title{Specification of the PFS File Format\\version 1.3}
+\title{Specification of the PFS File Format\\version 1.4}
\maketitle
@@ -60,7 +60,8 @@
\item 1.0 (15.12.2004 RM) --- Original version
\item 1.1 (14.02.2005 RM) --- Colon ':' is no longer allowed in the name of a tag; Added a conceptual UML data-model
\item 1.2 (16.03.2006 RM) --- Fixed typos (thanks to grendelkhan)
-\item 1.3 (16.08.2006 RM) --- Added a list of registered channel names; added comments on endianness; fixes some more typos)
+\item 1.3 (16.08.2006 RM) --- Added a list of registered channel names; added comments on endianness)
+\item 1.4 (28.06.2007 RM) --- Fixed column-/row-major ambiguity (thanks to Matt)
\end{itemize}
@@ -163,7 +164,7 @@
\hline
~~channelData&
\emph{bin-float}{[}w{]}{[}h{]}&
-Column major array of 32-bit floating points\tabularnewline
+Row-major array of 32-bit floating points\tabularnewline
\hline
\end{tabular}
@@ -171,8 +172,8 @@
\caption{\label{cap:pfs-frame}A structure of pfs-frame. Bold font denotes
literal strings. '\P'~is a unix-type end of line character
(ASCII code 10). Types: \emph{int} -- integer value given as string;
-\emph{string} -- a string of one or more characters; \emph{bin-float}{[}h{]}{[}w{]}
--- a column major array of 32-bit floating point numbers in binary format.}
+\emph{string} -- a string of one or more characters; \emph{bin-float}{[}w{]}{[}h{]}
+-- a row major array of 32-bit floating point numbers in binary format.}
\end{table}
\section{Channels}
@@ -190,7 +191,7 @@
is used by CPU for most architectures, including Intel-based PC's, so
it is enough to store the values in memory as a C 'float' type and
then write them to an IO stream. An array should be encoded in a
-stream in a column major order --- all cells of a first row are
+stream in a row major order --- all cells of a first row are
followed by the cells of a second row and so on. The encoding starts
from the top left corner. The bytes should be encoded in the
little-endian order (LSB), which is appropriate for the x86
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pfstools-1.6.1/README new/pfstools-1.6.2/README
--- old/pfstools-1.6.1/README 2007-04-24 13:38:45.000000000 +0200
+++ new/pfstools-1.6.2/README 2007-07-04 16:36:48.000000000 +0200
@@ -1,6 +1,49 @@
-This is a readme file for the pfstools package.
--------------------------------------------------------------------
-
+ pfstools - README
+-------------------------------------------------------------------
+
+pfstools is a set of command line (and one GUI) programs for reading,
+writing, manipulating and viewing high-dynamic range (HDR) images and
+video frames. All programs in the package exchange data using unix
+pipes and a simple generic HDR image format (pfs). The concept of the
+pfstools is similar to netpbm package for low-dynamic range images.
+
+pfstools offers also a good integration with GNU Octave and
+matlab. pfstools can serve as a matlab or Octave toolbox for reading
+and writing HDR images or simply to effectively store large matrices.
+
+pfs in not just another format for storing HDR images (and there are
+already quite a few of them). It is more an attempt to integrate the
+existing HDR image formats by providing a simple data format that can
+be used to exchange data between applications.
+
+If you use the software for your research work, please consider citing
+the paper:
+
+Rafal Mantiuk, Grzegorz Krawczyk, Radoslaw Mantiuk and Hans-Peter Seidel.
+High Dynamic Range Imaging Pipeline: Perception-motivated Representation
+of Visual Content.
+In: Proc. of Human Vision and Electronic Imaging XII. 649212.
+
+@inproceedings{mantiuk:2007:hvei,
+ author = {Mantiuk, Rafa{\l} and Krawczyk, Grzegorz and Mantiuk, Rados{\l}aw and Seidel, Hans-Peter},
+ editor = {Rogowitz, Bernice E. and Pappas, Thrasyvoulos N. and Daly, Scott J.},
+ title = {High Dynamic Range Imaging Pipeline: Perception-motivated Representation of Visual Content},
+ booktitle = {Human Vision and Electronic Imaging XII},
+ publisher = {SPIE},
+ year = {2007},
+ volume = {6492},
+ number = {649212},
+ series = {Proceedings of SPIE},
+ address = {San Jose, USA},
+ month = {February},
+}
+
+The paper is an introduction to both pfstools and HDR imaging in
+general. It can be downloaded from:
+
+http://www.mpi-inf.mpg.de/resources/pfstools/papers/mantiuk07hdr_pipeline.pd...
+
+
1. Compilation
-------------------------------------------------------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pfstools-1.6.1/src/matlab/pfsview.m new/pfstools-1.6.2/src/matlab/pfsview.m
--- old/pfstools-1.6.1/src/matlab/pfsview.m 2007-04-03 10:30:24.000000000 +0200
+++ new/pfstools-1.6.2/src/matlab/pfsview.m 2007-05-23 12:31:04.000000000 +0200
@@ -19,9 +19,21 @@
C = varargin{i};
width = size( C{1}, 2 );
height = size( C{1}, 1 );
- for j=1:length(C)
- ch_name = sprintf( 'cell_%d_%d', n, j );
- channels.(ch_name) = C{j};
+ if( size( C, 1 ) > 1 )
+ for j=1:size(C,1)
+ for k=1:size(C,2)
+ if( any( size(C{j,k}) ~= [height width] ) )
+ continue; % empty or invalid cell
+ end
+ ch_name = sprintf( 'c_%d_%dx%d', n, j, k );
+ channels.(ch_name) = C{j, k};
+ end
+ end
+ else
+ for j=1:length(C)
+ ch_name = sprintf( 'cell_%d_%d', n, j );
+ channels.(ch_name) = C{j};
+ end
end
n = n+1;
elseif( isnumeric( varargin{i} ) )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pfstools-1.6.1/src/pfs/colorspace.cpp new/pfstools-1.6.2/src/pfs/colorspace.cpp
--- old/pfstools-1.6.1/src/pfs/colorspace.cpp 2006-11-06 17:39:15.000000000 +0100
+++ new/pfstools-1.6.2/src/pfs/colorspace.cpp 2007-06-14 16:14:53.000000000 +0200
@@ -22,7 +22,7 @@
*
* @author Rafal Mantiuk,