Support NEF rotation in pic-mv

[picsort] / pics-preprocess

diff --git a/pics-preprocess b/pics-preprocess
index 780acdc794657b6f875e7aaee07d0c9f53fa2e90..8b8dcb4f4be6fd0fc1e01e770d228739ae99893f 100755 (executable)
--- a/pics-preprocess
+++ b/pics-preprocess
@@ -4,9 +4,6 @@
 # This makes many variants of each .NEF file at different exposure levels
 # and makes reduced-size versions for faster browsing.
 
 # This makes many variants of each .NEF file at different exposure levels
 # and makes reduced-size versions for faster browsing.
 

-GREEN=1.105
-TEMPERATURE=5500
-JPEGCOMPRESSION=95

 SMALLHEIGHT=700
 
 
 SMALLHEIGHT=700
 
 


@@ -18,13 +15,7 @@ for f;do
       out="$level/${base%.NEF}.jpeg"
       exposure=$(dc <<< "2k $level 4 / 3.5-p")  # 10 to 30 -> -1 to 4 in .25 steps
       if [[ ! -s "$out" ]];then
       out="$level/${base%.NEF}.jpeg"
       exposure=$(dc <<< "2k $level 4 / 3.5-p")  # 10 to 30 -> -1 to 4 in .25 steps
       if [[ ! -s "$out" ]];then

-        ufraw-batch --out-type=jpeg \
-                    --green="$GREEN" \
-                    --temperature="$TEMPERATURE" \
-                    --compression="$JPEGCOMPRESSION" \
-                    --exposure="$exposure" \
-                    --output="$out" \
-                    "$f"
+        pics-run-ufraw "$exposure" "$f" "$out"

       fi
       if [[ ! -s "sm/$out" ]];then
         convert "$out" -geometry "x$SMALLHEIGHT" "sm/$out"
       fi
       if [[ ! -s "sm/$out" ]];then
         convert "$out" -geometry "x$SMALLHEIGHT" "sm/$out"