X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=56b162e8664aa952ea734bfbe46e27239dc11774;hb=e94c6ad740fc4fb40ca32ea3e1a95b6bd9a1c73b;hp=05cbb1d60ad86f0ca10911a379a200931f19ccc8;hpb=a6e6ffa207e7bd14f026ef0ea261d14473b18109;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 05cbb1d..56b162e 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -145,7 +145,6 @@ layers=${dest}/layers.txt
 
 if [ ! -d ${dest} ]; then
     mkdir ${dest}
-    #    rm -rf ${dest}
 fi
 
 for tool in convert composite identify; do
@@ -175,6 +174,8 @@ if [ ${trames} -eq 1 ]; then
     # Will start at frame 2 at first loop iteration
     f=1
 
+    nf=""
+    oldnf=""
     files=""
 
     while read l; do
@@ -196,9 +197,23 @@ if [ ${trames} -eq 1 ]; then
         files="${files} -page ${p} ${src}[${f}]"
 
         if [ x"${nf}" != x"" ]; then
+            # Only check expected frame if oldnf is set...
+            if [ x"${oldnf}" != x"" ]; then
+                expected_nf=$((${oldnf} + 1))
+
+                if [ ${expected_nf} -ne ${nf} ]; then
+                    echo "Error: invalid frame sequence: ${nf}"
+                    echo "  previous: ${oldnf}"
+                    echo "  expected: ${expected_nf}"
+                    files=""
+                    continue
+                fi
+            fi
+
             log_dbg "New frame ID: ${nf}"
             convert -colorspace sRGB -page +0+0 ${dest}/background.png ${files} -background none -layers merge ${dest}/f${nf}.png
             files=""
+            oldnf="${nf}"
         fi
     done <${layers}
 fi