diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 93ce3df03..f5fa6f9d7 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -53,8 +53,8 @@ public class Base { // static private boolean RELEASE = false; /** True if heavy debugging error/log messages are enabled */ - static public boolean DEBUG = false; -// static public boolean DEBUG = true; +// static public boolean DEBUG = false; + static public boolean DEBUG = true; static HashMap platformNames = new HashMap(); diff --git a/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java b/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java index 9232cc3b9..13edb3eae 100644 --- a/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java +++ b/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java @@ -32,6 +32,7 @@ import java.io.FileFilter; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.Method; import java.util.Arrays; import java.util.prefs.Preferences; @@ -619,16 +620,37 @@ public class MovieMaker extends JFrame implements Tool { private BufferedImage readImage(File file) throws IOException { + /* + BufferedImage image = null; + try { + Class iio = getClass().getClassLoader().loadClass("javax.imageio.ImageIO"); + Method readMethod = iio.getMethod("read", new Class[] { File.class }); + image = (BufferedImage) readMethod.invoke(null, file); + + Method scanMethod = iio.getMethod("scanForPlugins", new Class[] { }); + scanMethod.invoke(null); + + Method formatMethod = iio.getMethod("getReaderFormatNames", new Class[] { }); + String[] formats = (String[]) formatMethod.invoke(null); + for (String f : formats) { + System.out.println("dynamically found " + f); + } + + } catch (Exception e) { + throw new RuntimeException(e); + } + */ + Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); +// System.out.println("reading image with CL " + getClass().getClassLoader()); + BufferedImage image = ImageIO.read(file); - /* String[] loadImageFormats = ImageIO.getReaderFormatNames(); if (loadImageFormats != null) { for (String format : loadImageFormats) { System.out.println(format); } } - */ if (image == null) { String path = file.getAbsolutePath(); diff --git a/todo.txt b/todo.txt index 937c2b689..e52b2a49c 100644 --- a/todo.txt +++ b/todo.txt @@ -16,6 +16,9 @@ X https://github.com/processing/processing/issues/2103 X still having right-click issues (re-opened) X https://github.com/processing/processing/issues/2103 +X add gamma, better image options, etc to MovieMaker +_ fix file selection dialog (just import PApplet) with MovieMaker + X add appbundler.jar, otherwise folks have to include Xcode _ if they want to build appbundler, they'll need Xcode _ and the command line tools Preferences > Downloads > Command Line Tools