initial import
This commit is contained in:
151
netpbm/PKGBUILD
Normal file
151
netpbm/PKGBUILD
Normal file
@@ -0,0 +1,151 @@
|
||||
# Maintainer: Jesus E. <heckyel@riseup.net>
|
||||
|
||||
_pkgname=netpbm-libre
|
||||
pkgname=netpbm
|
||||
pkgver=10.73.31
|
||||
pkgrel=2
|
||||
pkgdesc="A toolkit for manipulation of graphic images"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('custom:Netpbm')
|
||||
url="http://netpbm.sourceforge.net/"
|
||||
depends=('perl' 'libpng' 'libtiff' 'libjpeg-turbo' 'libxml2')
|
||||
makedepends=('tauthon' 'jbigkit' 'libx11')
|
||||
options=('!makeflags')
|
||||
# Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/
|
||||
mksource=(https://downloads.sourceforge.net/project/netpbm/super_stable/$pkgver/netpbm-$pkgver.tgz)
|
||||
source=(https://repo.hyperbola.info:50000/sources/${_pkgname}/${_pkgname}-${pkgver}.tar.gz{,.sig}
|
||||
https://sources.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig}
|
||||
netpbm-CAN-2005-2471.patch netpbm-libre-security-code.patch netpbm-security-scripts.patch)
|
||||
mksha512sums=('22db95133809fce7e1e2a57b488e62d385e819228856471bc6fa4d0c0f95d77679f35226a20a8bccad64399cc83502ce5a2d7544730847e5ff92c563a19887f5')
|
||||
sha512sums=('7e779585597896207123c9f1f01de784c4177ac56470107c2e202f7260dc0c49ccc07789c679d7ecd7a56c84bf7f8615c0cada2665bb2111faa9af8bc37bc5e6'
|
||||
'SKIP'
|
||||
'ef3c889d30fd1c1422e0a05c19b5e875a33fbcd737ffdd10f56b23a42e74e0bb33134e859f7330d2ab35488b95eb487d5cc15b0f253a220b09082c294713d25b'
|
||||
'SKIP'
|
||||
'a0d96195cfeeca818cf10a9f8b292eba7213f93f78dd7d0f1da6bd9e448bfa6cb8fdc8d4378defda1425a8ebbadb84655f5a9269eb3e0ea230170fd640236c8c'
|
||||
'1cb28573ff5678040c08e4aa9d87fd421329155ecf9e876d04cd5632cd15e83b0f5e71ffcfa033a2bc639857e57a8ee5913658473136b16040e162e9de6fb24f'
|
||||
'4b0d7603a4176ad97b325535f4f2ceafdd2edf5e2ddfca054aadff923245a35009ebb58191488ab677b48480b7f082ca1d81262c60e038347a117e46b882da4d')
|
||||
validpgpkeys=('5357F3B111688D88C1D88119FCF2CB179205AC90' # Eric Belanger
|
||||
'C92BAA713B8D53D3CAE63FC9E6974752F9704456') # André Silva
|
||||
|
||||
mksource() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
# Removing hpcdtoppm/pcdindex (non comercial)
|
||||
rm -rv converter/ppm/hpcdtoppm
|
||||
|
||||
# Removing ppmtogif/giftopnm (patent restriction)
|
||||
rm -v converter/other/giftopnm.c converter/ppm/ppmtogif.c
|
||||
rm -v test/gif-quant-roundtrip.test test/gif-roundtrip.test test/all-in-place.ok
|
||||
|
||||
# Removing programs without license information
|
||||
rm -v other/pamchannel.c test/pamchannel.ok
|
||||
rm -v converter/other/pamtopnm.c
|
||||
rm -v converter/pbm/pbmto4425.c
|
||||
rm -v converter/pbm/pbmtoln03.c
|
||||
rm -v converter/pbm/pbmtolps.c
|
||||
rm -v converter/pbm/pbmtopk.c
|
||||
rm -v converter/pbm/pktopbm.c
|
||||
rm -v converter/ppm/ppmtopjxl.c
|
||||
rm -v converter/pgm/spottopgm.c
|
||||
|
||||
rm -v test/avs-roundtrip.test test/facesaver-roundtrip.test test/ilbm-roundtrip.test test/pamchannel.test \
|
||||
test/pamditherbw.test test/pamenlarge.test test/pamfile.test test/pfm-roundtrip.test \
|
||||
test/pgmtoppm.test test/pict-roundtrip.test test/pnminvert.test test/pnmremap1.test \
|
||||
test/pnmremap2.test test/pnmtopnm-plain.test test/pnm-pam-roundtrip.test test/pnm-plain-roundtrip.test \
|
||||
test/ps-alt-roundtrip.test test/ps-roundtrip.test test/sbig-roundtrip.test test/st4-roundtrip.test \
|
||||
test/targa-roundtrip.test test/utahrle-roundtrip.test test/winicon-roundtrip.test test/xwd-roundtrip.test
|
||||
}
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
# Removing references about hpcdtoppm/pcdindex (non comercial)
|
||||
sed -i 's/hpcdtoppm//g' converter/ppm/Makefile
|
||||
sed -i 's/hpcdtoppm\.1//g' buildtools/manpage.mk
|
||||
sed -i 's/pcdindex\.1//g' buildtools/manpage.mk
|
||||
|
||||
# Removing references about ppmtogif/giftopnm (patent restriction)
|
||||
sed -i 's/ppmtogif//g' converter/ppm/Makefile test/all-in-place.test
|
||||
sed -i 's/ppmtogif\.1//g' buildtools/manpage.mk
|
||||
sed -i 's/giftopnm//g' converter/other/Makefile test/all-in-place.test
|
||||
sed -i 's/giftopnm\.1//g' buildtools/manpage.mk
|
||||
sed -i '/giftopnm/d' converter/other/pnmtopalm/README
|
||||
|
||||
# Removing references about programs without license information
|
||||
sed -i 's/pamchannel//g' other/Makefile test/all-in-place.test
|
||||
sed -i 's/pamchannel\.1//g' buildtools/manpage.mk
|
||||
sed -i 's/pamchannel\.test//g' test/Test-Order
|
||||
|
||||
sed -i 's/pamtopnm//g' converter/other/Makefile test/all-in-place.test
|
||||
sed -i 's/pamtopnm\.1//g' buildtools/manpage.mk
|
||||
sed -i '/pnmtopnm/d' netpbm.c
|
||||
|
||||
sed -i 's/pbmto4425//g' converter/pbm/Makefile test/all-in-place.test
|
||||
sed -i 's/pbmto4425\.1//g' buildtools/manpage.mk
|
||||
|
||||
sed -i 's/pbmtoln03//g' converter/pbm/Makefile test/all-in-place.test
|
||||
sed -i 's/pbmtoln03\.1//g' buildtools/manpage.mk
|
||||
|
||||
sed -i 's/pbmtolps//g' converter/pbm/Makefile test/all-in-place.test
|
||||
sed -i 's/pbmtolps\.1//g' buildtools/manpage.mk
|
||||
|
||||
sed -i 's/pbmtopk//g' converter/pbm/Makefile test/all-in-place.test
|
||||
sed -i 's/pbmtopk\.1//g' buildtools/manpage.mk
|
||||
|
||||
sed -i 's/pktopbm//g' converter/pbm/Makefile test/all-in-place.test
|
||||
sed -i 's/pktopbm\.1//g' buildtools/manpage.mk
|
||||
|
||||
sed -i 's/ppmtopjxl//g' converter/ppm/Makefile test/all-in-place.test
|
||||
sed -i 's/ppmtopjxl\.1//g' buildtools/manpage.mk
|
||||
|
||||
sed -i 's/spottopgm//g' converter/pgm/Makefile test/all-in-place.test
|
||||
sed -i 's/spottopgm\.1//g' buildtools/manpage.mk
|
||||
|
||||
# Removing references about nonfree licenses part
|
||||
sed -i '338,383d' doc/copyright_summary
|
||||
|
||||
patch -p1 < ../netpbm-CAN-2005-2471.patch
|
||||
patch -p1 < ../netpbm-libre-security-code.patch
|
||||
patch -p1 < ../netpbm-security-scripts.patch
|
||||
sed -i 's|#!/usr/bin/python|#!/usr/bin/tauthon|' buildtools/makeman
|
||||
sed -i 's|@python|@tauthon|' buildtools/manpage.mk
|
||||
|
||||
cp config.mk.in config.mk
|
||||
echo 'CFLAGS_SHLIB = -fPIC' >> config.mk
|
||||
echo "NETPBM_DOCURL = file://${srcdir}/doc" >> config.mk
|
||||
echo 'TIFFLIB = libtiff.so' >> config.mk
|
||||
echo 'JPEGLIB = libjpeg.so' >> config.mk
|
||||
echo 'PNGLIB = libpng.so' >> config.mk
|
||||
echo 'ZLIB = libz.so' >> config.mk
|
||||
echo 'JBIGLIB = /usr/lib/libjbig.a' >> config.mk
|
||||
|
||||
sed -i 's|misc|share/netpbm|' common.mk
|
||||
sed -i 's|/link|/lib|' lib/Makefile
|
||||
sed -i 's|install.manwebmain install.manweb install.man|install.man|' GNUmakefile
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
make
|
||||
# Generating useful man pages with html doc
|
||||
make MAKEMAN="${srcdir}/$pkgname-$pkgver/buildtools/makeman" USERGUIDE=. \
|
||||
-C ../doc -f "${srcdir}/$pkgname-$pkgver/buildtools/manpage.mk" manpages
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname-$pkgver
|
||||
make pkgdir="${pkgdir}/usr" PKGMANDIR=share/man install-run install-dev
|
||||
|
||||
# Removing dummy man pages
|
||||
rm "${pkgdir}"/usr/share/man/man{1,3,5}/*
|
||||
|
||||
make MAKEMAN="${srcdir}/$pkgname-$pkgver/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" \
|
||||
-C ../doc -f "${srcdir}/$pkgname-$pkgver/buildtools/manpage.mk" installman
|
||||
|
||||
# Replace obsolete utility
|
||||
echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > "${pkgdir}/usr/bin/pgmtopbm"
|
||||
|
||||
# Licensing. Note that each program in the package has a separate license.
|
||||
install -D -m644 "${srcdir}/$pkgname-$pkgver/doc/copyright_summary" \
|
||||
"${pkgdir}/usr/share/licenses/${pkgname}/copyright_summary.txt"
|
||||
}
|
||||
16
netpbm/netpbm-CAN-2005-2471.patch
Normal file
16
netpbm/netpbm-CAN-2005-2471.patch
Normal file
@@ -0,0 +1,16 @@
|
||||
--- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471 2005-08-15 02:39:46.000000000 +0200
|
||||
+++ netpbm-10.29/converter/other/pstopnm.c 2005-08-16 15:38:15.000000000 +0200
|
||||
@@ -818,11 +818,11 @@
|
||||
ghostscriptProg, arg0,
|
||||
deviceopt, outfileopt, gopt, ropt, textalphabitsopt,
|
||||
"-q", "-dNOPAUSE",
|
||||
- "-dSAFER", "-");
|
||||
+ "-dPARANOIDSAFER", "-");
|
||||
}
|
||||
|
||||
execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt,
|
||||
- textalphabitsopt, "-q", "-dNOPAUSE", "-dSAFER", "-", NULL);
|
||||
+ textalphabitsopt, "-q", "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
|
||||
|
||||
pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
|
||||
ghostscriptProg, errno, strerror(errno));
|
||||
1386
netpbm/netpbm-libre-security-code.patch
Normal file
1386
netpbm/netpbm-libre-security-code.patch
Normal file
File diff suppressed because it is too large
Load Diff
369
netpbm/netpbm-security-scripts.patch
Normal file
369
netpbm/netpbm-security-scripts.patch
Normal file
@@ -0,0 +1,369 @@
|
||||
diff --git a/converter/other/anytopnm b/converter/other/anytopnm
|
||||
index acf8813..335312a 100755
|
||||
--- a/converter/other/anytopnm
|
||||
+++ b/converter/other/anytopnm
|
||||
@@ -511,10 +511,7 @@ else
|
||||
inputFile="-"
|
||||
fi
|
||||
|
||||
-tempdir="${TMPDIR-/tmp}/anytopnm.$$"
|
||||
-mkdir -m 0700 $tempdir || \
|
||||
- { echo "Could not create temporary file. Exiting."; exit 1;}
|
||||
-trap 'rm -rf $tempdir' 0
|
||||
+tempdir=$(mktemp -d -t anytopnm.XXXXXXXXXX) || exit 1
|
||||
|
||||
# Take out all spaces
|
||||
# Find the filename extension for last-ditch efforts later
|
||||
@@ -537,12 +534,17 @@ typeDescription=`file "$file" | cut -d: -f2- | cut -c2-`
|
||||
determineType "$file" "$mimeType" "$typeDescription" "$fileExtension"
|
||||
|
||||
if [ "$filetype" = "unknown" ]; then
|
||||
- echo "$progname: unknown file type. " \
|
||||
- "'file' says mime type is '$mimeType', " 1>&2
|
||||
- echo "type description is '$typeDescription'" 1>&2
|
||||
+ if [ -d "$tempdir" ] ; then
|
||||
+ rm -rf "$tempdir"
|
||||
+ fi
|
||||
+
|
||||
exit 1
|
||||
fi
|
||||
|
||||
convertIt $file $filetype
|
||||
|
||||
+if [ -d "$tempdir" ] ; then
|
||||
+ rm -rf "$tempdir"
|
||||
+fi
|
||||
+
|
||||
exit 0
|
||||
diff --git a/editor/pamstretch-gen b/editor/pamstretch-gen
|
||||
index ba0e818..250fca0 100755
|
||||
--- a/editor/pamstretch-gen
|
||||
+++ b/editor/pamstretch-gen
|
||||
@@ -31,9 +31,7 @@ if [ "$1" = "" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
-tempdir="${TMPDIR-/tmp}/pamstretch-gen.$$"
|
||||
-mkdir -m 0700 $tempdir || \
|
||||
- { echo "Could not create temporary file. Exiting."; exit 1;}
|
||||
+tempfile=$(mktemp /tmp/pnmig.XXXXXXXXXX) || exit 1
|
||||
trap 'rm -rf $tempdir' 0 1 3 15
|
||||
|
||||
tempfile=$tempdir/pnmig
|
||||
diff --git a/editor/pnmmargin b/editor/pnmmargin
|
||||
index 0f57d1d..e0d3625 100755
|
||||
--- a/editor/pnmmargin
|
||||
+++ b/editor/pnmmargin
|
||||
@@ -11,11 +11,7 @@
|
||||
# documentation. This software is provided "as is" without express or
|
||||
# implied warranty.
|
||||
|
||||
-tempdir="${TMPDIR-/tmp}/pnmmargin.$$"
|
||||
-mkdir -m 0700 $tempdir || \
|
||||
- { echo "Could not create temporary file. Exiting." 1>&2; exit 1;}
|
||||
-trap 'rm -rf $tempdir' 0 1 3 15
|
||||
-
|
||||
+tempdir=$(mktemp -d -t ppmmargin.XXXXXXX) || exit 1
|
||||
tmp1=$tempdir/pnmm1
|
||||
tmp2=$tempdir/pnmm2
|
||||
tmp3=$tempdir/pnmm3
|
||||
@@ -90,6 +86,7 @@ else
|
||||
-white | -black )
|
||||
pnmpad $plainopt $color \
|
||||
-left=$size -right=$size -top=$size -bottom=$size $tmp1
|
||||
+ rm -rf "$tempdir"
|
||||
exit
|
||||
;;
|
||||
* )
|
||||
@@ -103,4 +100,4 @@ else
|
||||
pnmcat -tb $plainopt $tmp3 $tmp4 $tmp3
|
||||
fi
|
||||
|
||||
-
|
||||
+rm -rf "$tempdir"
|
||||
diff --git a/editor/ppmfade b/editor/ppmfade
|
||||
index 027fc79..8eb094f 100755
|
||||
--- a/editor/ppmfade
|
||||
+++ b/editor/ppmfade
|
||||
@@ -40,6 +40,7 @@ exec perl -w -x -S -- "$0" "$@"
|
||||
#
|
||||
##############################################################################
|
||||
use strict;
|
||||
+use File::Temp "tempdir";
|
||||
|
||||
my $SPREAD = 1;
|
||||
my $SHIFT = 2;
|
||||
@@ -137,20 +138,26 @@ if ($first_file ne "undefined") {
|
||||
|
||||
print("Frames are " . $width . "W x " . $height . "H\n");
|
||||
|
||||
+#
|
||||
+# We create a tmp-directory right here
|
||||
+#
|
||||
+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1);
|
||||
+
|
||||
+
|
||||
if ($first_file eq "undefined") {
|
||||
print "Fading from black to ";
|
||||
- system("ppmmake \\#000 $width $height >junk1$$.ppm");
|
||||
+ system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm");
|
||||
} else {
|
||||
print "Fading from $first_file to ";
|
||||
- system("cp", $first_file, "junk1$$.ppm");
|
||||
+ system("cp", $first_file, "$tmpdir/junk1$$.ppm");
|
||||
}
|
||||
|
||||
if ($last_file eq "undefined") {
|
||||
print "black.\n";
|
||||
- system("ppmmake \\#000 $width $height >junk2$$.ppm");
|
||||
+ system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm");
|
||||
} else {
|
||||
print "$last_file\n";
|
||||
- system("cp", $last_file, "junk2$$.ppm");
|
||||
+ system("cp", $last_file, "$tmpdir/junk2$$.ppm");
|
||||
}
|
||||
|
||||
#
|
||||
@@ -158,14 +165,14 @@ if ($last_file eq "undefined") {
|
||||
#
|
||||
|
||||
# Here's what our temporary files are:
|
||||
-# junk1$$.ppm: The original (fade-from) image
|
||||
-# junk2$$.ppm: The target (fade-from) image
|
||||
-# junk3$$.ppm: The frame of the fade for the current iteration of the
|
||||
-# the for loop.
|
||||
-# junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
|
||||
-# image to another, this is the first frame of that
|
||||
-# sequence.
|
||||
-# junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
|
||||
+# $tmpdir/junk1$$.ppm: The original (fade-from) image
|
||||
+# $tmpdir/junk2$$.ppm: The target (fade-from) image
|
||||
+# $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the
|
||||
+# the for loop.
|
||||
+# $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
|
||||
+# image to another, this is the first frame of that
|
||||
+# sequence.
|
||||
+# $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
|
||||
|
||||
my $i; # Frame number
|
||||
for ($i = 1; $i <= $nframes; $i++) {
|
||||
@@ -173,147 +180,147 @@ for ($i = 1; $i <= $nframes; $i++) {
|
||||
if ($mode eq $SPREAD) {
|
||||
if ($i <= 10) {
|
||||
my $n = $spline20[$i] * 100;
|
||||
- system("ppmspread $n junk1$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
} elsif ($i <= 20) {
|
||||
my $n;
|
||||
$n = $spline20[$i] * 100;
|
||||
- system("ppmspread $n junk1$$.ppm >junk1a$$.ppm");
|
||||
+ system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
|
||||
$n = (1-$spline20[$i-10]) * 100;
|
||||
- system("ppmspread $n junk2$$.ppm >junk2a$$.ppm");
|
||||
+ system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
|
||||
$n = $spline10[$i-10];
|
||||
- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
} else {
|
||||
my $n = (1-$spline20[$i-10])*100;
|
||||
- system("ppmspread $n junk2$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
}
|
||||
} elsif ($mode eq $SHIFT) {
|
||||
if ($i <= 10) {
|
||||
my $n = $spline20[$i] * 100;
|
||||
- system("ppmshift $n junk1$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
} elsif ($i <= 20) {
|
||||
my $n;
|
||||
$n = $spline20[$i] * 100;
|
||||
- system("ppmshift $n junk1$$.ppm >junk1a$$.ppm");
|
||||
+ system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
|
||||
$n = (1-$spline20[$i-10])*100;
|
||||
- system("ppmshift $n junk2$$.ppm >junk2a$$.ppm");
|
||||
+ system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
|
||||
$n = $spline10[$i-10];
|
||||
- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
} else {
|
||||
my $n = (1-$spline20[$i-10]) * 100;
|
||||
- system("ppmshift $n junk2$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
}
|
||||
} elsif ($mode eq $RELIEF) {
|
||||
if ($i == 1) {
|
||||
- system("ppmrelief junk1$$.ppm >junk1r$$.ppm");
|
||||
+ system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm");
|
||||
}
|
||||
if ($i <= 10) {
|
||||
my $n = $spline10[$i];
|
||||
- system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
} elsif ($i <= 20) {
|
||||
my $n = $spline10[$i-10];
|
||||
- system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
} else {
|
||||
my $n = $spline10[$i-20];
|
||||
- system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
}
|
||||
if ($i == 10) {
|
||||
- system("ppmrelief junk2$$.ppm >junk2r$$.ppm");
|
||||
+ system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm");
|
||||
}
|
||||
} elsif ($mode eq $OIL) {
|
||||
if ($i == 1) {
|
||||
- system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm");
|
||||
- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
|
||||
- ">junk1o$$.ppm");
|
||||
+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
|
||||
+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
|
||||
+ ">$tmpdir/junk1o$$.ppm");
|
||||
}
|
||||
if ($i <= 10) {
|
||||
my $n = $spline10[$i];
|
||||
- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
} elsif ($i <= 20) {
|
||||
my $n = $spline10[$i-10];
|
||||
- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
} else {
|
||||
my $n = $spline10[$i-20];
|
||||
- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
}
|
||||
if ($i == 10) {
|
||||
- system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm");
|
||||
- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
|
||||
- ">junk2o$$.ppm");
|
||||
+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
|
||||
+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
|
||||
+ ">$tmpdir/junk2o$$.ppm");
|
||||
}
|
||||
} elsif ($mode eq $EDGE) {
|
||||
if ($i == 1) {
|
||||
- system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm");
|
||||
- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
|
||||
- ">junk1o$$.ppm");
|
||||
+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
|
||||
+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
|
||||
+ ">$tmpdir/junk1o$$.ppm");
|
||||
}
|
||||
if ($i <= 10) {
|
||||
my $n = $spline10[$i];
|
||||
- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
} elsif ($i <= 20) {
|
||||
my $n = $spline10[$i-10];
|
||||
- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
} else {
|
||||
my $n = $spline10[$i-20];
|
||||
- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
}
|
||||
if ($i == 10) {
|
||||
- system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm");
|
||||
- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
|
||||
- ">junk2o$$.ppm");
|
||||
+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
|
||||
+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
|
||||
+ ">$tmpdir/junk2o$$.ppm");
|
||||
}
|
||||
} elsif ($mode eq $BENTLEY) {
|
||||
if ($i == 1) {
|
||||
- system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm");
|
||||
- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
|
||||
- ">junk1o$$.ppm");
|
||||
+ system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
|
||||
+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
|
||||
+ ">$tmpdir/junk1o$$.ppm");
|
||||
}
|
||||
if ($i <= 10) {
|
||||
my $n = $spline10[$i];
|
||||
- system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
} elsif ($i <= 20) {
|
||||
my $n = $spline10[$i-10];
|
||||
- system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
} else {
|
||||
my $n = $spline10[$i-20];
|
||||
- system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
}
|
||||
if ($i == 10) {
|
||||
- system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm");
|
||||
- system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
|
||||
- ">junk2o$$.ppm");
|
||||
+ system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
|
||||
+ system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
|
||||
+ ">$tmpdir/junk2o$$.ppm");
|
||||
}
|
||||
} elsif ($mode eq $BLOCK) {
|
||||
if ($i <= 10) {
|
||||
my $n = 1 - 1.9*$spline20[$i];
|
||||
- system("pamscale $n junk1$$.ppm | " .
|
||||
- "pamscale -width $width -height $height >junk3$$.ppm");
|
||||
+ system("pamscale $n $tmpdir/junk1$$.ppm | " .
|
||||
+ "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
|
||||
} elsif ($i <= 20) {
|
||||
my $n = $spline10[$i-10];
|
||||
- system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
} else {
|
||||
my $n = 1 - 1.9*$spline20[31-$i];
|
||||
- system("pamscale $n junk2$$.ppm | " .
|
||||
- "pamscale -width $width -height $height >junk3$$.ppm");
|
||||
+ system("pamscale $n $tmpdir/junk2$$.ppm | " .
|
||||
+ "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
|
||||
}
|
||||
if ($i == 10) {
|
||||
- system("cp", "junk3$$.ppm", "junk1a$$.ppm");
|
||||
- system("pamscale $n junk2$$.ppm | " .
|
||||
- "pamscale -width $width -height $height >junk2a$$.ppm");
|
||||
+ system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm");
|
||||
+ system("pamscale $n $tmpdir/junk2$$.ppm | " .
|
||||
+ "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm");
|
||||
}
|
||||
} elsif ($mode eq $MIX) {
|
||||
my $fade_factor = sqrt(1/($nframes-$i+1));
|
||||
- system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm");
|
||||
+ system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
|
||||
} else {
|
||||
print("Internal error: impossible mode value '$mode'\n");
|
||||
}
|
||||
|
||||
my $outfile = sprintf("%s.%04d.ppm", $base_name, $i);
|
||||
- system("cp", "junk3$$.ppm", $outfile);
|
||||
+ system("cp", "$tmpdir/junk3$$.ppm", $outfile);
|
||||
}
|
||||
|
||||
#
|
||||
# Clean up shop.
|
||||
#
|
||||
-system("rm junk*$$.ppm");
|
||||
+system("rm $tmpdir/junk*$$.ppm");
|
||||
|
||||
exit(0);
|
||||
diff --git a/editor/ppmshadow b/editor/ppmshadow
|
||||
index 62cdf8b..72e1b22 100755
|
||||
--- a/editor/ppmshadow
|
||||
+++ b/editor/ppmshadow
|
||||
@@ -97,9 +97,10 @@ sub makeConvolutionKernel($$) {
|
||||
|
||||
|
||||
my $tmpdir = $ENV{TMPDIR} || "/tmp";
|
||||
-my $ourtmp = "$tmpdir/ppmshadow$$";
|
||||
-mkdir($ourtmp, 0777) or
|
||||
- die("Unable to create directory for temporary files '$ourtmp");
|
||||
+my $ourtmp; chomp($ourtmp = `mktemp -d -t PPMshadow.XXXXXX`);
|
||||
+if ($? >> 8) {
|
||||
+ die "Can't create directory for temporary files";
|
||||
+}
|
||||
|
||||
# Process command line options
|
||||
|
||||
|
||||
Reference in New Issue
Block a user