Permalink
Browse files

pxldthr; comment out the shake-y (js) bits because FF 14 broked it...

  • Loading branch information...
1 parent c1787e0 commit 693b6804bef1b7317d5812e90a922be2662f96ca straup committed Sep 30, 2012
Showing with 22 additions and 4 deletions.
  1. +18 −2 filtr/filtr
  2. +2 −0 www/javascript/cwf.js
  3. +2 −2 www/templates/page_flickr_photos_friends_faves.txt
View
20 filtr/filtr
@@ -175,7 +175,7 @@ fi
# which filtr is being run?
case $FILTER in
- dazd|dthr|movr|postr|postcrd|pxl|rockstr|stndpipe|tilt)
+ dazd|dthr|movr|postr|postcrd|pxl|pxldthr|rockstr|stndpipe|tilt)
;;
heathr)
FILTER="stndpipe"
@@ -201,7 +201,7 @@ echo "[startup] input UID is ${FILTR_UID}"
# tmp/work files
-TMP=`mktemp -d -t ${FILTR_UID}`
+TMP=`mktemp -d -t ${FILTR_UID}XXXXXXXXXX`
ID="${TMP}/${FILTR_UID}-${FILTER}-id.txt"
LOMO="${TMP}/${FILTR_UID}-${FILTER}-lomo.png"
@@ -326,6 +326,22 @@ case $FILTER in
;;
+ pxldthr)
+
+ # sudo call functions and/or filtr itself...
+
+ PXLTMP="${TMP}/${FILTR_UID}-${FILTER}-tmp.jpg"
+
+ echo "[${FILTER}] triangulizorize"
+ ${PYTHON} ${UTILS}/triangulizor.py -f JPEG ${INPUT} ${PXLTMP}
+
+ echo "[${FILTER}] dither"
+ ${PYTHON} ${UTILS}/dither.py ${PXLTMP} ${OUTPUT}
+
+ rm ${PXLTMP}
+
+ ;;
+
rockstr)
echo "[${FILTER}] create output"
View
2 www/javascript/cwf.js
@@ -230,11 +230,13 @@ function cwf_init_shortcuts(){
preventDefaultEvents: true
});
+ /*
$.shake({
callback: toggle_automatic,
shakethreshold: 5,
debounce: 1000,
});
+ */
}
function cwf_schedule_check_photos(older_than){
View
4 www/templates/page_flickr_photos_friends_faves.txt
@@ -8,9 +8,9 @@
<script type="text/javascript" src="{$cfg.abs_root_url}javascript/jquery.simplemodal.min.js"></script>
{if 0}
<script type="text/javascript" src="{$cfg.abs_root_url}javascript/jquery.ios-shake.min.js"></script>
- <script type="text/javascript" src="{$cfg.abs_root_url}javascript/jquery.touchwipe.min.js"></script>
-{/if}
<script type="text/javascript" src="{$cfg.abs_root_url}javascript/jquery-swooshy-swoosh.min.js"></script>
+{/if}
+ <script type="text/javascript" src="{$cfg.abs_root_url}javascript/jquery.touchwipe.min.js"></script>
<script type="text/javascript" src="{$cfg.abs_root_url}javascript/screenfull.min.js"></script>
{if $cfg.environment=='prod'}
<script type="text/javascript" src="{$cfg.abs_root_url}javascript/cwf.bundle.min.js"></script>

0 comments on commit 693b680

Please sign in to comment.