From b4969673f009f29ae524cef9b4fa68972181bc38 Mon Sep 17 00:00:00 2001 From: Sofus Rose Date: Tue, 29 Nov 2016 18:30:52 -0500 Subject: [PATCH] Fixed DNGs. Again. Also, now using symlinks for external DNG sequence - this makes it very fast, especially when working with MLVFS! --- convmlv.sh | 11 +++++++---- docs/buildDocs.sh | 10 ++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100755 docs/buildDocs.sh diff --git a/convmlv.sh b/convmlv.sh index c06974a..768319a 100755 --- a/convmlv.sh +++ b/convmlv.sh @@ -10,6 +10,9 @@ #~ TOP PRIORITY #~ --> Fix Color Management; -o 5 is broken. Use -o 0, supplemented by current paradigm of Rec709 -> Whatever LUTs, instead of XYZ -> Whatever LUTs. +#~ --> MLVFS backend - run the mlvfs command, passing whatever options it supports, then rewrite ARG. Give an option to choose mlv_dump or mlvfs, and an option for a custom path to mlvfs. +#~ *Consider using dcraw for darkframing, through the -K option. Requires a develop from MLV, then a convert to raw PGM, first. +#~ --> Darkframe library - place in $HOME/.local/convmlv, perhaps. #~ HIGH PRIORITY #~ --> Retest Darkframe subtraction with preaveraged/naked darkframe MLVs. @@ -1778,18 +1781,18 @@ for ARG in "${FILE_ARGS_ITER[@]}"; do #Go through FILE_ARGS_ITER array, copied f echo -e "\033[1m${TRUNC_ARG}:\033[0m Using specified folder of RAW sequences...\n" #Use prespecified DNG sequence. + FPS=24 #Set it to a safe default. + FRAMES=$(find ${ARG} -name "*.dng" | wc -l) + setRange i=1 for dng in $ARG/*.dng; do - cp $dng $(printf "${TMP}/${TRUNC_ARG}_%06d.dng" $i) + ln -s $dng $(printf "${TMP}/${TRUNC_ARG}_%06d.dng" $i) #Since we're not touching the DNGs, we can link them from wherever to TMP!!! :) Super duper fast. let i++ if [[ i -gt $FRAME_END ]]; then break; fi done - FPS=24 #Set it to a safe default. - FRAMES=$(find ${TMP} -name "*.dng" | wc -l) - dngSet DEVELOP=false #We're not developing DNG's; we already have them! diff --git a/docs/buildDocs.sh b/docs/buildDocs.sh new file mode 100755 index 0000000..e3906c7 --- /dev/null +++ b/docs/buildDocs.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# Run from within docs/. +ROOT_DIR="/home/sofus/subhome/src/convmlv" +DDIR="$ROOT_DIR/docs" + +$ROOT_DIR/convmlv.sh -h | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[mGK]//g" > $DDIR/MANPAGE +pdflatex $DDIR/docs.tex > /dev/null +pdflatex $DDIR/docs.tex > /dev/null #Compile twice to get TOC to show. +rm -f $DDIR/docs.aux $DDIR/docs.log $DDIR/docs.out $DDIR/docs.toc $DDIR/texput.log > /dev/null