Attachment #166933 for bug #206239





RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash

PFS_CPPFLAGS=	-I${LOCALBASE}/include
PFS_LDFLAGS=	-L${LOCALBASE}/lib
PFS_BUILD=	${MACHINE_ARCH}-portbld-freebsd${OSREL}
PLIST_SUB+=	PFS_BASE=${PREFIX}


CONFIGURE_TARGET=	${PFS_BUILD}
CONFIGURE_ARGS=	--disable-jpeghdr --disable-matlab \
		--with-bash=${LOCALBASE}/bin/bash
CONFIGURE_ENV=	PKG_CONFIG_PATH=${LOCALBASE}/libdata/pkgconfig
		LDFLAGS="${PFS_LDFLAGS}" \
		PKG_CONFIG_PATH=${LOCALBASE}/libdata/pkgconfig
USE_LDCONFIG=	yes
USES=		gmake pkgconfig libtool


OPTIONS_DEFAULT=	TIFF
OPTIONS_SUB=		yes

NETPBM_CONFIGURE_ENABLE=	netpbm
NETPBM_LIB_DEPENDS=		libnetpbm.so:${PORTSDIR}/graphics/netpbm

OPENEXR_CONFIGURE_ENABLE=	openexr

TIFF_CONFIGURE_ENABLE=		tiff
TIFF_LIB_DEPENDS=		libtiff.so:${PORTSDIR}/graphics/tiff

QT_CONFIGURE_ENABLE=		qt
QT_USE=				QT4=moc_build,corelib,gui

IMAGEMAGICK_CONFIGURE_ENABLE=	imagemagick
IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick

GDAL_CONFIGURE_ENABLE=		gdal
GDAL_LIB_DEPENDS=		libgdal.so:${PORTSDIR}/graphics/gdal

OPENGL_CONFIGURE_ENABLE=	opengl
OPENGL_USE=			GL=glut

OCTAVE_VERSION!=${OCTAVE_BASE}/bin/octave-config -v 2>&1 || ${ECHO} "0"
OCTAVE_SITE_OCT!=${OCTAVE_BASE}/bin/octave-config --oct-site-dir 2>&1 || ${ECHO} ""
OCTAVE_SITE_M!=	${OCTAVE_BASE}/bin/octave-config --m-site-dir 2>&1 || ${ECHO} ""
PLIST_SUB+=	\
		OCTAVE_BASE=${OCTAVE_BASE} \
		OCTAVE_SITE_M=${OCTAVE_SITE_M:S|^${OCTAVE_BASE}/||} \
		OCTAVE_SITE_OCT=${OCTAVE_SITE_OCT:S|^${OCTAVE_BASE}/||}

SHEBANG_FILES=	src/octave/*
SHEBANG_LANG+=	octave
octave_OLD_CMD?=/usr/bin/octave
octave_CMD?=	${OCTAVE_BASE}/bin/octave
.endif

.include <bsd.port.mk>

Lines 1-5 Link Here

(-)pfstools/files/patch-config.h.in (-2 / +2 lines)
1	--- config.h.in.orig 2011-10-27 08:40:42.000000000 +0000	1	--- config.h.in.orig 2011-10-27 08:40:42 UTC
2	+++ config.h.in 2014-02-20 19:04:01.536587053 +0000	2	+++ config.h.in
3	@@ -99,13 +99,13 @@	3	@@ -99,13 +99,13 @@
4		4
5	/* Output stream for debug messages. */	5	/* Output stream for debug messages. */




--- configure.orig	2011-10-27 08:40:31 UTC
+++ configure
@@ -15411,7 +15411,7 @@ fi #end of PKG_CHECK_MODULES
   imagemagick_support="no"
 else
 	IMAGEMAGICK_CFLAGS=$pkg_cv_IMAGEMAGICK_CFLAGS
-	IMAGEMAGICK_LIBS=$pkg_cv_IMAGEMAGICK_LIBS
+	IMAGEMAGICK_LIBS="$pkg_cv_IMAGEMAGICK_LIBS /usr/local/lib/gcc47/libstdc++.so"
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
@@ -15411,7 +15411,7 @@
 if test -z "$QTDIR"; then
   MOC="moc-qt4"
 else

Lines 1-6 Link Here

