fixed bug 500

darcs-hash:20040414215742-5007d-f85adfd4a838155a1351b4aafa8289fb24f12673.gz

diff --git a/Makefile b/Makefile
index 65412b1..a1722c0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -201,7 +201,7 @@ build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org.
        java -cp upstream/org.ibex.nestedvm/build:upstream/org.ibex.nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \
                org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
 
-build/Java2/ibex.jar: $(java_classes) build/res/builtin.jar build/class/org/ibex/util/MIPSApps.class
+build/Java2/ibex.jar: compile build/res/builtin.jar build/class/org/ibex/util/MIPSApps.class
        @echo -e "\n\033[1marchiving         .class -> .jar:   build/Java2/ibex.jar\033[0m"
        mkdir -p build/Java2
        echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.core.Main\n" > build/Java2/.manifest

diff --git a/src/org/ibex/core/Box.java b/src/org/ibex/core/Box.java
index 8cf6271..c34948d 100644 (file)
--- a/src/org/ibex/core/Box.java
+++ b/src/org/ibex/core/Box.java
@@ -143,8 +143,8 @@ public final class Box extends JSScope implements Task {
     public void perform() throws JSExn {
         if (texture == null) { Log.warn(Box.class, "perform() called with null texture"); return; }
         if (texture.isLoaded) {
-            setWidth(max(texture.width, maxwidth), maxwidth); 
-            setHeight(max(texture.height, maxheight), maxheight); 
+            setWidth(max(texture.width, minwidth), maxwidth); 
+            setHeight(max(texture.height, minheight), maxheight); 
             DIRTY; }
         else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res.unclone()); }
     }