diff options
author | David Spencer <baildon.research@googlemail.com> | 2010-07-03 01:35:47 -0500 |
---|---|---|
committer | Erik Hanson <erik@slackbuilds.org> | 2010-07-03 02:31:44 -0500 |
commit | e655bae816035e9f25aa8b9d19311914b5e8594a (patch) | |
tree | 93f5a3071c90bb1b4cf1b7d4c3caffdc369f8fba | |
parent | 938dc2421d0230c2cf6971f581be353d49cb0349 (diff) |
graphics/qtpfsgui: Removed (replaced by luminance-hdr)
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r-- | graphics/qtpfsgui/README | 4 | ||||
-rw-r--r-- | graphics/qtpfsgui/doinst.sh | 9 | ||||
-rw-r--r-- | graphics/qtpfsgui/qtpfsgui-1.9.2-trunk.patch | 156 | ||||
-rw-r--r-- | graphics/qtpfsgui/qtpfsgui.SlackBuild | 78 | ||||
-rw-r--r-- | graphics/qtpfsgui/qtpfsgui.info | 10 | ||||
-rw-r--r-- | graphics/qtpfsgui/slack-desc | 19 |
6 files changed, 0 insertions, 276 deletions
diff --git a/graphics/qtpfsgui/README b/graphics/qtpfsgui/README deleted file mode 100644 index 9f707d60f3c4..000000000000 --- a/graphics/qtpfsgui/README +++ /dev/null @@ -1,4 +0,0 @@ -Qtpfsgui is an HDR imaging tool. It creates an HDR file from a set -of images (JPEG, TIFF 8 and 16 bit, RAW) of the same scene taken at -different exposure settings. You can save and load HDR images, -rotate and resize them, tonemap your images, and copy your EXIF data. diff --git a/graphics/qtpfsgui/doinst.sh b/graphics/qtpfsgui/doinst.sh deleted file mode 100644 index 3e5691a052b5..000000000000 --- a/graphics/qtpfsgui/doinst.sh +++ /dev/null @@ -1,9 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/graphics/qtpfsgui/qtpfsgui-1.9.2-trunk.patch b/graphics/qtpfsgui/qtpfsgui-1.9.2-trunk.patch deleted file mode 100644 index b817317b1af2..000000000000 --- a/graphics/qtpfsgui/qtpfsgui-1.9.2-trunk.patch +++ /dev/null @@ -1,156 +0,0 @@ -Index: trunk/qtpfsgui/src/Fileformat/pfsoutldrimage.cpp -=================================================================== ---- trunk/qtpfsgui/src/Fileformat/pfsoutldrimage.cpp (revision 319) -+++ trunk/qtpfsgui/src/Fileformat/pfsoutldrimage.cpp (working copy) -@@ -62,9 +62,9 @@ - *(data + 2 + (y*width+x)*4) = ( clamp( (*R)( x, y )*255.f, 0, 255) ); - *(data + 3 + (y*width+x)*4) = 0xff; - } else { -- *(data + 3 + (y*width+x)*4) = ( clamp( (*B)( x, y )*255.f, 0, 255) ); -+ *(data + 3 + (y*width+x)*4) = ( clamp( (*R)( x, y )*255.f, 0, 255) ); - *(data + 2 + (y*width+x)*4) = ( clamp( (*G)( x, y )*255.f, 0, 255) ); -- *(data + 1 + (y*width+x)*4) = ( clamp( (*R)( x, y )*255.f, 0, 255) ); -+ *(data + 1 + (y*width+x)*4) = ( clamp( (*B)( x, y )*255.f, 0, 255) ); - *(data + 0 + (y*width+x)*4) = 0xff; - } - } -Index: trunk/qtpfsgui/src/Common/gamma_and_levels.cpp -=================================================================== ---- trunk/qtpfsgui/src/Common/gamma_and_levels.cpp (revision 319) -+++ trunk/qtpfsgui/src/Common/gamma_and_levels.cpp (working copy) -@@ -189,12 +189,21 @@ - return; - } - -- //increment bins -- for (int i=0; i<data.width()*data.height(); i+=accuracy) { -- int v=qGray(*((QRgb*)(data.bits())+i)); -- assert(v>=0 && v<=255); -- P[v] += 1; -- } -+// if (data.format()==QImage::Format_Indexed8) { -+// //increment bins -+// for (int i=0; i<data.width()*data.height(); i+=accuracy) { -+// const unsigned char v=*((const unsigned char*)(data.bits())+i); -+// P[v] += 1; -+// } -+// -+// } else { -+ //increment bins -+ for (int i=0; i<data.width()*data.height(); i+=accuracy) { -+ int v=qGray(*((QRgb*)(data.bits())+i)); -+ assert(v>=0 && v<=255); -+ P[v] += 1; -+ } -+// } - - //find max - float max=-1; -Index: trunk/qtpfsgui/src/Common/commandline.cpp -=================================================================== ---- trunk/qtpfsgui/src/Common/commandline.cpp (revision 319) -+++ trunk/qtpfsgui/src/Common/commandline.cpp (working copy) -@@ -378,7 +378,7 @@ - if (!saveHdrFilename.isEmpty()) { - VERBOSEPRINT("Saving to file %1.",saveHdrFilename); - QFileInfo qfi(saveHdrFilename); -- const char* encodedName=QFile::encodeName(qfi.filePath()).constData(); -+ char* encodedName=strdup(QFile::encodeName(qfi.filePath()).constData()); - if (qfi.suffix().toUpper()=="EXR") { - writeEXRfile(HDR,encodedName); - } else if (qfi.suffix().toUpper()=="HDR") { -@@ -397,6 +397,7 @@ - } else { - error("Error, please specify a supported HDR file format."); - } -+ free(encodedName); - } else { - VERBOSEPRINT("NOT Saving HDR image to file. %1",""); - } -Index: trunk/qtpfsgui/src/Common/options.cpp -=================================================================== ---- trunk/qtpfsgui/src/Common/options.cpp (revision 319) -+++ trunk/qtpfsgui/src/Common/options.cpp (working copy) -@@ -60,8 +60,9 @@ - if (!settings.contains(KEY_EXTERNAL_DCRAW_OPTIONS)) - settings.setValue(KEY_EXTERNAL_DCRAW_OPTIONS,"-T"); - dcraw_options=settings.value(KEY_EXTERNAL_DCRAW_OPTIONS).toStringList(); -- if (!settings.contains(KEY_EXTERNAL_AIS_OPTIONS)) -- settings.setValue(KEY_EXTERNAL_AIS_OPTIONS,"-a aligned_"); -+ //bug 2001032, remove spurious default QString "-a aligned_" value set by ver 1.9.2 -+ if (!settings.contains(KEY_EXTERNAL_AIS_OPTIONS) || settings.value(KEY_EXTERNAL_AIS_OPTIONS).toString()=="-a aligned_") -+ settings.setValue(KEY_EXTERNAL_AIS_OPTIONS, QStringList() << "-a" << "aligned_"); - align_image_stack_options=settings.value(KEY_EXTERNAL_AIS_OPTIONS).toStringList(); - settings.endGroup(); - -Index: trunk/qtpfsgui/src/Threads/loadHdrThread.cpp -=================================================================== ---- trunk/qtpfsgui/src/Threads/loadHdrThread.cpp (revision 319) -+++ trunk/qtpfsgui/src/Threads/loadHdrThread.cpp (working copy) -@@ -58,7 +58,7 @@ - QString extension = qfi.suffix().toUpper(); - bool rawinput = (rawextensions.indexOf(extension)!=-1); - try { -- const char* encodedFileName=QFile::encodeName(qfi.filePath()).constData(); -+ char* encodedFileName=strdup(QFile::encodeName(qfi.filePath()).constData()); - if (extension=="EXR") { - hdrpfsframe = readEXRfile(encodedFileName); - } else if (extension=="HDR") { -@@ -123,6 +123,7 @@ - emit load_failed(tr("ERROR: File %1 has unsupported extension.").arg(fname)); - return; - } -+ free(encodedFileName); - #if 0 - pfs::Channel *R,*G,*B; - hdrpfsframe->getRGBChannels( R, G, B ); -Index: trunk/qtpfsgui/src/HdrCreation/HdrCreationManager.cpp -=================================================================== ---- trunk/qtpfsgui/src/HdrCreation/HdrCreationManager.cpp (revision 319) -+++ trunk/qtpfsgui/src/HdrCreation/HdrCreationManager.cpp (working copy) -@@ -261,7 +261,7 @@ - clearlists(false); - for (int i=0;i<fileList.size();i++) { - //align_image_stack can only output tiff files -- const char* fname=QFile::encodeName(QString(qtpfsgui_options->tempfilespath + "/aligned_" + QString("%1").arg(i,4,10,QChar('0'))+".tif")).constData(); -+ char* fname=strdup(QFile::encodeName(QString(qtpfsgui_options->tempfilespath + "/aligned_" + QString("%1").arg(i,4,10,QChar('0'))+".tif")).constData()); - //qDebug("HCM: Loading back file name=%s", fname); - TiffReader reader(fname); - //if 8bit ldr tiff -@@ -279,6 +279,7 @@ - listmdrB.push_back(B); - } - QFile::remove(fname); -+ free(fname); - } - QFile::remove(QString(qtpfsgui_options->tempfilespath + "/hugin_debug_optim_results.txt")); - emit finishedAligning(); -Index: trunk/qtpfsgui/src/MainWindow/mainWindow.cpp -=================================================================== ---- trunk/qtpfsgui/src/MainWindow/mainWindow.cpp (revision 319) -+++ trunk/qtpfsgui/src/MainWindow/mainWindow.cpp (working copy) -@@ -192,7 +192,8 @@ - QString fname=(fd->selectedFiles()).at(0); - if(!fname.isEmpty()) { - QFileInfo qfi(fname); -- const char* encodedName=QFile::encodeName(qfi.filePath()).constData(); -+ QString absoluteFileName=qfi.absoluteFilePath(); -+ char* encodedName=strdup(QFile::encodeName(absoluteFileName).constData()); - // if the new dir, the one just chosen by the user, is different from the one stored in the settings, update the settings. - if (RecentDirHDRSetting != qfi.path() ) - // update internal field variable -@@ -219,10 +220,11 @@ - delete fd; - return; - } -- setCurrentFile(fname); -+ free(encodedName); -+ setCurrentFile(absoluteFileName); - currenthdr->NeedsSaving=false; -- currenthdr->filename=fname; -- currenthdr->setWindowTitle(fname); -+ currenthdr->filename=absoluteFileName; -+ currenthdr->setWindowTitle(absoluteFileName); - } - } //if (fd->exec()) - delete fd; diff --git a/graphics/qtpfsgui/qtpfsgui.SlackBuild b/graphics/qtpfsgui/qtpfsgui.SlackBuild deleted file mode 100644 index 3d945a36f69a..000000000000 --- a/graphics/qtpfsgui/qtpfsgui.SlackBuild +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh - -# Slackware build script for qtpfsgui -# Written by David Spencer <nobbutl@yahoo.co.uk> -# This script is dedicated to the public domain - -PRGNAM=qtpfsgui -VERSION=1.9.2 -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -chmod -R u+w,go+r-w,a-s . - -# From Gentoo - fixes bug 222135 (crash after saving file) -cat $CWD/qtpfsgui-1.9.2-trunk.patch | patch -p2 - -lrelease project.pro -qmake \ - INSTALL_ROOT=$PKG \ - PREFIX=/usr \ - QMAKE_CFLAGS="$SLKCFLAGS" \ - QMAKE_CXXFLAGS="$SLKCFLAGS" -make -make INSTALL_ROOT=$PKG install - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp TODO $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION -cd $PKG/usr/share/$PRGNAM - mv AUTHORS Changelog INSTALL LICENSE README html \ - $PKG/usr/doc/$PRGNAM-$VERSION - ln -s /usr/doc/$PRGNAM-$VERSION/html . -cd - -find $PKG/usr/doc -type f -exec chmod 0644 {} \; - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/graphics/qtpfsgui/qtpfsgui.info b/graphics/qtpfsgui/qtpfsgui.info deleted file mode 100644 index db2dc014c942..000000000000 --- a/graphics/qtpfsgui/qtpfsgui.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="qtpfsgui" -VERSION="1.9.2" -HOMEPAGE="http://qtpfsgui.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/qtpfsgui/qtpfsgui-1.9.2.tar.gz" -MD5SUM="8a037c1dc75f04752dc36a59e7237fc4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -MAINTAINER="David Spencer" -EMAIL="nobbutl@yahoo.co.uk" -APPROVED="Erik Hanson,pprkut" diff --git a/graphics/qtpfsgui/slack-desc b/graphics/qtpfsgui/slack-desc deleted file mode 100644 index ff38041d6ff4..000000000000 --- a/graphics/qtpfsgui/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler----------------------------------------------------| -qtpfsgui: qtpfsgui (HDR imaging tool) -qtpfsgui: -qtpfsgui: Qtpfsgui creates an HDR file from a set of images (JPEG, TIFF 8 and -qtpfsgui: 16 bit, RAW) of the same scene taken at different exposure settings. -qtpfsgui: You can save and load HDR images, rotate and resize them, tonemap -qtpfsgui: your images, and copy your EXIF data. -qtpfsgui: -qtpfsgui: Homepage: http://qtpfsgui.sourceforge.net/ -qtpfsgui: -qtpfsgui: -qtpfsgui: |