[Geotools-commits] CVS: geotools/src/uk/ac/leeds/ccg/raster ImageLayer.java,1.32,1.33

Update of /cvsroot/geotools/geotools/src/uk/ac/leeds/ccg/raster
In directory usw-pr-cvs1:/tmp/cvs-serv11930/uk/ac/leeds/ccg/raster

Modified Files:
	ImageLayer.java 
Log Message:
improved painting of cliped images.


Index: ImageLayer.java
===================================================================
RCS file: /cvsroot/geotools/geotools/src/uk/ac/leeds/ccg/raster/ImageLayer.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -w -C2 -d -r1.32 -r1.33
*** ImageLayer.java	2001/12/11 10:35:00	1.32
--- ImageLayer.java	2001/12/11 11:35:01	1.33
***************
*** 32,36 ****
    private GeoRectangle bbox = null;
    private int myID = 1;
!   private final static boolean DEBUG=true;
    private Canvas obs = new Canvas();
    private MediaTracker tracker=new MediaTracker(obs);
--- 32,36 ----
    private GeoRectangle bbox = null;
    private int myID = 1;
!   private final static boolean DEBUG=false;
    private Canvas obs = new Canvas();
    private MediaTracker tracker=new MediaTracker(obs);
***************
*** 40,43 ****
--- 40,45 ----
    private Thread thread;
    private MemoryImageSource source;
+ 	private int [] imdata;
+ 	private int imwidth;
  
    public ImageLayer(URL source,GeoRectangle bounds){
***************
*** 221,225 ****
          }
          int[] data = new int[(height*width)];
!         PixelGrabber pg = new PixelGrabber(
                                             this.image,
                                             x,
--- 223,236 ----
          }
          int[] data = new int[(height*width)];
! 				if(DEBUG)System.out.println("copy "+x+" "+y);
! 				if(DEBUG)System.out.println("copy "+imdata.length+" "+data.length);
! 				if(DEBUG)System.out.println("copy "+(y*imwidth+x)+" "+((y+height)*imwidth+x));
! 				if(((y+height)*imwidth+x)>imdata.length)height--;
! 				for(int i=0;i<height;i++){
! 
! 				//if(DEBUG)System.out.println(""+((y+i)*imwidth+x)+","+(i*width)+","+(width));
! 					System.arraycopy(imdata,(y+i)*imwidth+x,data,i*width,width);
! 				}
!         /*PixelGrabber pg = new PixelGrabber(
                                             this.image,
                                             x,
***************
*** 241,244 ****
--- 252,256 ----
            return ;
          }
+ 				*/
          source = new MemoryImageSource(width,height,data,0,width);
          Image image2 = obs.createImage(source);
***************
*** 349,353 ****
  				int height = image.getHeight(obs);
  				int width = image.getWidth(obs);
!         int[] data = new int[(height*width)];
          PixelGrabber pg = new PixelGrabber(
                                             this.image,
--- 361,366 ----
  				int height = image.getHeight(obs);
  				int width = image.getWidth(obs);
! 				imwidth=width;
!         imdata = new int[(height*width)];
          PixelGrabber pg = new PixelGrabber(
                                             this.image,
***************
*** 356,360 ****
                                             width,
                                             height,
!                                            data,
                                             0,
                                             width);
--- 369,373 ----
                                             width,
                                             height,
!                                            imdata,
                                             0,
                                             width);
***************
*** 370,374 ****
            return ;
          }
!         source = new MemoryImageSource(width,height,data,0,width);
          image = obs.createImage(source);
          if(DEBUG)System.out.println("IL ("+this+")-->Image Ready ");
--- 383,387 ----
            return ;
          }
!         source = new MemoryImageSource(width,height,imdata,0,width);
          image = obs.createImage(source);
          if(DEBUG)System.out.println("IL ("+this+")-->Image Ready ");
***************
*** 398,401 ****
--- 411,417 ----
   *
   * $Log$
+  * Revision 1.33  2001/12/11 11:35:01  ianturton
+  * improved painting of cliped images.
+  *
   * Revision 1.32  2001/12/11 10:35:00  ianturton
   * readded support of png/tiff images