Changeset 11648

Timestamp:

2006-04-12T09:33:14+12:00 (18 years ago)

Author:

shaoqun

Message:

add code to guard ArryOutofBound error in handlepixels method

File:

• trunk/gsdl/src/java/org/nzdl/gsdl/GsdlCollageApplet/DisplayImages.java (modified) (13 diffs)

trunk/gsdl/src/java/org/nzdl/gsdl/GsdlCollageApplet/DisplayImages.java

@@ -146 +146 @@
         next_frame_ =  new Thread(new Runnable(){
                 public void run() {
-            try {
-
-            Thread curr_thread = Thread.currentThread();
-        
-            while (curr_thread == next_frame_) {
-                next_frame();
-                
-                Thread.sleep(app_. refreshDelay_);
-                curr_thread = Thread.currentThread();
+          
+            Thread curr_thread = Thread.currentThread();
+            
+            while (curr_thread == next_frame_) {
+            try {       
+                 next_frame();
+                 Thread.sleep(app_. refreshDelay_);
+                 curr_thread = Thread.currentThread();
+            } catch (Exception e) {
+                break;
             }
-
-        
-            } catch (Exception e) {
-            e.printStackTrace();
             }
+                    
+           
         }
 
@@ -175 +174 @@
      *  @param y the y co-ordinate of the mouse
      *  @return the image that the user has clicked on or null if the user has clicked whitespace */
-   public synchronized CollageImage clickedOnImage(int x, int y)
+   public CollageImage clickedOnImage(int x, int y)
     {
     if (app_.verbosity() > 1)
@@ -182 +181 @@
     }
 
-    int no_images = inuse_.size() - 1;
+    
     // checks from last image down, as last images place will be at the top of the collage
-    for (int i= no_images; i >= 0; i--)
+    for (int i= inuse_.size() - 1; i >= 0; i--)
     {
         CollageImage collage_image = (CollageImage)inuse_.elementAt(i);
@@ -256 +255 @@
                  = restoreAlpha(collage_image.image_, 0, 0, 
                            collage_image.image_x_dim_, collage_image.image_y_dim_); 
-               
+              
             }
             
@@ -266 +265 @@
         {
               
- 
             // conducts fading and colouring of image
             Image img = handlepixels(collage_image.image_, 0, 0, collage_image.image_x_dim_, 
@@ -512 +510 @@
     public  Image handlepixels(Image img, int x, int y, int w, int h, int p, boolean fresh) {
     
+    
     // declare an array to hold the pixels
     int[] pixels = new int[w * h];
@@ -536 +535 @@
     else
         bound *= h;
+
     int upperboundheight = h - (int) bound;
     int upperboundwidth = w - (int) bound;
     int lowerbound = (int) bound;
 
-    // loop through every pixel in the picture and handle it
+        // loop through every pixel in the picture and handle it
     for (int j = lowerbound; j < upperboundheight; j++) {
         for (int i = lowerbound; i < upperboundwidth; i++) {
@@ -558 +558 @@
         fader = 0;
         
-        for (int m = 0; m < w; m++)
-        pixels[n * w + m] = handlesinglepixel(pixels[n * w + m], p, fresh, true, fader);
+        for (int m = 0; m < w; m++){
+        int index = n* w + m;
+        if (index <pixels.length){
+            pixels[index] = handlesinglepixel(pixels[index], p, fresh, true, fader);
+            
+        }
+        }
+        
+    
         
         fade+= FADEVALUE;
@@ -570 +577 @@
         if (fader < 0)
         fader = 0;
-        for (int m = 0; m < w; m++)
-        pixels[n * w + m] = handlesinglepixel(pixels[n * w + m], p, fresh, true, fader);
+        for (int m = 0; m < w; m++){
+        int index = n * w + m;
+        if (index <pixels.length){
+            pixels[index] = handlesinglepixel(pixels[index], p, fresh, true, fader);
+            
+        }
+        }
         
         fade += FADEVALUE;
@@ -585 +597 @@
         if ( m < lowerbound && n > m);
         else if ( m > upperboundheight && n > (h - m));
-        else 
-            pixels[m * w + n] = handlesinglepixel(pixels[m * w + n], p, fresh, true, fader);
+        else {
+            int index = m * w + n;
+                    if (index <pixels.length){
+            pixels[index] = handlesinglepixel(pixels[index], p, fresh, true, fader);
+    
+            }
+        }
+                   
         }
         fade += FADEVALUE;    
@@ -600 +618 @@
         if ( m < lowerbound && (w - n) > m);
         else if ( m > upperboundheight && (w - n) > (h - m));
-        else 
-            pixels[m * w + n] = handlesinglepixel(pixels[m * w + n], p, fresh, true, fader);
+        else {
+            int index = m * w + n;
+                    if (index <pixels.length){
+            pixels[index] = handlesinglepixel(pixels[index], p, fresh, true, fader);
+    
+            }
+        }
+            
         }
         
@@ -694 +718 @@
     int corealpha = (pixels[(h/2) * w + (w/2)] >> 24) & 0xff;
     
-    if (corealpha < 2)
+    if (corealpha < 10)
         return true;
 
@@ -792 +816 @@
         
     } catch (Exception e) {
-        //e.printStackTrace();
+       e.printStackTrace();
            System.out.println("Display images thread is interrupted");
     }