Skip to content
This repository
Browse code

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

  • Loading branch information...
commit 693b6804bef1b7317d5812e90a922be2662f96ca 1 parent c1787e0
authored September 30, 2012
20  filtr/filtr
@@ -175,7 +175,7 @@ fi
175 175
 # which filtr is being run?
176 176
 
177 177
 case $FILTER in
178  
-    dazd|dthr|movr|postr|postcrd|pxl|rockstr|stndpipe|tilt)
  178
+    dazd|dthr|movr|postr|postcrd|pxl|pxldthr|rockstr|stndpipe|tilt)
179 179
     ;;
180 180
     heathr)
181 181
     FILTER="stndpipe"
@@ -201,7 +201,7 @@ echo "[startup] input UID is ${FILTR_UID}"
201 201
 
202 202
 # tmp/work files
203 203
 
204  
-TMP=`mktemp -d -t ${FILTR_UID}`
  204
+TMP=`mktemp -d -t ${FILTR_UID}XXXXXXXXXX`
205 205
 
206 206
 ID="${TMP}/${FILTR_UID}-${FILTER}-id.txt"
207 207
 LOMO="${TMP}/${FILTR_UID}-${FILTER}-lomo.png"
@@ -326,6 +326,22 @@ case $FILTER in
326 326
 
327 327
     ;;
328 328
 
  329
+    pxldthr)
  330
+
  331
+    # sudo call functions and/or filtr itself...
  332
+
  333
+    PXLTMP="${TMP}/${FILTR_UID}-${FILTER}-tmp.jpg"
  334
+
  335
+    echo "[${FILTER}] triangulizorize"
  336
+    ${PYTHON} ${UTILS}/triangulizor.py -f JPEG ${INPUT} ${PXLTMP}
  337
+
  338
+    echo "[${FILTER}] dither"
  339
+    ${PYTHON} ${UTILS}/dither.py ${PXLTMP} ${OUTPUT}
  340
+
  341
+    rm ${PXLTMP}
  342
+
  343
+    ;;
  344
+
329 345
     rockstr)
330 346
 
331 347
     echo "[${FILTER}] create output"
2  www/javascript/cwf.js
@@ -230,11 +230,13 @@ function cwf_init_shortcuts(){
230 230
 		preventDefaultEvents: true
231 231
 	});
232 232
 
  233
+    /*
233 234
 	$.shake({
234 235
 		callback: toggle_automatic,
235 236
 		shakethreshold: 5,
236 237
 		debounce: 1000,
237 238
 	});
  239
+     */
238 240
 }
239 241
 
240 242
 function cwf_schedule_check_photos(older_than){
4  www/templates/page_flickr_photos_friends_faves.txt
@@ -8,9 +8,9 @@
8 8
 	<script type="text/javascript" src="{$cfg.abs_root_url}javascript/jquery.simplemodal.min.js"></script>
9 9
 {if 0}
10 10
 	<script type="text/javascript" src="{$cfg.abs_root_url}javascript/jquery.ios-shake.min.js"></script>
11  
-	<script type="text/javascript" src="{$cfg.abs_root_url}javascript/jquery.touchwipe.min.js"></script>
12  
-{/if}
13 11
 	<script type="text/javascript" src="{$cfg.abs_root_url}javascript/jquery-swooshy-swoosh.min.js"></script>
  12
+{/if}
  13
+	<script type="text/javascript" src="{$cfg.abs_root_url}javascript/jquery.touchwipe.min.js"></script>
14 14
 	<script type="text/javascript" src="{$cfg.abs_root_url}javascript/screenfull.min.js"></script>
15 15
 {if $cfg.environment=='prod'}
16 16
 	<script type="text/javascript" src="{$cfg.abs_root_url}javascript/cwf.bundle.min.js"></script>

0 notes on commit 693b680

Please sign in to comment.
Something went wrong with that request. Please try again.