From 88e5fa8afe1aabf307abb1dd52cc4791bc1e77fc Mon Sep 17 00:00:00 2001 From: Puzzlet Chung Date: Fri, 17 May 2013 23:39:08 +0900 Subject: [PATCH] update pixastic version --- Makefile | 12 ++++++------ lib/ComicBook.js | 5 +++-- lib/pixastic | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index a004a78..aba517b 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ -SOURCES = lib/pixastic/pixastic.core.js \ - lib/pixastic/actions/brightness.js \ - lib/pixastic/actions/desaturate.js \ - lib/pixastic/actions/sharpen.js \ +SOURCES = lib/pixastic/pixastic.js \ + lib/pixastic/pixastic.effects.js \ + lib/pixastic/pixastic.worker.js \ + lib/pixastic/pixastic.worker.control.js \ lib/ComicBook.js -all: reset lib/ComicBook.combined.js lib/ComicBook.min.js clean +all: reset lib/ComicBook.combined.js lib/ComicBook.min.js lib/ComicBook.combined.js: ${SOURCES} cat > $@ $^ @@ -14,7 +14,7 @@ lib/ComicBook.min.js: lib/ComicBook.combined.js java -jar bin/closure-complier/compiler.jar --compilation_level SIMPLE_OPTIMIZATIONS --js $< --js_output_file $@ reset: - rm lib/ComicBook.min.js + rm -f lib/ComicBook.min.js clean: rm lib/ComicBook.combined.js diff --git a/lib/ComicBook.js b/lib/ComicBook.js index 5c9f371..d7d6095 100755 --- a/lib/ComicBook.js +++ b/lib/ComicBook.js @@ -863,11 +863,12 @@ function ComicBook(id, srcs, opts) { options.enhance.brightness = opts; // run the enhancement - Pixastic.process(canvas, "brightness", { + var P = new Pixastic(canvas.getContext("2d")); + P["brightness"]({ brightness: opts.brightness, contrast: opts.contrast, legacy: true - }); + }).done(); init(); }, diff --git a/lib/pixastic b/lib/pixastic index 178dd73..5de8438 160000 --- a/lib/pixastic +++ b/lib/pixastic @@ -1 +1 @@ -Subproject commit 178dd7313b4d7c7dceec6a137467e304f0a1210f +Subproject commit 5de84389685e3124137f6b45daa64811cc6a8220