deweese 02/03/02 17:59:11
Modified: sources/org/apache/batik/ext/awt/image GraphicsUtil.java
sources/org/apache/batik/ext/awt/image/rendered
AbstractTiledRed.java
Log:
More cleanup
Revision Changes Path
1.25 +4 -8
xml-batik/sources/org/apache/batik/ext/awt/image/GraphicsUtil.java
Index: GraphicsUtil.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/GraphicsUtil.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- GraphicsUtil.java 2 Mar 2002 21:53:11 -0000 1.24
+++ GraphicsUtil.java 3 Mar 2002 01:59:11 -0000 1.25
@@ -66,7 +66,7 @@
* implementations.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thomas DeWeese</a>
- * @version $Id: GraphicsUtil.java,v 1.24 2002/03/02 21:53:11 deweese Exp $
+ * @version $Id: GraphicsUtil.java,v 1.25 2002/03/03 01:59:11 deweese Exp $
*/
public class GraphicsUtil {
@@ -287,16 +287,12 @@
SampleModel srcSM = cr.getSampleModel();
if ((srcSM.getWidth()*srcSM.getHeight()) >
- (4*clipR.width*clipR.height))
- // if srcSM tiles are 4x the clip size then just
- // draw the renderedImage
+ (clipR.width*clipR.height))
+ // if srcSM tiles are larger than the clip size
+ // then just draw the renderedImage
useDrawRenderedImage = true;
if (useDrawRenderedImage) {
- // We use this code path on MacOSX since the tile
- // drawing code below sometimes dies for no real
- // reason this seems to behave better.
-
// org.ImageDisplay.showImage("foo: ", cr);
// This can be significantly faster but can also
// require much more memory.
1.14 +2 -9
xml-batik/sources/org/apache/batik/ext/awt/image/rendered/AbstractTiledRed.java
Index: AbstractTiledRed.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/rendered/AbstractTiledRed.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AbstractTiledRed.java 26 Feb 2002 18:15:46 -0000 1.13
+++ AbstractTiledRed.java 3 Mar 2002 01:59:11 -0000 1.14
@@ -28,7 +28,7 @@
* the subclass implementation.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thomas DeWeese</a>
- * @version $Id: AbstractTiledRed.java,v 1.13 2002/02/26 18:15:46 deweese Exp $
+ * @version $Id: AbstractTiledRed.java,v 1.14 2002/03/03 01:59:11 deweese Exp $
*/
public abstract class AbstractTiledRed
extends AbstractRed
@@ -524,14 +524,7 @@
if (blocks == null)
return;
- if (GraphicsUtil.useMacOSXHacks)
- // Mac OS X doesn't properly handle child rasters that
- // only reference part of the parent. In particular it
- // appears to draw as if the childs X & Y were located at
- // the parents upper left corner.
- drawBlockAndCopy(blocks, wr);
- else
- drawBlockInPlace(blocks, wr);
+ drawBlockInPlace(blocks, wr);
}
protected void drawBlockAndCopy(TileBlock []blocks, WritableRaster wr) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
