Revision 1738

View differences:

org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.fmap/src/main/java/org/gvsig/raster/fmap/layers/DefaultFLyrRaster.java
197 197
		}
198 198
		
199 199
		public void cancelRequest() {
200
			this.c.setCanceled(true);
200
			if(c != null)
201
				this.c.setCanceled(true);
201 202
		}
202 203
	}
203 204

  
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/grid/filter/DefaultRasterFilterList.java
446 446
			filter.addParam("raster", rasterBuf);
447 447
			filter.execute();
448 448

  
449
			if (filter.getResult("raster") != null)
449
			if (filter.getResult("raster") != null) {
450
				if(i > 0) //El primero no se libera ya que es el buffer inicial y puede estar usandose fuera de la pila de filtros
451
					this.rasterBuf.dispose();
450 452
				this.rasterBuf = (Buffer) filter.getResult("raster");
453
			}
451 454

  
452 455
			//Si el filtro genera una banda alpha se mezcla con la que han generado otros
453 456
			if (filter.getResult("alphaBand") != null)
......
488 491

  
489 492
	public int getPercent() {
490 493
		int percent = 0;
491
		if (list.size() == 0)
494
		if (list == null || list.size() == 0)
492 495
			return 0;
493 496
		for (int i = 0; i < list.size(); i++)
494 497
			percent += ((BaseRasterFilter) list.get(i)).getPercent();

Also available in: Unified diff