aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/qtpfsgui/doinst.sh10
-rw-r--r--graphics/qtpfsgui/qtpfsgui-1.9.2-trunk.patch156
-rw-r--r--graphics/qtpfsgui/qtpfsgui.SlackBuild10
-rw-r--r--graphics/qtpfsgui/qtpfsgui.info8
4 files changed, 176 insertions, 8 deletions
diff --git a/graphics/qtpfsgui/doinst.sh b/graphics/qtpfsgui/doinst.sh
index 98d466d8b908b..3e5691a052b5b 100644
--- a/graphics/qtpfsgui/doinst.sh
+++ b/graphics/qtpfsgui/doinst.sh
@@ -1,3 +1,9 @@
-if [ -x usr/bin/update-desktop-database ]; then
- ./usr/bin/update-desktop-database ./usr/share/applications >/dev/null 2>&1
+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
new file mode 100644
index 0000000000000..b817317b1af2c
--- /dev/null
+++ b/graphics/qtpfsgui/qtpfsgui-1.9.2-trunk.patch
@@ -0,0 +1,156 @@
+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
index 03f310cd9b38e..c8aa086a97933 100644
--- a/graphics/qtpfsgui/qtpfsgui.SlackBuild
+++ b/graphics/qtpfsgui/qtpfsgui.SlackBuild
@@ -5,7 +5,7 @@
# This script is dedicated to the public domain
PRGNAM=qtpfsgui
-VERSION=1.9.0
+VERSION=1.9.2
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -19,6 +19,8 @@ if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
fi
set -e
@@ -32,7 +34,10 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-lrelease project.pro # see lrelease(1)
+# From Gentoo - fixes bug 222135 (crash after saving file)
+cat $CWD/qtpfsgui-1.9.2-trunk.patch | patch -p2
+
+lrelease project.pro
qmake-qt4 \
INSTALL_ROOT=$PKG \
PREFIX=/usr \
@@ -52,6 +57,7 @@ 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.tgz
diff --git a/graphics/qtpfsgui/qtpfsgui.info b/graphics/qtpfsgui/qtpfsgui.info
index 50d82284294d5..c22dfca5c3fdb 100644
--- a/graphics/qtpfsgui/qtpfsgui.info
+++ b/graphics/qtpfsgui/qtpfsgui.info
@@ -1,8 +1,8 @@
PRGNAM="qtpfsgui"
-VERSION="1.9.0"
+VERSION="1.9.2"
HOMEPAGE="http://qtpfsgui.sourceforge.net"
-DOWNLOAD="http://download.sourceforge.net/qtpfsgui/qtpfsgui-1.9.0.tar.gz"
-MD5SUM="cd4dd10e2d757fba4b8edbc31a5ec128"
+DOWNLOAD="http://download.sourceforge.net/qtpfsgui/qtpfsgui-1.9.2.tar.gz"
+MD5SUM="8a037c1dc75f04752dc36a59e7237fc4"
MAINTAINER="David Spencer"
EMAIL="nobbutl@yahoo.co.uk"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-23 05:18:44 +0000