(-)pfstools/files/patch-src-fileformat-exrio.cpp (-4 / +4 lines)
1	--- src/fileformat/exrio.cpp.orig 2005-06-15 13:36:54.000000000 +0000	1	--- src/fileformat/exrio.cpp.orig 2005-06-15 13:36:54 UTC
2	+++ src/fileformat/exrio.cpp 2014-02-20 19:04:01.546588828 +0000	2	+++ src/fileformat/exrio.cpp
3	@@ -54,14 +54,14 @@	3	@@ -54,14 +54,14 @@ OpenEXRReader::OpenEXRReader( const char
4	}	4	}
5		5
6	DEBUG_STR << "OpenEXR file \"" << filename << "\" ("	6	DEBUG_STR << "OpenEXR file \"" << filename << "\" ("
Lines 17-23 Link Here
17		17
18	Imf::Rgba* tmp_img = new Imf::Rgba[width*height];	18	Imf::Rgba* tmp_img = new Imf::Rgba[width*height];
19		19
20	@@ -93,7 +93,7 @@	20	@@ -93,7 +93,7 @@ void OpenEXRReader::readImage( pfs::Arra
21	OpenEXRReader::~OpenEXRReader()	21	OpenEXRReader::~OpenEXRReader()
22	{	22	{
23	delete file;	23	delete file;




--- src/fileformat/hdrtiffio.cpp.orig	2011-10-27 08:39:07 UTC
+++ src/fileformat/hdrtiffio.cpp
@@ -66,7 +66,7 @@ HDRTiffReader::HDRTiffReader( const char
   }
 
   DEBUG_STR << "TIFF file \"" << filename << "\" ("

 
 	//--- image parameters
   if(!TIFFGetField(tif, TIFFTAG_COMPRESSION, &comp)) // compression type
@@ -81,7 +81,7 @@ HDRTiffReader::HDRTiffReader( const char
   switch(phot)
   {
     case PHOTOMETRIC_LOGLUV:

       if (comp != COMPRESSION_SGILOG && comp != COMPRESSION_SGILOG24)
       {
 	TIFFClose(tif);
@@ -96,7 +96,7 @@ HDRTiffReader::HDRTiffReader( const char
       relative_values=true;
       break;
     case PHOTOMETRIC_RGB:

      // read extra samples (# of alpha channels)
       if (TIFFGetField( tif, TIFFTAG_EXTRASAMPLES,
                         &extra_samples_per_pixel, &extra_sample_types )!=1)
@@ -121,36 +121,36 @@ HDRTiffReader::HDRTiffReader( const char
       if( bps==8 )
       {
 	TypeOfData = BYTE;

 	TIFFClose(tif);
 	throw pfs::Exception("TIFF: unsupported bits per sample for "
 			     "grayscale image.");
@@ -160,7 +160,7 @@ HDRTiffReader::HDRTiffReader( const char
       relative_values=true;
       break;
     default:

       TIFFClose(tif);
       strcpy(format_string,"unknown");
       relative_values=false;
@@ -184,12 +184,12 @@ void HDRTiffReader::readImage( pfs::Arra
   //--- image length
   uint32 imagelength;
   TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &imagelength);

Lines 1-6 Link Here

(-)pfstools/files/patch-src-fileformat-pfsinexr.cpp (-3 / +3 lines)
1	--- src/fileformat/pfsinexr.cpp.orig 2008-01-01 13:01:21.000000000 +0000	1	--- src/fileformat/pfsinexr.cpp.orig 2008-01-01 13:01:21 UTC
2	+++ src/fileformat/pfsinexr.cpp 2014-02-20 19:04:01.546588828 +0000	2	+++ src/fileformat/pfsinexr.cpp
3	@@ -234,7 +234,7 @@	3	@@ -234,7 +234,7 @@ void readFrames( int argc, char* argv[]
4	}	4	}
5		5
6	file.setFrameBuffer( frameBuffer );	6	file.setFrameBuffer( frameBuffer );

Lines 1-6 Link Here

(-)pfstools/files/patch-src-fileformat-pfsinimgmagick.cpp (-4 / +4 lines)
1	--- src/fileformat/pfsinimgmagick.cpp.orig 2008-10-03 19:07:34.000000000 +0000	1	--- src/fileformat/pfsinimgmagick.cpp.orig 2008-10-03 19:07:34 UTC
2	+++ src/fileformat/pfsinimgmagick.cpp 2014-02-20 19:04:01.546588828 +0000	2	+++ src/fileformat/pfsinimgmagick.cpp
3	@@ -108,6 +108,7 @@	3	@@ -108,6 +108,7 @@ void readFrames( int argc, char* argv[]
4	if( ff.fh == NULL ) break; // No more frames	4	if( ff.fh == NULL ) break; // No more frames
5	it.closeFrameFile( ff );	5	it.closeFrameFile( ff );
6		6
Lines 8-14 Link Here
8	VERBOSE_STR << "reading file '" << ff.fileName << "'" << std::endl;	8	VERBOSE_STR << "reading file '" << ff.fileName << "'" << std::endl;
9	Magick::Image imImage( ff.fileName );	9	Magick::Image imImage( ff.fileName );
10		10
11	@@ -172,7 +173,7 @@	11	@@ -172,7 +173,7 @@ void readFrames( int argc, char* argv[]
12	frame->getTags()->setString( "FILE_NAME", fileNameTag );	12	frame->getTags()->setString( "FILE_NAME", fileNameTag );
13		13
14	char strbuf[3];	14	char strbuf[3];

Lines 1-6 Link Here

(-)pfstools/files/patch-src-fileformat-pfsinjpeghdr.cpp (-4 / +4 lines)
1	--- src/fileformat/pfsinjpeghdr.cpp.orig 2005-11-04 08:54:27.000000000 +0000	1	--- src/fileformat/pfsinjpeghdr.cpp.orig 2005-11-04 08:54:27 UTC
2	+++ src/fileformat/pfsinjpeghdr.cpp 2014-02-20 19:04:01.546588828 +0000	2	+++ src/fileformat/pfsinjpeghdr.cpp
3	@@ -123,8 +123,8 @@	3	@@ -123,8 +123,8 @@ void readFrames( int argc, char* argv[]
4	case JPEG_HEADER_HDR: // HDR image	4	case JPEG_HEADER_HDR: // HDR image
5	jpeghdr_start_decompress(&jhinf);	5	jpeghdr_start_decompress(&jhinf);
6	frame = pfsio.createFrame( jhinf.cinfo.output_width, jhinf.cinfo.output_height );	6	frame = pfsio.createFrame( jhinf.cinfo.output_width, jhinf.cinfo.output_height );
Lines 11-17 Link Here
11	// Important: test jhinf.output_scanline, not jhinf.cinfo	11	// Important: test jhinf.output_scanline, not jhinf.cinfo
12	int index ;	12	int index ;
13	index = 0;	13	index = 0;
14	@@ -144,7 +144,7 @@	14	@@ -144,7 +144,7 @@ void readFrames( int argc, char* argv[]
15	(Z->getRawData())[i] = hdrscan[3*i + 2];	15	(Z->getRawData())[i] = hdrscan[3*i + 2];
16	}	16	}
17	pfs::transformColorSpace( pfs::CS_RGB, X, Y, Z, pfs::CS_XYZ, X, Y, Z );	17	pfs::transformColorSpace( pfs::CS_RGB, X, Y, Z, pfs::CS_XYZ, X, Y, Z );

Lines 1-6 Link Here

(-)pfstools/files/patch-src-fileformat-pfsoutimgmagick.cpp (-3 / +3 lines)
1	--- src/fileformat/pfsoutimgmagick.cpp.orig 2011-03-15 08:47:24.000000000 +0000	1	--- src/fileformat/pfsoutimgmagick.cpp.orig 2011-03-15 08:47:24 UTC
2	+++ src/fileformat/pfsoutimgmagick.cpp 2014-02-20 19:04:01.546588828 +0000	2	+++ src/fileformat/pfsoutimgmagick.cpp
3	@@ -190,6 +190,7 @@	3	@@ -190,6 +190,7 @@ void writeFrames( int argc, char* argv[]
4	if( alpha != NULL )	4	if( alpha != NULL )
5	imgBuffer[i++] = (unsigned short)(maxValue-clamp((alpha)(pix),0.f,1.f)maxValue);	5	imgBuffer[i++] = (unsigned short)(maxValue-clamp((alpha)(pix),0.f,1.f)maxValue);
6	}	6	}




--- src/fileformat/pfsoutjpeghdr.cpp.orig	2005-11-04 08:54:27 UTC
+++ src/fileformat/pfsoutjpeghdr.cpp
@@ -69,8 +69,7 @@ void writeHDRJPEGGray( FILE *fh, int wid
    jhinf.correction = correction;
    jpeg_stdio_dest(&jhinf.cinfo, fh);
    

    
    for(int i=0;i<width * height;i++)
    {
@@ -91,7 +90,7 @@ void writeHDRJPEGGray( FILE *fh, int wid
    // Or, assign jhinf.tmi 8-bit grayscale values in scanline order
    jpeghdr_do_compress(&jhinf);
    jpeghdr_destroy_compress(&jhinf);

 }
 
 void writeHDRJPEGRGB( FILE *fh, int width, int height,
@@ -111,8 +110,7 @@ void writeHDRJPEGRGB( FILE *fh, int widt
    jhinf.beta = beta;
    jpeg_stdio_dest(&jhinf.cinfo, fh);
    

    
    for(int i=0;i<width * height;i++)
    {
@@ -135,7 +133,7 @@ void writeHDRJPEGRGB( FILE *fh, int widt
    jpeghdr_do_compress(&jhinf);
    jpeghdr_destroy_compress(&jhinf);
 

Lines 1-6 Link Here

(-)pfstools/files/patch-src-fileformat-pfsoutpfm.cpp (-4 / +4 lines)
1	--- src/fileformat/pfsoutpfm.cpp.orig 2005-06-15 13:36:54.000000000 +0000	1	--- src/fileformat/pfsoutpfm.cpp.orig 2005-06-15 13:36:54 UTC
2	+++ src/fileformat/pfsoutpfm.cpp 2014-02-20 19:04:01.546588828 +0000	2	+++ src/fileformat/pfsoutpfm.cpp
3	@@ -74,7 +74,7 @@	3	@@ -74,7 +74,7 @@ void writePFMFileColor( FILE *fh, int wi
4	}	4	}
5	int written = fwrite( line, sizeof( float ), lineSize, fh );	5	int written = fwrite( line, sizeof( float ), lineSize, fh );
6	if( written != lineSize )	6	if( written != lineSize )
Lines 9-15 Link Here
9	}	9	}
10	delete[] line;	10	delete[] line;
11	}	11	}
12	@@ -94,7 +94,7 @@	12	@@ -94,7 +94,7 @@ void writePFMFileGrayscale( FILE *fh, in
13	}	13	}
14	int written = fwrite( line, sizeof( float ), lineSize, fh );	14	int written = fwrite( line, sizeof( float ), lineSize, fh );
15	if( written != lineSize )	15	if( written != lineSize )

Lines 1-6 Link Here

(-)pfstools/files/patch-src-fileformat-ppmio.cpp (-3 / +3 lines)
1	--- src/fileformat/ppmio.cpp.orig 2009-05-25 19:24:49.000000000 +0000	1	--- src/fileformat/ppmio.cpp.orig 2009-05-25 19:24:49 UTC
2	+++ src/fileformat/ppmio.cpp 2014-02-20 19:04:01.556587853 +0000	2	+++ src/fileformat/ppmio.cpp
3	@@ -34,6 +34,8 @@	3	@@ -34,6 +34,8 @@ extern "C" {
4	#include <math.h>	4	#include <math.h>
5	#include <assert.h>	5	#include <assert.h>
6		6




--- src/fileformat/rgbeio.cpp.orig	2007-12-06 11:00:49 UTC
+++ src/fileformat/rgbeio.cpp
@@ -141,7 +141,7 @@ void rgb2rgbe( float r, float g, float b
 // Reading RGBE files
 void readRadianceHeader( FILE *file, int &width, int &height, float &exposure )
 {

 
   // read header information
   char head[255];
@@ -208,7 +208,7 @@ void readRadianceHeader( FILE *file, int
 	height = height - width;
 	}
 */

 }
 
 
@@ -389,7 +389,7 @@ void writeRadiance( FILE *file, pfs::Arr
   int width = X->getCols();
   int height = X->getRows();
 

Lines 1-5 Link Here

(-)pfstools/files/patch-src-filter-Makefile.am (-3 / +3 lines)
1	--- src/filter/Makefile.am.orig 2009-05-30 06:59:10.000000000 +0000	1	--- src/filter/Makefile.am.orig 2009-05-30 06:59:10 UTC
2	+++ src/filter/Makefile.am 2014-02-20 19:04:01.556587853 +0000	2	+++ src/filter/Makefile.am
3	@@ -1,6 +1,7 @@	3	@@ -1,6 +1,7 @@
4	###	4	###
5	bin_PROGRAMS = pfsgamma pfsclamp pfstag pfssize pfsextractchannels pfspanoramic \	5	bin_PROGRAMS = pfsgamma pfsclamp pfstag pfssize pfsextractchannels pfspanoramic \
Lines 9-15 Link Here
9		9
10	man_MANS = pfsgamma.1 pfsclamp.1 pfstag.1 pfssize.1 pfsextractchannels.1 \	10	man_MANS = pfsgamma.1 pfsclamp.1 pfstag.1 pfssize.1 pfsextractchannels.1 \
11	pfspanoramic.1 pfsrotate.1 pfsflip.1 pfscut.1 pfspad.1 pfscat.1 \	11	pfspanoramic.1 pfsrotate.1 pfsflip.1 pfscut.1 pfspad.1 pfscat.1 \
12	@@ -34,6 +35,8 @@	12	@@ -34,6 +35,8 @@ pfscat_SOURCES = pfscat.cpp
13		13
14	pfsabsolute_SOURCES = pfsabsolute.cpp	14	pfsabsolute_SOURCES = pfsabsolute.cpp
15		15




--- src/filter/Makefile.in.orig	2011-10-27 08:40:29 UTC
+++ src/filter/Makefile.in
@@ -38,7 +38,8 @@ bin_PROGRAMS = pfsgamma$(EXEEXT) pfsclam
 	pfssize$(EXEEXT) pfsextractchannels$(EXEEXT) \
 	pfspanoramic$(EXEEXT) pfsrotate$(EXEEXT) pfsflip$(EXEEXT) \
 	pfscut$(EXEEXT) pfspad$(EXEEXT) pfscat$(EXEEXT) \

 subdir = src/filter
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -54,6 +55,9 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)

 am_pfsabsolute_OBJECTS = pfsabsolute.$(OBJEXT)
 pfsabsolute_OBJECTS = $(am_pfsabsolute_OBJECTS)
 pfsabsolute_LDADD = $(LDADD)
@@ -120,13 +124,15 @@ SOURCES = $(pfsabsolute_SOURCES) $(pfsca
 	$(pfscut_SOURCES) $(pfsdisplayfunction_SOURCES) \
 	$(pfsextractchannels_SOURCES) $(pfsflip_SOURCES) \
 	$(pfsgamma_SOURCES) $(pfspad_SOURCES) $(pfspanoramic_SOURCES) \

 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -314,6 +320,7 @@ pfscut_SOURCES = pfscut.cpp
 pfspad_SOURCES = pfspad.cpp
 pfscat_SOURCES = pfscat.cpp
 pfsabsolute_SOURCES = pfsabsolute.cpp

 INCLUDES = -I${srcdir}/../pfs
 all: all-am
 
@@ -392,6 +399,9 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list

Lines 1-5 Link Here

(-)pfstools/files/patch-src-filter-pfscat.cpp (-4 / +4 lines)
1	--- src/filter/pfscat.cpp.orig 2008-01-01 13:01:21.000000000 +0000	1	--- src/filter/pfscat.cpp.orig 2008-01-01 13:01:21 UTC
2	+++ src/filter/pfscat.cpp 2014-02-20 19:04:01.556587853 +0000	2	+++ src/filter/pfscat.cpp
3	@@ -27,6 +27,7 @@	3	@@ -27,6 +27,7 @@
4	#include <pfs.h>	4	#include <pfs.h>
5	#include <climits>	5	#include <climits>
Lines 8-14 Link Here
8	#include <getopt.h>	8	#include <getopt.h>
9	#include <fcntl.h>	9	#include <fcntl.h>
10	#include <stdlib.h>	10	#include <stdlib.h>
11	@@ -202,16 +203,12 @@	11	@@ -202,16 +203,12 @@ if (alignment==UNSP) throw pfs::Exceptio
12		12
13	pfs::FrameFileIterator it ( argc, argv, "rb", NULL, NULL, optString, cmdLineOptions);	13	pfs::FrameFileIterator it ( argc, argv, "rb", NULL, NULL, optString, cmdLineOptions);
14	int pipe_no = 0;	14	int pipe_no = 0;
Lines 27-33 Link Here
27	if(pipe_no == 0) { // no named pipes	27	if(pipe_no == 0) { // no named pipes
28	pipe_no = 1;	28	pipe_no = 1;
29	pipes = false;	29	pipes = false;
30	@@ -408,7 +405,6 @@	30	@@ -408,7 +405,6 @@ if(!pipes) {
31	}	31	}
32		32
33	for (int i=0; i<pipe_no; i++) it.closeFrameFile(ff[i]);	33	for (int i=0; i<pipe_no; i++) it.closeFrameFile(ff[i]);

Lines 1-6 Link Here

(-)pfstools/files/patch-src-filter-pfsclamp.cpp (-3 / +3 lines)
1	--- src/filter/pfsclamp.cpp.orig 2005-11-02 13:35:42.000000000 +0000	1	--- src/filter/pfsclamp.cpp.orig 2005-11-02 13:35:42 UTC
2	+++ src/filter/pfsclamp.cpp 2014-02-20 19:04:01.556587853 +0000	2	+++ src/filter/pfsclamp.cpp
3	@@ -151,8 +151,8 @@	3	@@ -151,8 +151,8 @@ void clampFrames( int argc, char* argv[]
4	}	4	}
5	else	5	else
6	{	6	{

Lines 1-6 Link Here

(-)pfstools/files/patch-src-filter-pfsextractchannels.cpp (-3 / +3 lines)
1	--- src/filter/pfsextractchannels.cpp.orig 2005-06-15 13:36:54.000000000 +0000	1	--- src/filter/pfsextractchannels.cpp.orig 2005-06-15 13:36:54 UTC
2	+++ src/filter/pfsextractchannels.cpp 2014-02-20 19:04:01.556587853 +0000	2	+++ src/filter/pfsextractchannels.cpp
3	@@ -46,7 +46,7 @@	3	@@ -46,7 +46,7 @@ void printHelp()
4	"See man page for more information.\n" );	4	"See man page for more information.\n" );
5	}	5	}
6		6




--- src/filter/pfspanoramic.cpp.orig	2010-02-18 11:27:03 UTC
+++ src/filter/pfspanoramic.cpp
@@ -93,7 +93,7 @@ class Vector3D
   }
 
   //TODO: optimize rotations by precomputing sines and cosines

   {
     angle *= (M_PI / 180);
 
@@ -107,7 +107,7 @@ class Vector3D
     z = z2;
   }
 

   {
     angle *= (M_PI / 180);
 
@@ -121,7 +121,7 @@ class Vector3D
     z = z2;
   }
 

   {
     angle *= (M_PI / 180);
 
@@ -195,7 +195,7 @@ class ProjectionFactory
     {
       char *opts;
       

Lines 1-6 Link Here

(-)pfstools/files/patch-src-filter-pfstag.cpp (-4 / +4 lines)
1	--- src/filter/pfstag.cpp.orig 2005-06-15 13:36:54.000000000 +0000	1	--- src/filter/pfstag.cpp.orig 2005-06-15 13:36:54 UTC
2	+++ src/filter/pfstag.cpp 2014-02-20 19:04:01.556587853 +0000	2	+++ src/filter/pfstag.cpp
3	@@ -58,7 +58,7 @@	3	@@ -58,7 +58,7 @@ struct TagOperation
4	string channel;	4	string channel;
5	};	5	};
6		6
Lines 9-15 Link Here
9		9
10	TagOperation parseTagOperation( const char *tag, bool remove )	10	TagOperation parseTagOperation( const char *tag, bool remove )
11	{	11	{
12	@@ -133,9 +133,9 @@	12	@@ -133,9 +133,9 @@ void setTagsOnFrames( int argc, char* ar
13	for( it = setTags.begin(); it != setTags.end(); it++ ) {	13	for( it = setTags.begin(); it != setTags.end(); it++ ) {
14	TagOperation &tagop = *it;	14	TagOperation &tagop = *it;
15	if( tagop.remove )	15	if( tagop.remove )

Lines 1-5 Link Here

(-)pfstools/files/patch-src-filter-pfswb.cpp (-2 / +2 lines)
1	--- src/filter/pfswb.cpp.orig 2014-02-20 19:04:01.556587853 +0000	1	--- src/filter/pfswb.cpp.orig 2016-02-12 17:10:27 UTC
2	+++ src/filter/pfswb.cpp 2014-02-20 19:06:49.706586923 +0000	2	+++ src/filter/pfswb.cpp
3	@@ -0,0 +1,297 @@	3	@@ -0,0 +1,297 @@
4	+/**	4	+/**
5	+ * @file pfswb.cpp	5	+ * @file pfswb.cpp




--- src/hdrhtml/hdrhtml.cpp.orig	2009-03-11 21:45:55 UTC
+++ src/hdrhtml/hdrhtml.cpp
@@ -27,6 +27,7 @@
 
 #include "hdrhtml.h"

 // ================================================
 //        Parameters controllig the web page 
 // ================================================
@@ -94,8 +97,8 @@ public:
     
     if( min_val > max_val )             // missing min/max info
     {

 
       for( int k=0; k < d_size; k++ ) {
         if( data[k] > max_val ) max_val = data[k];
@@ -195,6 +198,7 @@ public:
     this->y_i = new float[lut_size];
     own_y_i = true;
     memcpy(this->y_i, other.y_i, lut_size * sizeof(float));

   }
 
   ~UniformArrayLUT()
@@ -341,7 +345,7 @@ public:
     for( int k = 1; k < bin_n; k++ )
       hist.n[k] += hist.n[k-1];
 

     assert( hist.n[bin_n-1] == d_size );    
   }
 
@@ -361,7 +365,7 @@ public:
 //            Text template file utils
 // ================================================
 

 
 class ReplacePattern
 {
@@ -403,7 +407,7 @@ public:
   {
   }
   

   {
     if( callback != NULL )
       callback( out, user_data, parameter );
@@ -567,7 +571,7 @@ public:
         // Skip white spaces
         while( line_str[pos] == ' ' || line_str[pos] == '\t' ) pos++;
         int new_pos = line_str.find_first_of( ',', pos );

         if( new_pos == std::string::npos ) {
           if( k != columns-1 ) {
             std::string full_message( "Missing column data in the file: " );
@@ -576,16 +580,16 @@ public:
           }
           len = std::string::npos;
         } else

           value = strtof( str_beg, &str_end );
           if( str_beg == str_end ) {
             std::ostringstream error_message;
@@ -643,15 +647,15 @@ void HDRHTMLSet::add_image( int width, i
     basis_table.data[0][k] = log2f( basis_table.data[0][k] );
   
 // Fix zero and negative values in the image, convert to log2 space, find min and max values

       for( int i=0; i < pixels; i++ ) {
         if( x[i] < min_val && x[i] > 0)
           min_val = x[i];
@@ -741,7 +745,7 @@ void HDRHTMLSet::add_image( int width, i
   for( int k=1; k <= f8_stops+1; k++ ) {
 
 

 
     float exp_multip = log2f(1/powf( 2, l_start + k*8 ));
 
@@ -796,9 +800,9 @@ void HDRHTMLSet::add_image( int width, i
   
 }
 

 
 void HDRHTMLSet::generate_webpage( const char *page_template, const char *image_template,
   const char *object_output, const char *html_output)
@@ -852,11 +856,11 @@ void HDRHTMLSet::generate_webpage( const
   
 }
 

   for( it = hdrhtml_set->image_list.begin(); it != hdrhtml_set->image_list.end(); it++ ) {  
     std::string obj_name( "hdr_" );
     obj_name.append( it->base_name );
@@ -882,7 +886,7 @@ void print_image_objects( ostream &out, 
   
 }
 

 {
     std::string obj_name( "hdr_" );
     obj_name.append( it.base_name );
@@ -907,13 +911,13 @@ void print_image_htmlcode( ostream &out,
  
 }
 

     for( it = hdrhtml_set->image_list.begin(); it != hdrhtml_set->image_list.end(); it++ ) {
       if( it->base_name.compare( parameter ) == 0 )
         break;
@@ -925,7 +929,7 @@ void print_image_htmlcode( ostream &out,
     
   } else {
     

     for( it = hdrhtml_set->image_list.begin(); it != hdrhtml_set->image_list.end(); it++ ) {
       
       print_image_htmlcode( out, hdrhtml_set, *it );
@@ -935,7 +939,7 @@ void print_image_htmlcode( ostream &out,
   
 }
 

Lines 1-5 Link Here

(-)pfstools/files/patch-src-matlab-compatibility.h (-2 / +2 lines)
1	--- src/matlab/compatibility.h.orig 2007-03-01 14:10:57.000000000 +0000	1	--- src/matlab/compatibility.h.orig 2007-03-01 14:10:57 UTC
2	+++ src/matlab/compatibility.h 2014-02-20 19:04:01.566588122 +0000	2	+++ src/matlab/compatibility.h
3	@@ -59,6 +59,6 @@	3	@@ -59,6 +59,6 @@
4		4
5	#endif	5	#endif




--- src/octave/pfsclose.cpp.orig	2016-02-12 17:10:27 UTC
+++ src/octave/pfsclose.cpp
@@ -53,9 +53,9 @@ DEFUN_DLD( pfsclose, args, , helpString 
     return retval;
   }
 
-  Octave_map pfsStream = args(0).map_value();
+  octave_map pfsStream = args(0).map_value();
 
-  Octave_map::const_iterator itFH = pfsStream.seek( "FH" );
+  octave_map::const_iterator itFH = pfsStream.seek( "FH" );
   if( itFH == pfsStream.end() ||
     !pfsStream.contents( itFH )(0).is_real_scalar() )
   {




--- src/octave/pfsget.cpp.orig	2016-02-12 17:10:27 UTC
+++ src/octave/pfsget.cpp
@@ -52,9 +52,9 @@ DEFUN_DLD( pfsget, args, , helpString)
     return retval;
   }
 
-  Octave_map pfsStream = args(0).map_value();
+  octave_map pfsStream = args(0).map_value();
 
-  Octave_map::const_iterator itFH = pfsStream.seek( "FH" );
+  octave_map::const_iterator itFH = pfsStream.seek( "FH" );
   if( itFH == pfsStream.end() ||
     !pfsStream.contents( itFH )(0).is_real_scalar() )
   {
@@ -63,7 +63,7 @@ DEFUN_DLD( pfsget, args, , helpString)
   }  
   FILE *fh = (FILE*)((long)(pfsStream.contents( itFH )(0).double_value()));
 
-  Octave_map::const_iterator itMode = pfsStream.seek( "MODE" );
+  octave_map::const_iterator itMode = pfsStream.seek( "MODE" );
   if( itMode == pfsStream.end() || !pfsStream.contents( itMode )(0).is_string() )
   {
     error( SCRIPT_NAME ": MODE field missing in the structure or it has wrong type");
@@ -95,7 +95,7 @@ DEFUN_DLD( pfsget, args, , helpString)
     
       // Add channels as matrices to pfs stream struct
       {
-        Octave_map channels;
+        octave_scalar_map channels;
         
         pfs::ChannelIteratorPtr cit( frame->getChannelIterator() );
         while( cit->hasNext() ) {
@@ -115,7 +115,7 @@ DEFUN_DLD( pfsget, args, , helpString)
 
       //Add tags
       {
-        Octave_map tags;
+        octave_scalar_map tags;
         
         pfs::TagIteratorPtr it( frame->getTags()->getIterator() );        
         while( it->hasNext() ) {
@@ -124,14 +124,14 @@ DEFUN_DLD( pfsget, args, , helpString)
         }
         pfsStream.assign( "tags", tags );
         
-        Octave_map channelTagList;
+        octave_scalar_map channelTagList;
 
         //Copy all channel tags
         pfs::ChannelIteratorPtr cit( frame->getChannelIterator() );
         while( cit->hasNext() ) {
           pfs::Channel *ch = cit->getNext();
 
-          Octave_map channelTags;
+          octave_scalar_map channelTags;
           
           pfs::TagIteratorPtr tit( ch->getTags()->getIterator() );        
           while( tit->hasNext() ) {




--- src/octave/pfsopen.cpp.orig	2016-02-12 17:10:27 UTC
+++ src/octave/pfsopen.cpp
@@ -137,7 +137,7 @@ DEFUN_DLD( pfsopen, args, , helpString)
     }    
   }
 
-  Octave_map pfsStream;
+  octave_map pfsStream;
   pfsStream.assign( "FH", octave_value((double)((long)fh)) );
   pfsStream.assign( "MODE", writeMode ? octave_value("W") : octave_value("R") );
   pfsStream.assign( "EOF", octave_value(false) );
@@ -145,7 +145,7 @@ DEFUN_DLD( pfsopen, args, , helpString)
   if( writeMode ) {
     pfsStream.assign( "columns", octave_value(width) );
     pfsStream.assign( "rows", octave_value(height) );
-    Octave_map channels;
+    octave_map channels;
     pfsStream.assign( "channels", octave_value(channels) );    
   }
   




--- src/octave/pfsput.cpp.orig	2016-02-12 17:10:27 UTC
+++ src/octave/pfsput.cpp
@@ -52,9 +52,9 @@ DEFUN_DLD( pfsput, args, , helpString)
     return retval;
   }
   
-  Octave_map pfsStream = args(0).map_value();
+  octave_map pfsStream = args(0).map_value();
 
-  Octave_map::const_iterator itFH = pfsStream.seek( "FH" );
+  octave_map::const_iterator itFH = pfsStream.seek( "FH" );
   if( itFH == pfsStream.end() ||
     !pfsStream.contents( itFH )(0).is_real_scalar() )
   {
@@ -65,7 +65,7 @@ DEFUN_DLD( pfsput, args, , helpString)
 
   // Check mode
   {                             
-    Octave_map::const_iterator itMode = pfsStream.seek( "MODE" );
+    octave_map::const_iterator itMode = pfsStream.seek( "MODE" );
     if( itMode == pfsStream.end() || !pfsStream.contents( itMode )(0).is_string() )
     {
       error( SCRIPT_NAME ": MODE field missing in the structure or it has wrong type");
@@ -80,8 +80,8 @@ DEFUN_DLD( pfsput, args, , helpString)
   // Get width & height
   int width, height;
   {                             
-    Octave_map::const_iterator itCols = pfsStream.seek( "columns" );
-    Octave_map::const_iterator itRows = pfsStream.seek( "rows" );
+    octave_map::const_iterator itCols = pfsStream.seek( "columns" );
+    octave_map::const_iterator itRows = pfsStream.seek( "rows" );
     if( itCols == pfsStream.end() || itRows == pfsStream.end() ||
       !pfsStream.contents( itCols )(0).is_real_scalar() ||
       !pfsStream.contents( itRows )(0).is_real_scalar() )
@@ -94,9 +94,9 @@ DEFUN_DLD( pfsput, args, , helpString)
   }
 
   // Get channels
-  Octave_map channels;
+  octave_map channels;
   {
-    Octave_map::const_iterator itChannels = pfsStream.seek( "channels" );
+    octave_map::const_iterator itChannels = pfsStream.seek( "channels" );
     if( itChannels == pfsStream.end() ||
       !pfsStream.contents( itChannels )(0).is_map() )
     {
@@ -111,7 +111,7 @@ DEFUN_DLD( pfsput, args, , helpString)
     pfs::Frame *frame = ctx.createFrame( width, height );
 
     // For each channel in the 'channels' map
-    for( Octave_map::iterator itCh = channels.begin(); itCh != channels.end(); itCh++ ) {
+    for( octave_map::iterator itCh = channels.begin(); itCh != channels.end(); itCh++ ) {
       std::string channelName = channels.key(itCh);
 
       if( !channels.contents( itCh )(0).is_real_matrix() ) {
@@ -135,15 +135,15 @@ DEFUN_DLD( pfsput, args, , helpString)
 
     // Copy frame tags
     {
-      Octave_map::const_iterator itTags = pfsStream.seek( "tags" );
+      octave_map::const_iterator itTags = pfsStream.seek( "tags" );
       if( itTags != pfsStream.end() ) {
         if( !pfsStream.contents( itTags )(0).is_map() )
         {
           throw pfs::Exception( "'tags' field must be a structure" );  
         }
         
-        Octave_map tags = pfsStream.contents( itTags )(0).map_value();
-        for( Octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
+        octave_map tags = pfsStream.contents( itTags )(0).map_value();
+        for( octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
           std::string tagName = tags.key(itTag);
 
           if( !tags.contents( itTag )(0).is_string() ) 
@@ -156,14 +156,14 @@ DEFUN_DLD( pfsput, args, , helpString)
 
     // Copy channel tags
     {
-      Octave_map::const_iterator itChTags = pfsStream.seek( "channelTags" );
+      octave_map::const_iterator itChTags = pfsStream.seek( "channelTags" );
       if( itChTags != pfsStream.end() ) {
         if( !pfsStream.contents( itChTags )(0).is_map() )
         {
           throw pfs::Exception( "'channelTags' field must be a structure" );  
         }
-        Octave_map tagChannels = pfsStream.contents( itChTags )(0).map_value();
-        for( Octave_map::iterator itCh = tagChannels.begin(); itCh != tagChannels.end(); itCh++ ) {
+        octave_map tagChannels = pfsStream.contents( itChTags )(0).map_value();
+        for( octave_map::iterator itCh = tagChannels.begin(); itCh != tagChannels.end(); itCh++ ) {
           std::string channelName = tagChannels.key(itCh);
           if( !tagChannels.contents( itCh )(0).is_map() ) {
             throw pfs::Exception( "each channelTags file must be a structure" );  
@@ -173,8 +173,8 @@ DEFUN_DLD( pfsput, args, , helpString)
             throw pfs::Exception( "can not set channel tag if channel is missing" );
           }
           
-          Octave_map tags = tagChannels.contents( itCh )(0).map_value();
-          for( Octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
+          octave_map tags = tagChannels.contents( itCh )(0).map_value();
+          for( octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
             std::string tagName = tags.key(itTag);
             if( !tags.contents( itTag )(0).is_string() ) 
               throw pfs::Exception( "all channel tags must be given as strings" );

Lines 1-6 Link Here

(-)pfstools/files/patch-src-pfs-Makefile.in (-3 / +3 lines)
1	--- src/pfs/Makefile.in.orig 2011-10-27 08:40:30.000000000 +0000	1	--- src/pfs/Makefile.in.orig 2011-10-27 08:40:30 UTC
2	+++ src/pfs/Makefile.in 2014-02-20 19:04:01.566588122 +0000	2	+++ src/pfs/Makefile.in
3	@@ -259,7 +259,7 @@	3	@@ -259,7 +259,7 @@ libpfs_1_2_la_SOURCES = pfs.cpp pfsutils
4	library_includedir = $(includedir)/pfs-1.2	4	library_includedir = $(includedir)/pfs-1.2
5	library_include_HEADERS = pfs.h array2d.h	5	library_include_HEADERS = pfs.h array2d.h
6	#INCLUDES =	6	#INCLUDES =




--- src/pfs/pfs.cpp.orig	2010-07-14 09:44:27 UTC
+++ src/pfs/pfs.cpp
@@ -71,7 +71,7 @@ const char *PFSFILEID="PFS1\x0a";
 // TagContainer implementation  
 //------------------------------------------------------------------------------
 

 
 class TagIteratorImpl: public TagIterator
 {
@@ -570,7 +570,7 @@ public:
 
     //Read channel IDs and tags
     //       FrameImpl::ChannelID *channelID = new FrameImpl::ChannelID[channelCount];

     for( int i = 0; i < channelCount; i++ ) {
       char channelName[MAX_CHANNEL_NAME+1], *rs;
       rs = fgets( channelName, MAX_CHANNEL_NAME, inputStream );
@@ -592,7 +592,7 @@ public:
     
 
     //Read channels




--- src/pfs/pfs.h.orig	2006-03-01 17:21:16 UTC
+++ src/pfs/pfs.h
@@ -115,6 +115,7 @@ namespace pfs
   class TagIterator 
     {
     public:

       /**
        * Get next item on the list.
        *
@@ -135,6 +136,7 @@ namespace pfs
   class TagContainer
     {
     public:

       /**
        * Get a string tag of the name tagName from the TagContainer.
        * @param tagName name of the tag to retrieve
@@ -181,6 +183,7 @@ namespace pfs
  */
   class Channel : public Array2D {
   public:

     /**
      * Gets width of the channel (in pixels).
      * This is a synonym for Array2D::getCols().
@@ -226,6 +229,7 @@ namespace pfs
   class ChannelIterator 
     {
     public:

       /**
        * Get next item on the list.
        */
@@ -580,7 +584,9 @@ namespace pfs
        */
       Exception( const char* const message )
 	{

Lines 1-6 Link Here

(-)pfstools/files/patch-src-pfs-pfsutils.cpp (-3 / +3 lines)
1	--- src/pfs/pfsutils.cpp.orig 2006-09-21 21:42:54.000000000 +0000	1	--- src/pfs/pfsutils.cpp.orig 2006-09-21 21:42:54 UTC
2	+++ src/pfs/pfsutils.cpp 2014-02-20 19:04:01.566588122 +0000	2	+++ src/pfs/pfsutils.cpp
3	@@ -81,7 +81,7 @@	3	@@ -81,7 +81,7 @@ class FrameFileIteratorImpl
4	char fileName[1024];	4	char fileName[1024];
5	FILE *stdinout;	5	FILE *stdinout;
6		6




--- src/pfsglview/picture_io.cpp.orig	2006-11-20 12:13:13 UTC
+++ src/pfsglview/picture_io.cpp
@@ -87,7 +87,7 @@ void PictureIO::setFrame(pfs::Frame *fra
 		return;
 
 	// only XYZ channels are taken into consideration

 		if(verbose)
 			fprintf( stderr, "WARNING: wrong channel (PictureIO::setFrame())\n");
 		return;
@@ -573,7 +573,7 @@ float PictureIO::getDynamicRange(void) {
 	}	
 	std::sort(vec.begin(), vec.end());
 	

 	
 	val = vec[0];
 	std::vector<unsigned int> svec;
@@ -589,7 +589,7 @@ float PictureIO::getDynamicRange(void) {
 	
 	float dr = svec[ svec.size()-1] / svec[0];
 			

Lines 1-5 Link Here

(-)pfstools/files/patch-src-pfsglview-picture_io.h (-2 / +2 lines)
1	--- src/pfsglview/picture_io.h.orig 2008-07-29 16:14:30.000000000 +0000	1	--- src/pfsglview/picture_io.h.orig 2008-07-29 16:14:30 UTC
2	+++ src/pfsglview/picture_io.h 2014-02-20 19:04:01.566588122 +0000	2	+++ src/pfsglview/picture_io.h
3	@@ -6,7 +6,9 @@	3	@@ -6,7 +6,9 @@
4		4
5	#define MAX_FRAMES_IN_MEMORY 10	5	#define MAX_FRAMES_IN_MEMORY 10

Lines 1-6 Link Here

(-)pfstools/files/patch-src-pfsview-pfsview_widget.cpp (-4 / +4 lines)
1	--- src/pfsview/pfsview_widget.cpp.orig 2011-04-30 14:01:17.000000000 +0000	1	--- src/pfsview/pfsview_widget.cpp.orig 2011-04-30 14:01:17 UTC
2	+++ src/pfsview/pfsview_widget.cpp 2014-02-20 19:04:01.566588122 +0000	2	+++ src/pfsview/pfsview_widget.cpp
3	@@ -142,7 +142,7 @@	3	@@ -142,7 +142,7 @@ void PFSViewWidget::setFrame( pfs::Frame
4	// Chose first available channel	4	// Chose first available channel
5	pfs::ChannelIterator *it = frame->getChannels();	5	pfs::ChannelIterator *it = frame->getChannels();
6	if( !it->hasNext() ) // TODO: failover	6	if( !it->hasNext() ) // TODO: failover
Lines 9-15 Link Here
9	visibleChannel = it->getNext()->getName();	9	visibleChannel = it->getNext()->getName();
10	} else if( visibleChannel != COLOR_CHANNELS ) {	10	} else if( visibleChannel != COLOR_CHANNELS ) {
11	// Get a new pointer, as the old frame object	11	// Get a new pointer, as the old frame object
12	@@ -335,8 +335,8 @@	12	@@ -335,8 +335,8 @@ static void mapFrameToImage( pfs::Array2
13	assert( !color \|\| (color && B != NULL) );	13	assert( !color \|\| (color && B != NULL) );
14		14
15		15




man/man1/pfsextractchannels.1.gz
man/man1/pfsflip.1.gz
man/man1/pfsgamma.1.gz
man/man1/pfsglview.1.gz
man/man1/pfsin.1.gz
man/man1/pfsindcraw.1.gz
man/man1/pfsinexr.1.gz

%%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_image_templ_slider-above.html
%%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_image_templ.html
%%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_page_templ_short.html
@dir include/pfs-1.2
%%IMAGEMAGICK%%@dir %%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_assets
%%IMAGEMAGICK%%@dir %%DATADIR%%/hdrhtml_hdrlabs_templ
%%IMAGEMAGICK%%@dir %%DATADIR%%/hdrhtml_default_templ
%%IMAGEMAGICK%%@dir %%DATADIR%%
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_OCT%%/pfstools/pfsclose.oct
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_OCT%%/pfstools/pfsget.oct
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_OCT%%/pfstools/pfsopen.oct
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_OCT%%/pfstools/pfsput.oct
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_OCT%%/pfstools/pfsread.oct
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_OCT%%/pfstools/pfstransform_colorspace.oct
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_OCT%%/pfstools/pfswrite.oct
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfs_close_frames.m
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfs_open_frames.m
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfs_read_luminance.m
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfs_read_rgb.m
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfs_read_xyz.m
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfs_write_rgb.m
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfssize.m
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfsview.m
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfsview_list.m
%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfsview_rgb.m
%%OCTAVE%%@dir %%OCTAVE_SITE_OCT%%/pfstools
%%OCTAVE%%@dir %%OCTAVE_SITE_M%%/pfstools

Return to bug 206239

Lines 14-21 Link Here

(-)pfstools/Makefile (-12 / +8 lines)
14		14
15	RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash	15	RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash
16		16
17	PFS_CPPFLAGS= -I${LOCALBASE}/include
18	PFS_LDFLAGS= -L${LOCALBASE}/lib
19	PFS_BUILD= ${MACHINE_ARCH}-portbld-freebsd${OSREL}	17	PFS_BUILD= ${MACHINE_ARCH}-portbld-freebsd${OSREL}
20	PLIST_SUB+= PFS_BASE=${PREFIX}	18	PLIST_SUB+= PFS_BASE=${PREFIX}
21		19
Lines 23-31 Link Here
23	CONFIGURE_TARGET= ${PFS_BUILD}	21	CONFIGURE_TARGET= ${PFS_BUILD}
24	CONFIGURE_ARGS= --disable-jpeghdr --disable-matlab \	22	CONFIGURE_ARGS= --disable-jpeghdr --disable-matlab \
25	--with-bash=${LOCALBASE}/bin/bash	23	--with-bash=${LOCALBASE}/bin/bash
26	CONFIGURE_ENV= CPPFLAGS="${PFS_CPPFLAGS}" \	24	CONFIGURE_ENV= PKG_CONFIG_PATH=${LOCALBASE}/libdata/pkgconfig
27	LDFLAGS="${PFS_LDFLAGS}" \
28	PKG_CONFIG_PATH=${LOCALBASE}/libdata/pkgconfig
29	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
30	USES= gmake pkgconfig libtool	26	USES= gmake pkgconfig libtool
31		27
Lines 37-43 Link Here
37	OPTIONS_DEFAULT= TIFF	33	OPTIONS_DEFAULT= TIFF
38	OPTIONS_SUB= yes	34	OPTIONS_SUB= yes
39		35
40	NETPBM_CONFIGURE_ENABLE= ppm	36	NETPBM_CONFIGURE_ENABLE= netpbm
41	NETPBM_LIB_DEPENDS= libnetpbm.so:${PORTSDIR}/graphics/netpbm	37	NETPBM_LIB_DEPENDS= libnetpbm.so:${PORTSDIR}/graphics/netpbm
42		38
43	OPENEXR_CONFIGURE_ENABLE= openexr	39	OPENEXR_CONFIGURE_ENABLE= openexr
Lines 47-60 Link Here
47	TIFF_CONFIGURE_ENABLE= tiff	43	TIFF_CONFIGURE_ENABLE= tiff
48	TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff	44	TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff
49		45
50	QT_USE= QT4=moc_build,corelib,gui	46	QT_CONFIGURE_ENABLE= qt
51	QT_CONFIGURE_ENABLE= qt	47	QT_USE= QT4=moc_build,corelib,gui
52		48
53	IMAGEMAGICK_CONFIGURE_ENABLE= imagemagick	49	IMAGEMAGICK_CONFIGURE_ENABLE= imagemagick
54	IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick	50	IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
55		51
56	GDAL_CONFIGURE_ENABLE= gdal	52	GDAL_CONFIGURE_ENABLE= gdal
57	GDAL_LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal	53	GDAL_LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal
58		54
59	OPENGL_CONFIGURE_ENABLE= opengl	55	OPENGL_CONFIGURE_ENABLE= opengl
60	OPENGL_USE= GL=glut	56	OPENGL_USE= GL=glut
Lines 71-77 Link Here
71	OCTAVE_VERSION!=${OCTAVE_BASE}/bin/octave-config -v 2>&1 \|\| ${ECHO} "0"	67	OCTAVE_VERSION!=${OCTAVE_BASE}/bin/octave-config -v 2>&1 \|\| ${ECHO} "0"
72	OCTAVE_SITE_OCT!=${OCTAVE_BASE}/bin/octave-config --oct-site-dir 2>&1 \|\| ${ECHO} ""	68	OCTAVE_SITE_OCT!=${OCTAVE_BASE}/bin/octave-config --oct-site-dir 2>&1 \|\| ${ECHO} ""
73	OCTAVE_SITE_M!= ${OCTAVE_BASE}/bin/octave-config --m-site-dir 2>&1 \|\| ${ECHO} ""	69	OCTAVE_SITE_M!= ${OCTAVE_BASE}/bin/octave-config --m-site-dir 2>&1 \|\| ${ECHO} ""
74	PLIST_SUB+= OCTAVE="" \	70	PLIST_SUB+= \
75	OCTAVE_BASE=${OCTAVE_BASE} \	71	OCTAVE_BASE=${OCTAVE_BASE} \
76	OCTAVE_SITE_M=${OCTAVE_SITE_M:S\|^${OCTAVE_BASE}/\|\|} \	72	OCTAVE_SITE_M=${OCTAVE_SITE_M:S\|^${OCTAVE_BASE}/\|\|} \
77	OCTAVE_SITE_OCT=${OCTAVE_SITE_OCT:S\|^${OCTAVE_BASE}/\|\|}	73	OCTAVE_SITE_OCT=${OCTAVE_SITE_OCT:S\|^${OCTAVE_BASE}/\|\|}
Lines 79-85 Link Here
79	SHEBANG_FILES= src/octave/*	75	SHEBANG_FILES= src/octave/*
80	SHEBANG_LANG+= octave	76	SHEBANG_LANG+= octave
81	octave_OLD_CMD?=/usr/bin/octave	77	octave_OLD_CMD?=/usr/bin/octave
82	octave_CMD?= ${LOCALBASE}/bin/octave	78	octave_CMD?= ${OCTAVE_BASE}/bin/octave
83	.endif	79	.endif
84		80
85	.include <bsd.port.mk>	81	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)pfstools/files/patch-configure (-12 / +3 lines)
1	--- configure.orig 2011-10-27 08:40:31.000000000 +0000	1	--- configure.orig 2011-10-27 08:40:31 UTC
2	+++ configure 2014-02-20 19:04:01.546588828 +0000	2	+++ configure
3	@@ -14827,7 +14827,7 @@	3	@@ -15411,7 +15411,7 @@ fi #end of PKG_CHECK_MODULES
4	imagemagick_support="no"
5	else
6	IMAGEMAGICK_CFLAGS=$pkg_cv_IMAGEMAGICK_CFLAGS
7	- IMAGEMAGICK_LIBS=$pkg_cv_IMAGEMAGICK_LIBS
8	+ IMAGEMAGICK_LIBS="$pkg_cv_IMAGEMAGICK_LIBS /usr/local/lib/gcc47/libstdc++.so"
9	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10	$as_echo "yes" >&6; }
11
12	@@ -15411,7 +15411,7 @@
13	if test -z "$QTDIR"; then	4	if test -z "$QTDIR"; then
14	MOC="moc-qt4"	5	MOC="moc-qt4"
15	else	6	else

Lines 1-6 Link Here

(-)pfstools/files/patch-src-fileformat-hdrtiffio.cpp (-8 / +8 lines)
1	--- src/fileformat/hdrtiffio.cpp.orig 2011-10-27 08:39:07.000000000 +0000	1	--- src/fileformat/hdrtiffio.cpp.orig 2011-10-27 08:39:07 UTC
2	+++ src/fileformat/hdrtiffio.cpp 2014-02-20 19:04:01.546588828 +0000	2	+++ src/fileformat/hdrtiffio.cpp
3	@@ -66,7 +66,7 @@	3	@@ -66,7 +66,7 @@ HDRTiffReader::HDRTiffReader( const char
4	}	4	}
5		5
6	DEBUG_STR << "TIFF file \"" << filename << "\" ("	6	DEBUG_STR << "TIFF file \"" << filename << "\" ("
Lines 9-15 Link Here
9		9
10	//--- image parameters	10	//--- image parameters
11	if(!TIFFGetField(tif, TIFFTAG_COMPRESSION, &comp)) // compression type	11	if(!TIFFGetField(tif, TIFFTAG_COMPRESSION, &comp)) // compression type
12	@@ -81,7 +81,7 @@	12	@@ -81,7 +81,7 @@ HDRTiffReader::HDRTiffReader( const char
13	switch(phot)	13	switch(phot)
14	{	14	{
15	case PHOTOMETRIC_LOGLUV:	15	case PHOTOMETRIC_LOGLUV:
Lines 18-24 Link Here
18	if (comp != COMPRESSION_SGILOG && comp != COMPRESSION_SGILOG24)	18	if (comp != COMPRESSION_SGILOG && comp != COMPRESSION_SGILOG24)
19	{	19	{
20	TIFFClose(tif);	20	TIFFClose(tif);
21	@@ -96,7 +96,7 @@	21	@@ -96,7 +96,7 @@ HDRTiffReader::HDRTiffReader( const char
22	relative_values=true;	22	relative_values=true;
23	break;	23	break;
24	case PHOTOMETRIC_RGB:	24	case PHOTOMETRIC_RGB:
Lines 27-33 Link Here
27	// read extra samples (# of alpha channels)	27	// read extra samples (# of alpha channels)
28	if (TIFFGetField( tif, TIFFTAG_EXTRASAMPLES,	28	if (TIFFGetField( tif, TIFFTAG_EXTRASAMPLES,
29	&extra_samples_per_pixel, &extra_sample_types )!=1)	29	&extra_samples_per_pixel, &extra_sample_types )!=1)
30	@@ -121,36 +121,36 @@	30	@@ -121,36 +121,36 @@ HDRTiffReader::HDRTiffReader( const char
31	if( bps==8 )	31	if( bps==8 )
32	{	32	{
33	TypeOfData = BYTE;	33	TypeOfData = BYTE;
Lines 70-76 Link Here
70	TIFFClose(tif);	70	TIFFClose(tif);
71	throw pfs::Exception("TIFF: unsupported bits per sample for "	71	throw pfs::Exception("TIFF: unsupported bits per sample for "
72	"grayscale image.");	72	"grayscale image.");
73	@@ -160,7 +160,7 @@	73	@@ -160,7 +160,7 @@ HDRTiffReader::HDRTiffReader( const char
74	relative_values=true;	74	relative_values=true;
75	break;	75	break;
76	default:	76	default:
Lines 79-85 Link Here
79	TIFFClose(tif);	79	TIFFClose(tif);
80	strcpy(format_string,"unknown");	80	strcpy(format_string,"unknown");
81	relative_values=false;	81	relative_values=false;
82	@@ -184,12 +184,12 @@	82	@@ -184,12 +184,12 @@ void HDRTiffReader::readImage( pfs::Arra
83	//--- image length	83	//--- image length
84	uint32 imagelength;	84	uint32 imagelength;
85	TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &imagelength);	85	TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &imagelength);

Lines 1-6 Link Here

(-)pfstools/files/patch-src-fileformat-pfsoutjpeghdr.cpp (-6 / +6 lines)
1	--- src/fileformat/pfsoutjpeghdr.cpp.orig 2005-11-04 08:54:27.000000000 +0000	1	--- src/fileformat/pfsoutjpeghdr.cpp.orig 2005-11-04 08:54:27 UTC
2	+++ src/fileformat/pfsoutjpeghdr.cpp 2014-02-20 19:04:01.546588828 +0000	2	+++ src/fileformat/pfsoutjpeghdr.cpp
3	@@ -69,8 +69,7 @@	3	@@ -69,8 +69,7 @@ void writeHDRJPEGGray( FILE *fh, int wid
4	jhinf.correction = correction;	4	jhinf.correction = correction;
5	jpeg_stdio_dest(&jhinf.cinfo, fh);	5	jpeg_stdio_dest(&jhinf.cinfo, fh);
6		6
Lines 10-16 Link Here
10		10
11	for(int i=0;i<width * height;i++)	11	for(int i=0;i<width * height;i++)
12	{	12	{
13	@@ -91,7 +90,7 @@	13	@@ -91,7 +90,7 @@ void writeHDRJPEGGray( FILE *fh, int wid
14	// Or, assign jhinf.tmi 8-bit grayscale values in scanline order	14	// Or, assign jhinf.tmi 8-bit grayscale values in scanline order
15	jpeghdr_do_compress(&jhinf);	15	jpeghdr_do_compress(&jhinf);
16	jpeghdr_destroy_compress(&jhinf);	16	jpeghdr_destroy_compress(&jhinf);
Lines 19-25 Link Here
19	}	19	}
20		20
21	void writeHDRJPEGRGB( FILE *fh, int width, int height,	21	void writeHDRJPEGRGB( FILE *fh, int width, int height,
22	@@ -111,8 +110,7 @@	22	@@ -111,8 +110,7 @@ void writeHDRJPEGRGB( FILE *fh, int widt
23	jhinf.beta = beta;	23	jhinf.beta = beta;
24	jpeg_stdio_dest(&jhinf.cinfo, fh);	24	jpeg_stdio_dest(&jhinf.cinfo, fh);
25		25
Lines 29-35 Link Here
29		29
30	for(int i=0;i<width * height;i++)	30	for(int i=0;i<width * height;i++)
31	{	31	{
32	@@ -135,7 +133,7 @@	32	@@ -135,7 +133,7 @@ void writeHDRJPEGRGB( FILE *fh, int widt
33	jpeghdr_do_compress(&jhinf);	33	jpeghdr_do_compress(&jhinf);
34	jpeghdr_destroy_compress(&jhinf);	34	jpeghdr_destroy_compress(&jhinf);
35		35

Lines 1-6 Link Here

(-)pfstools/files/patch-src-fileformat-rgbeio.cpp (-5 / +5 lines)
1	--- src/fileformat/rgbeio.cpp.orig 2007-12-06 11:00:49.000000000 +0000	1	--- src/fileformat/rgbeio.cpp.orig 2007-12-06 11:00:49 UTC
2	+++ src/fileformat/rgbeio.cpp 2014-02-20 19:04:01.556587853 +0000	2	+++ src/fileformat/rgbeio.cpp
3	@@ -141,7 +141,7 @@	3	@@ -141,7 +141,7 @@ void rgb2rgbe( float r, float g, float b
4	// Reading RGBE files	4	// Reading RGBE files
5	void readRadianceHeader( FILE *file, int &width, int &height, float &exposure )	5	void readRadianceHeader( FILE *file, int &width, int &height, float &exposure )
6	{	6	{
Lines 9-15 Link Here
9		9
10	// read header information	10	// read header information
11	char head[255];	11	char head[255];
12	@@ -208,7 +208,7 @@	12	@@ -208,7 +208,7 @@ void readRadianceHeader( FILE *file, int
13	height = height - width;	13	height = height - width;
14	}	14	}
15	*/	15	*/
Lines 18-24 Link Here
18	}	18	}
19		19
20		20
21	@@ -389,7 +389,7 @@	21	@@ -389,7 +389,7 @@ void writeRadiance( FILE *file, pfs::Arr
22	int width = X->getCols();	22	int width = X->getCols();
23	int height = X->getRows();	23	int height = X->getRows();
24		24

Lines 1-6 Link Here

(-)pfstools/files/patch-src-filter-Makefile.in (-7 / +7 lines)
1	--- src/filter/Makefile.in.orig 2011-10-27 08:40:29.000000000 +0000	1	--- src/filter/Makefile.in.orig 2011-10-27 08:40:29 UTC
2	+++ src/filter/Makefile.in 2014-02-20 19:04:01.556587853 +0000	2	+++ src/filter/Makefile.in
3	@@ -38,7 +38,8 @@	3	@@ -38,7 +38,8 @@ bin_PROGRAMS = pfsgamma$(EXEEXT) pfsclam
4	pfssize$(EXEEXT) pfsextractchannels$(EXEEXT) \	4	pfssize$(EXEEXT) pfsextractchannels$(EXEEXT) \
5	pfspanoramic$(EXEEXT) pfsrotate$(EXEEXT) pfsflip$(EXEEXT) \	5	pfspanoramic$(EXEEXT) pfsrotate$(EXEEXT) pfsflip$(EXEEXT) \
6	pfscut$(EXEEXT) pfspad$(EXEEXT) pfscat$(EXEEXT) \	6	pfscut$(EXEEXT) pfspad$(EXEEXT) pfscat$(EXEEXT) \
Lines 10-16 Link Here
10	subdir = src/filter	10	subdir = src/filter
11	DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in	11	DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
12	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4	12	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
13	@@ -54,6 +55,9 @@	13	@@ -54,6 +55,9 @@ CONFIG_CLEAN_FILES =
14	CONFIG_CLEAN_VPATH_FILES =	14	CONFIG_CLEAN_VPATH_FILES =
15	am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"	15	am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
16	PROGRAMS = $(bin_PROGRAMS)	16	PROGRAMS = $(bin_PROGRAMS)
Lines 20-26 Link Here
20	am_pfsabsolute_OBJECTS = pfsabsolute.$(OBJEXT)	20	am_pfsabsolute_OBJECTS = pfsabsolute.$(OBJEXT)
21	pfsabsolute_OBJECTS = $(am_pfsabsolute_OBJECTS)	21	pfsabsolute_OBJECTS = $(am_pfsabsolute_OBJECTS)
22	pfsabsolute_LDADD = $(LDADD)	22	pfsabsolute_LDADD = $(LDADD)
23	@@ -120,13 +124,15 @@	23	@@ -120,13 +124,15 @@ SOURCES = $(pfsabsolute_SOURCES) $(pfsca
24	$(pfscut_SOURCES) $(pfsdisplayfunction_SOURCES) \	24	$(pfscut_SOURCES) $(pfsdisplayfunction_SOURCES) \
25	$(pfsextractchannels_SOURCES) $(pfsflip_SOURCES) \	25	$(pfsextractchannels_SOURCES) $(pfsflip_SOURCES) \
26	$(pfsgamma_SOURCES) $(pfspad_SOURCES) $(pfspanoramic_SOURCES) \	26	$(pfsgamma_SOURCES) $(pfspad_SOURCES) $(pfspanoramic_SOURCES) \
Lines 38-44 Link Here
38	am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;	38	am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;
39	am__vpath_adj = case $$p in \	39	am__vpath_adj = case $$p in \
40	$(srcdir)/*) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \	40	$(srcdir)/*) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \
41	@@ -314,6 +320,7 @@	41	@@ -314,6 +320,7 @@ pfscut_SOURCES = pfscut.cpp
42	pfspad_SOURCES = pfspad.cpp	42	pfspad_SOURCES = pfspad.cpp
43	pfscat_SOURCES = pfscat.cpp	43	pfscat_SOURCES = pfscat.cpp
44	pfsabsolute_SOURCES = pfsabsolute.cpp	44	pfsabsolute_SOURCES = pfsabsolute.cpp
Lines 46-52 Link Here
46	INCLUDES = -I${srcdir}/../pfs	46	INCLUDES = -I${srcdir}/../pfs
47	all: all-am	47	all: all-am
48		48
49	@@ -392,6 +399,9 @@	49	@@ -392,6 +399,9 @@ clean-binPROGRAMS:
50	list=`for p in $$list; do echo "$$p"; done \| sed 's/$(EXEEXT)$$//'`; \	50	list=`for p in $$list; do echo "$$p"; done \| sed 's/$(EXEEXT)$$//'`; \
51	echo " rm -f" $$list; \	51	echo " rm -f" $$list; \
52	rm -f $$list	52	rm -f $$list

Lines 1-6 Link Here

(-)pfstools/files/patch-src-filter-pfspanoramic.cpp (-6 / +6 lines)
1	--- src/filter/pfspanoramic.cpp.orig 2010-02-18 11:27:03.000000000 +0000	1	--- src/filter/pfspanoramic.cpp.orig 2010-02-18 11:27:03 UTC
2	+++ src/filter/pfspanoramic.cpp 2014-02-20 19:04:01.556587853 +0000	2	+++ src/filter/pfspanoramic.cpp
3	@@ -93,7 +93,7 @@	3	@@ -93,7 +93,7 @@ class Vector3D
4	}	4	}
5		5
6	//TODO: optimize rotations by precomputing sines and cosines	6	//TODO: optimize rotations by precomputing sines and cosines
Lines 9-15 Link Here
9	{	9	{
10	angle *= (M_PI / 180);	10	angle *= (M_PI / 180);
11		11
12	@@ -107,7 +107,7 @@	12	@@ -107,7 +107,7 @@ class Vector3D
13	z = z2;	13	z = z2;
14	}	14	}
15		15
Lines 18-24 Link Here
18	{	18	{
19	angle *= (M_PI / 180);	19	angle *= (M_PI / 180);
20		20
21	@@ -121,7 +121,7 @@	21	@@ -121,7 +121,7 @@ class Vector3D
22	z = z2;	22	z = z2;
23	}	23	}
24		24
Lines 27-33 Link Here
27	{	27	{
28	angle *= (M_PI / 180);	28	angle *= (M_PI / 180);
29		29
30	@@ -195,7 +195,7 @@	30	@@ -195,7 +195,7 @@ class ProjectionFactory
31	{	31	{
32	char *opts;	32	char *opts;
33		33

Lines 1-5 Link Here

(-)pfstools/files/patch-src-hdrhtml-hdrhtml.cpp (-17 / +17 lines)
1	--- src/hdrhtml/hdrhtml.cpp.orig 2009-03-11 21:45:55.000000000 +0000	1	--- src/hdrhtml/hdrhtml.cpp.orig 2009-03-11 21:45:55 UTC
2	+++ src/hdrhtml/hdrhtml.cpp 2014-02-20 19:04:01.566588122 +0000	2	+++ src/hdrhtml/hdrhtml.cpp
3	@@ -27,6 +27,7 @@	3	@@ -27,6 +27,7 @@
4		4
5	#include "hdrhtml.h"	5	#include "hdrhtml.h"
Lines 17-23 Link Here
17	// ================================================	17	// ================================================
18	// Parameters controllig the web page	18	// Parameters controllig the web page
19	// ================================================	19	// ================================================
20	@@ -94,8 +97,8 @@	20	@@ -94,8 +97,8 @@ public:
21		21
22	if( min_val > max_val ) // missing min/max info	22	if( min_val > max_val ) // missing min/max info
23	{	23	{
Lines 28-34 Link Here
28		28
29	for( int k=0; k < d_size; k++ ) {	29	for( int k=0; k < d_size; k++ ) {
30	if( data[k] > max_val ) max_val = data[k];	30	if( data[k] > max_val ) max_val = data[k];
31	@@ -195,6 +198,7 @@	31	@@ -195,6 +198,7 @@ public:
32	this->y_i = new float[lut_size];	32	this->y_i = new float[lut_size];
33	own_y_i = true;	33	own_y_i = true;
34	memcpy(this->y_i, other.y_i, lut_size * sizeof(float));	34	memcpy(this->y_i, other.y_i, lut_size * sizeof(float));
Lines 36-42 Link Here
36	}	36	}
37		37
38	~UniformArrayLUT()	38	~UniformArrayLUT()
39	@@ -341,7 +345,7 @@	39	@@ -341,7 +345,7 @@ public:
40	for( int k = 1; k < bin_n; k++ )	40	for( int k = 1; k < bin_n; k++ )
41	hist.n[k] += hist.n[k-1];	41	hist.n[k] += hist.n[k-1];
42		42
Lines 45-51 Link Here
45	assert( hist.n[bin_n-1] == d_size );	45	assert( hist.n[bin_n-1] == d_size );
46	}	46	}
47		47
48	@@ -361,7 +365,7 @@	48	@@ -361,7 +365,7 @@ public:
49	// Text template file utils	49	// Text template file utils
50	// ================================================	50	// ================================================
51		51
Lines 54-60 Link Here
54		54
55	class ReplacePattern	55	class ReplacePattern
56	{	56	{
57	@@ -403,7 +407,7 @@	57	@@ -403,7 +407,7 @@ public:
58	{	58	{
59	}	59	}
60		60
Lines 63-69 Link Here
63	{	63	{
64	if( callback != NULL )	64	if( callback != NULL )
65	callback( out, user_data, parameter );	65	callback( out, user_data, parameter );
66	@@ -567,7 +571,7 @@	66	@@ -567,7 +571,7 @@ public:
67	// Skip white spaces	67	// Skip white spaces
68	while( line_str[pos] == ' ' \|\| line_str[pos] == '\t' ) pos++;	68	while( line_str[pos] == ' ' \|\| line_str[pos] == '\t' ) pos++;
69	int new_pos = line_str.find_first_of( ',', pos );	69	int new_pos = line_str.find_first_of( ',', pos );
Lines 72-78 Link Here
72	if( new_pos == std::string::npos ) {	72	if( new_pos == std::string::npos ) {
73	if( k != columns-1 ) {	73	if( k != columns-1 ) {
74	std::string full_message( "Missing column data in the file: " );	74	std::string full_message( "Missing column data in the file: " );
75	@@ -576,16 +580,16 @@	75	@@ -576,16 +580,16 @@ public:
76	}	76	}
77	len = std::string::npos;	77	len = std::string::npos;
78	} else	78	} else
Lines 92-98 Link Here
92	value = strtof( str_beg, &str_end );	92	value = strtof( str_beg, &str_end );
93	if( str_beg == str_end ) {	93	if( str_beg == str_end ) {
94	std::ostringstream error_message;	94	std::ostringstream error_message;
95	@@ -643,15 +647,15 @@	95	@@ -643,15 +647,15 @@ void HDRHTMLSet::add_image( int width, i
96	basis_table.data[0][k] = log2f( basis_table.data[0][k] );	96	basis_table.data[0][k] = log2f( basis_table.data[0][k] );
97		97
98	// Fix zero and negative values in the image, convert to log2 space, find min and max values	98	// Fix zero and negative values in the image, convert to log2 space, find min and max values
Lines 111-117 Link Here
111	for( int i=0; i < pixels; i++ ) {	111	for( int i=0; i < pixels; i++ ) {
112	if( x[i] < min_val && x[i] > 0)	112	if( x[i] < min_val && x[i] > 0)
113	min_val = x[i];	113	min_val = x[i];
114	@@ -741,7 +745,7 @@	114	@@ -741,7 +745,7 @@ void HDRHTMLSet::add_image( int width, i
115	for( int k=1; k <= f8_stops+1; k++ ) {	115	for( int k=1; k <= f8_stops+1; k++ ) {
116		116
117		117
Lines 120-126 Link Here
120		120
121	float exp_multip = log2f(1/powf( 2, l_start + k*8 ));	121	float exp_multip = log2f(1/powf( 2, l_start + k*8 ));
122		122
123	@@ -796,9 +800,9 @@	123	@@ -796,9 +800,9 @@ void HDRHTMLSet::add_image( int width, i
124		124
125	}	125	}
126		126
Lines 133-139 Link Here
133		133
134	void HDRHTMLSet::generate_webpage( const char page_template, const char image_template,	134	void HDRHTMLSet::generate_webpage( const char page_template, const char image_template,
135	const char object_output, const char html_output)	135	const char object_output, const char html_output)
136	@@ -852,11 +856,11 @@	136	@@ -852,11 +856,11 @@ void HDRHTMLSet::generate_webpage( const
137		137
138	}	138	}
139		139
Lines 147-153 Link Here
147	for( it = hdrhtml_set->image_list.begin(); it != hdrhtml_set->image_list.end(); it++ ) {	147	for( it = hdrhtml_set->image_list.begin(); it != hdrhtml_set->image_list.end(); it++ ) {
148	std::string obj_name( "hdr_" );	148	std::string obj_name( "hdr_" );
149	obj_name.append( it->base_name );	149	obj_name.append( it->base_name );
150	@@ -882,7 +886,7 @@	150	@@ -882,7 +886,7 @@ void print_image_objects( ostream &out,
151		151
152	}	152	}
153		153
Lines 156-162 Link Here
156	{	156	{
157	std::string obj_name( "hdr_" );	157	std::string obj_name( "hdr_" );
158	obj_name.append( it.base_name );	158	obj_name.append( it.base_name );
159	@@ -907,13 +911,13 @@	159	@@ -907,13 +911,13 @@ void print_image_htmlcode( ostream &out,
160		160
161	}	161	}
162		162
Lines 172-178 Link Here
172	for( it = hdrhtml_set->image_list.begin(); it != hdrhtml_set->image_list.end(); it++ ) {	172	for( it = hdrhtml_set->image_list.begin(); it != hdrhtml_set->image_list.end(); it++ ) {
173	if( it->base_name.compare( parameter ) == 0 )	173	if( it->base_name.compare( parameter ) == 0 )
174	break;	174	break;
175	@@ -925,7 +929,7 @@	175	@@ -925,7 +929,7 @@ void print_image_htmlcode( ostream &out,
176		176
177	} else {	177	} else {
178		178
Lines 181-187 Link Here
181	for( it = hdrhtml_set->image_list.begin(); it != hdrhtml_set->image_list.end(); it++ ) {	181	for( it = hdrhtml_set->image_list.begin(); it != hdrhtml_set->image_list.end(); it++ ) {
182		182
183	print_image_htmlcode( out, hdrhtml_set, *it );	183	print_image_htmlcode( out, hdrhtml_set, *it );
184	@@ -935,7 +939,7 @@	184	@@ -935,7 +939,7 @@ void print_image_htmlcode( ostream &out,
185		185
186	}	186	}
187		187

Line 0 Link Here

(-)pfstools/files/patch-src-octave-pfsclose.cpp (+14 lines)
	1	--- src/octave/pfsclose.cpp.orig 2016-02-12 17:10:27 UTC
	2	+++ src/octave/pfsclose.cpp
	3	@@ -53,9 +53,9 @@ DEFUN_DLD( pfsclose, args, , helpString
	4	return retval;
	5	}
	6
	7	- Octave_map pfsStream = args(0).map_value();
	8	+ octave_map pfsStream = args(0).map_value();
	9
	10	- Octave_map::const_iterator itFH = pfsStream.seek( "FH" );
	11	+ octave_map::const_iterator itFH = pfsStream.seek( "FH" );
	12	if( itFH == pfsStream.end() \|\|
	13	!pfsStream.contents( itFH )(0).is_real_scalar() )
	14	{

Line 0 Link Here

(-)pfstools/files/patch-src-octave-pfsget.cpp (+58 lines)
	1	--- src/octave/pfsget.cpp.orig 2016-02-12 17:10:27 UTC
	2	+++ src/octave/pfsget.cpp
	3	@@ -52,9 +52,9 @@ DEFUN_DLD( pfsget, args, , helpString)
	4	return retval;
	5	}
	6
	7	- Octave_map pfsStream = args(0).map_value();
	8	+ octave_map pfsStream = args(0).map_value();
	9
	10	- Octave_map::const_iterator itFH = pfsStream.seek( "FH" );
	11	+ octave_map::const_iterator itFH = pfsStream.seek( "FH" );
	12	if( itFH == pfsStream.end() \|\|
	13	!pfsStream.contents( itFH )(0).is_real_scalar() )
	14	{
	15	@@ -63,7 +63,7 @@ DEFUN_DLD( pfsget, args, , helpString)
	16	}
	17	FILE fh = (FILE)((long)(pfsStream.contents( itFH )(0).double_value()));
	18
	19	- Octave_map::const_iterator itMode = pfsStream.seek( "MODE" );
	20	+ octave_map::const_iterator itMode = pfsStream.seek( "MODE" );
	21	if( itMode == pfsStream.end() \|\| !pfsStream.contents( itMode )(0).is_string() )
	22	{
	23	error( SCRIPT_NAME ": MODE field missing in the structure or it has wrong type");
	24	@@ -95,7 +95,7 @@ DEFUN_DLD( pfsget, args, , helpString)
	25
	26	// Add channels as matrices to pfs stream struct
	27	{
	28	- Octave_map channels;
	29	+ octave_scalar_map channels;
	30
	31	pfs::ChannelIteratorPtr cit( frame->getChannelIterator() );
	32	while( cit->hasNext() ) {
	33	@@ -115,7 +115,7 @@ DEFUN_DLD( pfsget, args, , helpString)
	34
	35	//Add tags
	36	{
	37	- Octave_map tags;
	38	+ octave_scalar_map tags;
	39
	40	pfs::TagIteratorPtr it( frame->getTags()->getIterator() );
	41	while( it->hasNext() ) {
	42	@@ -124,14 +124,14 @@ DEFUN_DLD( pfsget, args, , helpString)
	43	}
	44	pfsStream.assign( "tags", tags );
	45
	46	- Octave_map channelTagList;
	47	+ octave_scalar_map channelTagList;
	48
	49	//Copy all channel tags
	50	pfs::ChannelIteratorPtr cit( frame->getChannelIterator() );
	51	while( cit->hasNext() ) {
	52	pfs::Channel *ch = cit->getNext();
	53
	54	- Octave_map channelTags;
	55	+ octave_scalar_map channelTags;
	56
	57	pfs::TagIteratorPtr tit( ch->getTags()->getIterator() );
	58	while( tit->hasNext() ) {

Line 0 Link Here

(-)pfstools/files/patch-src-octave-pfsopen.cpp (+20 lines)
	1	--- src/octave/pfsopen.cpp.orig 2016-02-12 17:10:27 UTC
	2	+++ src/octave/pfsopen.cpp
	3	@@ -137,7 +137,7 @@ DEFUN_DLD( pfsopen, args, , helpString)
	4	}
	5	}
	6
	7	- Octave_map pfsStream;
	8	+ octave_map pfsStream;
	9	pfsStream.assign( "FH", octave_value((double)((long)fh)) );
	10	pfsStream.assign( "MODE", writeMode ? octave_value("W") : octave_value("R") );
	11	pfsStream.assign( "EOF", octave_value(false) );
	12	@@ -145,7 +145,7 @@ DEFUN_DLD( pfsopen, args, , helpString)
	13	if( writeMode ) {
	14	pfsStream.assign( "columns", octave_value(width) );
	15	pfsStream.assign( "rows", octave_value(height) );
	16	- Octave_map channels;
	17	+ octave_map channels;
	18	pfsStream.assign( "channels", octave_value(channels) );
	19	}
	20

Line 0 Link Here

(-)pfstools/files/patch-src-octave-pfsput.cpp (+103 lines)
		1	--- src/octave/pfsput.cpp.orig 2016-02-12 17:10:27 UTC
		2	+++ src/octave/pfsput.cpp
		3	@@ -52,9 +52,9 @@ DEFUN_DLD( pfsput, args, , helpString)
		4	return retval;
		5	}
		6
		7	- Octave_map pfsStream = args(0).map_value();
		8	+ octave_map pfsStream = args(0).map_value();
		9
		10	- Octave_map::const_iterator itFH = pfsStream.seek( "FH" );
		11	+ octave_map::const_iterator itFH = pfsStream.seek( "FH" );
		12	if( itFH == pfsStream.end() \|\|
		13	!pfsStream.contents( itFH )(0).is_real_scalar() )
		14	{
		15	@@ -65,7 +65,7 @@ DEFUN_DLD( pfsput, args, , helpString)
		16
		17	// Check mode
		18	{
		19	- Octave_map::const_iterator itMode = pfsStream.seek( "MODE" );
		20	+ octave_map::const_iterator itMode = pfsStream.seek( "MODE" );
		21	if( itMode == pfsStream.end() \|\| !pfsStream.contents( itMode )(0).is_string() )
		22	{
		23	error( SCRIPT_NAME ": MODE field missing in the structure or it has wrong type");
		24	@@ -80,8 +80,8 @@ DEFUN_DLD( pfsput, args, , helpString)
		25	// Get width & height
		26	int width, height;
		27	{
		28	- Octave_map::const_iterator itCols = pfsStream.seek( "columns" );
		29	- Octave_map::const_iterator itRows = pfsStream.seek( "rows" );
		30	+ octave_map::const_iterator itCols = pfsStream.seek( "columns" );
		31	+ octave_map::const_iterator itRows = pfsStream.seek( "rows" );
		32	if( itCols == pfsStream.end() \|\| itRows == pfsStream.end() \|\|
		33	!pfsStream.contents( itCols )(0).is_real_scalar() \|\|
		34	!pfsStream.contents( itRows )(0).is_real_scalar() )
		35	@@ -94,9 +94,9 @@ DEFUN_DLD( pfsput, args, , helpString)
		36	}
		37
		38	// Get channels
		39	- Octave_map channels;
		40	+ octave_map channels;
		41	{
		42	- Octave_map::const_iterator itChannels = pfsStream.seek( "channels" );
		43	+ octave_map::const_iterator itChannels = pfsStream.seek( "channels" );
		44	if( itChannels == pfsStream.end() \|\|
		45	!pfsStream.contents( itChannels )(0).is_map() )
		46	{
		47	@@ -111,7 +111,7 @@ DEFUN_DLD( pfsput, args, , helpString)
		48	pfs::Frame *frame = ctx.createFrame( width, height );
		49
		50	// For each channel in the 'channels' map
		51	- for( Octave_map::iterator itCh = channels.begin(); itCh != channels.end(); itCh++ ) {
		52	+ for( octave_map::iterator itCh = channels.begin(); itCh != channels.end(); itCh++ ) {
		53	std::string channelName = channels.key(itCh);
		54
		55	if( !channels.contents( itCh )(0).is_real_matrix() ) {
		56	@@ -135,15 +135,15 @@ DEFUN_DLD( pfsput, args, , helpString)
		57
		58	// Copy frame tags
		59	{
		60	- Octave_map::const_iterator itTags = pfsStream.seek( "tags" );
		61	+ octave_map::const_iterator itTags = pfsStream.seek( "tags" );
		62	if( itTags != pfsStream.end() ) {
		63	if( !pfsStream.contents( itTags )(0).is_map() )
		64	{
65	throw pfs::Exception( "'tags' field must be a structure" );
66	}
67
68	- Octave_map tags = pfsStream.contents( itTags )(0).map_value();
69	- for( Octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
70	+ octave_map tags = pfsStream.contents( itTags )(0).map_value();
71	+ for( octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
72	std::string tagName = tags.key(itTag);
73
74	if( !tags.contents( itTag )(0).is_string() )
75	@@ -156,14 +156,14 @@ DEFUN_DLD( pfsput, args, , helpString)
76
77	// Copy channel tags
78	{
79	- Octave_map::const_iterator itChTags = pfsStream.seek( "channelTags" );
80	+ octave_map::const_iterator itChTags = pfsStream.seek( "channelTags" );
81	if( itChTags != pfsStream.end() ) {
82	if( !pfsStream.contents( itChTags )(0).is_map() )
83	{
84	throw pfs::Exception( "'channelTags' field must be a structure" );
85	}
86	- Octave_map tagChannels = pfsStream.contents( itChTags )(0).map_value();
87	- for( Octave_map::iterator itCh = tagChannels.begin(); itCh != tagChannels.end(); itCh++ ) {
88	+ octave_map tagChannels = pfsStream.contents( itChTags )(0).map_value();
89	+ for( octave_map::iterator itCh = tagChannels.begin(); itCh != tagChannels.end(); itCh++ ) {
90	std::string channelName = tagChannels.key(itCh);
91	if( !tagChannels.contents( itCh )(0).is_map() ) {
92	throw pfs::Exception( "each channelTags file must be a structure" );
93	@@ -173,8 +173,8 @@ DEFUN_DLD( pfsput, args, , helpString)
94	throw pfs::Exception( "can not set channel tag if channel is missing" );
95	}
96
97	- Octave_map tags = tagChannels.contents( itCh )(0).map_value();
98	- for( Octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
99	+ octave_map tags = tagChannels.contents( itCh )(0).map_value();
100	+ for( octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
101	std::string tagName = tags.key(itTag);
102	if( !tags.contents( itTag )(0).is_string() )
103	throw pfs::Exception( "all channel tags must be given as strings" );

Lines 1-6 Link Here

(-)pfstools/files/patch-src-pfs-pfs.cpp (-5 / +5 lines)
1	--- src/pfs/pfs.cpp.orig 2010-07-14 09:44:27.000000000 +0000	1	--- src/pfs/pfs.cpp.orig 2010-07-14 09:44:27 UTC
2	+++ src/pfs/pfs.cpp 2014-02-20 19:04:01.566588122 +0000	2	+++ src/pfs/pfs.cpp
3	@@ -71,7 +71,7 @@	3	@@ -71,7 +71,7 @@ const char *PFSFILEID="PFS1\x0a";
4	// TagContainer implementation	4	// TagContainer implementation
5	//------------------------------------------------------------------------------	5	//------------------------------------------------------------------------------
6		6
Lines 9-15 Link Here
9		9
10	class TagIteratorImpl: public TagIterator	10	class TagIteratorImpl: public TagIterator
11	{	11	{
12	@@ -570,7 +570,7 @@	12	@@ -570,7 +570,7 @@ public:
13		13
14	//Read channel IDs and tags	14	//Read channel IDs and tags
15	// FrameImpl::ChannelID *channelID = new FrameImpl::ChannelID[channelCount];	15	// FrameImpl::ChannelID *channelID = new FrameImpl::ChannelID[channelCount];
Lines 18-24 Link Here
18	for( int i = 0; i < channelCount; i++ ) {	18	for( int i = 0; i < channelCount; i++ ) {
19	char channelName[MAX_CHANNEL_NAME+1], *rs;	19	char channelName[MAX_CHANNEL_NAME+1], *rs;
20	rs = fgets( channelName, MAX_CHANNEL_NAME, inputStream );	20	rs = fgets( channelName, MAX_CHANNEL_NAME, inputStream );
21	@@ -592,7 +592,7 @@	21	@@ -592,7 +592,7 @@ public:
22		22
23		23
24	//Read channels	24	//Read channels

Lines 1-6 Link Here

(-)pfstools/files/patch-src-pfs-pfs.h (-7 / +7 lines)
1	--- src/pfs/pfs.h.orig 2006-03-01 17:21:16.000000000 +0000	1	--- src/pfs/pfs.h.orig 2006-03-01 17:21:16 UTC
2	+++ src/pfs/pfs.h 2014-02-20 19:04:01.566588122 +0000	2	+++ src/pfs/pfs.h
3	@@ -115,6 +115,7 @@	3	@@ -115,6 +115,7 @@ namespace pfs
4	class TagIterator	4	class TagIterator
5	{	5	{
6	public:	6	public:
Lines 8-14 Link Here
8	/**	8	/**
9	* Get next item on the list.	9	* Get next item on the list.
10	*	10	*
11	@@ -135,6 +136,7 @@	11	@@ -135,6 +136,7 @@ namespace pfs
12	class TagContainer	12	class TagContainer
13	{	13	{
14	public:	14	public:
Lines 16-22 Link Here
16	/**	16	/**
17	* Get a string tag of the name tagName from the TagContainer.	17	* Get a string tag of the name tagName from the TagContainer.
18	* @param tagName name of the tag to retrieve	18	* @param tagName name of the tag to retrieve
19	@@ -181,6 +183,7 @@	19	@@ -181,6 +183,7 @@ namespace pfs
20	*/	20	*/
21	class Channel : public Array2D {	21	class Channel : public Array2D {
22	public:	22	public:
Lines 24-30 Link Here
24	/**	24	/**
25	* Gets width of the channel (in pixels).	25	* Gets width of the channel (in pixels).
26	* This is a synonym for Array2D::getCols().	26	* This is a synonym for Array2D::getCols().
27	@@ -226,6 +229,7 @@	27	@@ -226,6 +229,7 @@ namespace pfs
28	class ChannelIterator	28	class ChannelIterator
29	{	29	{
30	public:	30	public:
Lines 32-38 Link Here
32	/**	32	/**
33	* Get next item on the list.	33	* Get next item on the list.
34	*/	34	*/
35	@@ -580,7 +584,9 @@	35	@@ -580,7 +584,9 @@ namespace pfs
36	*/	36	*/
37	Exception( const char* const message )	37	Exception( const char* const message )
38	{	38	{

Lines 1-6 Link Here

(-)pfstools/files/patch-src-pfsglview-picture_io.cpp (-5 / +5 lines)
1	--- src/pfsglview/picture_io.cpp.orig 2006-11-20 12:13:13.000000000 +0000	1	--- src/pfsglview/picture_io.cpp.orig 2006-11-20 12:13:13 UTC
2	+++ src/pfsglview/picture_io.cpp 2014-02-20 19:04:01.566588122 +0000	2	+++ src/pfsglview/picture_io.cpp
3	@@ -87,7 +87,7 @@	3	@@ -87,7 +87,7 @@ void PictureIO::setFrame(pfs::Frame *fra
4	return;	4	return;
5		5
6	// only XYZ channels are taken into consideration	6	// only XYZ channels are taken into consideration
Lines 9-15 Link Here
9	if(verbose)	9	if(verbose)
10	fprintf( stderr, "WARNING: wrong channel (PictureIO::setFrame())\n");	10	fprintf( stderr, "WARNING: wrong channel (PictureIO::setFrame())\n");
11	return;	11	return;
12	@@ -573,7 +573,7 @@	12	@@ -573,7 +573,7 @@ float PictureIO::getDynamicRange(void) {
13	}	13	}
14	std::sort(vec.begin(), vec.end());	14	std::sort(vec.begin(), vec.end());
15		15
Lines 18-24 Link Here
18		18
19	val = vec[0];	19	val = vec[0];
20	std::vector<unsigned int> svec;	20	std::vector<unsigned int> svec;
21	@@ -589,7 +589,7 @@	21	@@ -589,7 +589,7 @@ float PictureIO::getDynamicRange(void) {
22		22
23	float dr = svec[ svec.size()-1] / svec[0];	23	float dr = svec[ svec.size()-1] / svec[0];
24		24

Lines 52-58 Link Here

(-)pfstools/pkg-plist (-1 / +25 lines)
52	man/man1/pfsextractchannels.1.gz	52	man/man1/pfsextractchannels.1.gz
53	man/man1/pfsflip.1.gz	53	man/man1/pfsflip.1.gz
54	man/man1/pfsgamma.1.gz	54	man/man1/pfsgamma.1.gz
55	%%OPENGL%%man/man1/pfsglview.1.gz	55	man/man1/pfsglview.1.gz
56	man/man1/pfsin.1.gz	56	man/man1/pfsin.1.gz
57	man/man1/pfsindcraw.1.gz	57	man/man1/pfsindcraw.1.gz
58	man/man1/pfsinexr.1.gz	58	man/man1/pfsinexr.1.gz
Lines 108-110 Link Here
108	%%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_image_templ_slider-above.html	108	%%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_image_templ_slider-above.html
109	%%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_image_templ.html	109	%%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_image_templ.html
110	%%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_page_templ_short.html	110	%%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_page_templ_short.html
		111	@dir include/pfs-1.2
		112	%%IMAGEMAGICK%%@dir %%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_assets
		113	%%IMAGEMAGICK%%@dir %%DATADIR%%/hdrhtml_hdrlabs_templ
		114	%%IMAGEMAGICK%%@dir %%DATADIR%%/hdrhtml_default_templ
		115	%%IMAGEMAGICK%%@dir %%DATADIR%%
		116	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_OCT%%/pfstools/pfsclose.oct
		117	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_OCT%%/pfstools/pfsget.oct
		118	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_OCT%%/pfstools/pfsopen.oct
		119	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_OCT%%/pfstools/pfsput.oct
		120	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_OCT%%/pfstools/pfsread.oct
		121	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_OCT%%/pfstools/pfstransform_colorspace.oct
		122	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_OCT%%/pfstools/pfswrite.oct
		123	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfs_close_frames.m
		124	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfs_open_frames.m
		125	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfs_read_luminance.m
		126	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfs_read_rgb.m
		127	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfs_read_xyz.m
		128	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfs_write_rgb.m
		129	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfssize.m
		130	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfsview.m
		131	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfsview_list.m
		132	%%OCTAVE%%%%OCTAVE_BASE%%/%%OCTAVE_SITE_M%%/pfstools/pfsview_rgb.m
		133	%%OCTAVE%%@dir %%OCTAVE_SITE_OCT%%/pfstools
		134	%%OCTAVE%%@dir %%OCTAVE_SITE_M%%/pfstools