add campus.png, ibex.jar, upload image to Fpga in MergeSort demo

[fleet.git] / src / edu / berkeley / fleet / dataflow / MergeSort.java

diff --git a/src/edu/berkeley/fleet/dataflow/MergeSort.java b/src/edu/berkeley/fleet/dataflow/MergeSort.java
index 057db66..b478462 100644 (file)
--- a/src/edu/berkeley/fleet/dataflow/MergeSort.java
+++ b/src/edu/berkeley/fleet/dataflow/MergeSort.java
@@ -4,7 +4,7 @@ import java.io.*;
 import edu.berkeley.fleet.loops.*;
 import edu.berkeley.fleet.api.*;
 import edu.berkeley.fleet.fpga.*;
-//import org.ibex.graphics.*;
+import org.ibex.graphics.*;
 
 public class MergeSort {
 
@@ -282,7 +282,6 @@ public class MergeSort {
         BitVector[] bvs = new BitVector[vals_length];
 
         long index = 0;
-        /*
         Picture p = new Picture(new FileInputStream("campus.png"));
         for(int y=0; y<(478/2); y++)
             for(int x=0; x<544; x++) {
@@ -300,7 +299,7 @@ public class MergeSort {
                 bvs[(int)index] = new BitVector(fleet.getWordWidth()).set( r | (g<<6) | (b<<12) | (index<<18) );
                 index++;
             }
-        */
+
         for(; index<vals_length; index++) {
             long tag = index<<18;
             bvs[(int)index] = new BitVector(fleet.getWordWidth()).set( tag );