[FOray-commit] SF.net SVN: foray:[13588] trunk/foray

[<vic...@us...>]

Revision: 13588
          http://sourceforge.net/p/foray/code/13588
Author:   victormote
Date:     2025-05-03 20:30:51 +0000 (Sat, 03 May 2025)
Log Message:
-----------
Conform to aXSL change: Include "get" in some getter methods, for clarity.

Modified Paths:
--------------
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/BmpGraphic.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic4a.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GifGraphic.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/Graphic4a.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/JpegGraphic.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/MathGraphic4a.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/PdfGraphic.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/PngGraphic.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/SvgGraphic.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/TempImage.java
    trunk/foray/foray-graphic/src/main/java/org/foray/graphic/TiffGraphic.java
    trunk/foray/foray-graphic/src/test/java/org/foray/graphic/BmpGraphicTests.java
    trunk/foray/foray-graphic/src/test/java/org/foray/graphic/GifGraphicTests.java
    trunk/foray/foray-graphic/src/test/java/org/foray/graphic/JpegGraphicTests.java
    trunk/foray/foray-graphic/src/test/java/org/foray/graphic/PngGraphicTests.java
    trunk/foray/foray-graphic/src/test/java/org/foray/graphic/SvgGraphicTests.java
    trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TiffGraphicTests.java
    trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfImageXobject.java
    trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfXformMath.java
    trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfXformSvg.java
    trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfXobject4a.java
    trunk/foray/foray-render/src/main/java/org/foray/render/Renderer4a.java
    trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
    trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/BmpGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/BmpGraphic.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/BmpGraphic.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -474,13 +474,13 @@
     }
 
     @Override
-    public int pixelWidth() throws GraphicException {
+    public int getPixelWidth() throws GraphicException {
         this.parseBasicsWrapper();
         return this.pixelWidth;
     }
 
     @Override
-    public int pixelHeight() throws GraphicException {
+    public int getPixelHeight() throws GraphicException {
         this.parseBasicsWrapper();
         return this.pixelHeight;
     }

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic4a.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic4a.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic4a.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -349,13 +349,13 @@
     }
 
     @Override
-    public int pixelWidth() throws GraphicException {
+    public int getPixelWidth() throws GraphicException {
         this.parseBasicsWrapper();
         return this.pixelWidth;
     }
 
     @Override
-    public int pixelHeight() throws GraphicException {
+    public int getPixelHeight() throws GraphicException {
         this.parseBasicsWrapper();
         return this.pixelHeight;
     }

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GifGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GifGraphic.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/GifGraphic.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -293,13 +293,13 @@
     }
 
     @Override
-    public int pixelWidth() throws GraphicException {
+    public int getPixelWidth() throws GraphicException {
         this.parseBasicsWrapper();
         return this.pixelWidth;
     }
 
     @Override
-    public int pixelHeight() throws GraphicException {
+    public int getPixelHeight() throws GraphicException {
         this.parseBasicsWrapper();
         return this.pixelHeight;
     }

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/Graphic4a.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/Graphic4a.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/Graphic4a.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -248,7 +248,7 @@
     }
 
     @Override
-    public final int absoluteWidth(final int pixelsPerInch) throws GraphicException {
+    public final int getAbsoluteWidth(final int pixelsPerInch) throws GraphicException {
         final int absoluteWidth = absoluteWidthReal();
         if (absoluteWidth > 0) {
             // The graphic knows its absolute width.
@@ -258,7 +258,7 @@
             // The user does not want the fallback computation.
             return -1;
         }
-        final int pixelWidth = pixelWidth();
+        final int pixelWidth = getPixelWidth();
         if (pixelWidth < 1) {
             // pixel Width is not valid
             return -1;
@@ -279,7 +279,7 @@
     public abstract int absoluteWidthReal() throws GraphicException;
 
     @Override
-    public final int absoluteHeight(final int pixelsPerInch) throws GraphicException {
+    public final int getAbsoluteHeight(final int pixelsPerInch) throws GraphicException {
         final int absoluteHeight = absoluteHeightReal();
         if (absoluteHeight > 0) {
             // The graphic knows its absolute height.
@@ -289,7 +289,7 @@
             // The user does not want the fallback computation.
             return -1;
         }
-        final int pixelHeight = pixelHeight();
+        final int pixelHeight = getPixelHeight();
         if (pixelHeight < 1) {
             // pixel Height is not valid
             return -1;

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/JpegGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/JpegGraphic.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/JpegGraphic.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -466,7 +466,7 @@
      * to get its dimensions.
      */
     @Override
-    public int pixelWidth() throws GraphicException {
+    public int getPixelWidth() throws GraphicException {
         this.loadImageWrapper();
         return this.pixelWidth;
     }
@@ -477,7 +477,7 @@
      * to get its dimensions.
      */
     @Override
-    public int pixelHeight() throws GraphicException {
+    public int getPixelHeight() throws GraphicException {
         this.loadImageWrapper();
         return this.pixelHeight;
     }

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/MathGraphic4a.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/MathGraphic4a.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/MathGraphic4a.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -169,15 +169,15 @@
     }
 
     @Override
-    public int pixelWidth() throws GraphicException {
+    public int getPixelWidth() throws GraphicException {
         this.parseBasicsWrapper();
-        return this.svgGraphic.pixelWidth();
+        return this.svgGraphic.getPixelWidth();
     }
 
     @Override
-    public int pixelHeight() throws GraphicException {
+    public int getPixelHeight() throws GraphicException {
         this.parseBasicsWrapper();
-        return this.svgGraphic.pixelHeight();
+        return this.svgGraphic.getPixelHeight();
     }
 
     /**

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/PdfGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/PdfGraphic.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/PdfGraphic.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -148,13 +148,13 @@
     }
 
     @Override
-    public int pixelWidth() throws GraphicException {
+    public int getPixelWidth() throws GraphicException {
         this.parseBasicsWrapper();
         return -1;
     }
 
     @Override
-    public int pixelHeight() throws GraphicException {
+    public int getPixelHeight() throws GraphicException {
         this.parseBasicsWrapper();
         return -1;
     }

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/PngGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/PngGraphic.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/PngGraphic.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -226,7 +226,7 @@
         // Get our current ColorModel
         final ColorModel cm = this.cr.getColorModel();
 
-        final int qtyPixels = this.pixelWidth() * this.pixelHeight();
+        final int qtyPixels = getPixelWidth() * getPixelHeight();
         // It has an alpha channel so generate a soft mask.
         if (! this.isTransparent
                 && cm.hasAlpha()) {
@@ -345,13 +345,13 @@
     }
 
     @Override
-    public int pixelWidth() throws GraphicException {
+    public int getPixelWidth() throws GraphicException {
         this.parseBasicsWrapper();
         return this.pixelWidth;
     }
 
     @Override
-    public int pixelHeight() throws GraphicException {
+    public int getPixelHeight() throws GraphicException {
         this.parseBasicsWrapper();
         return this.pixelHeight;
     }

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/SvgGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/SvgGraphic.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/SvgGraphic.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -233,13 +233,13 @@
     }
 
     @Override
-    public int pixelWidth() throws GraphicException {
+    public int getPixelWidth() throws GraphicException {
         this.parseBasicsWrapper();
         return this.pixelWidth;
     }
 
     @Override
-    public int pixelHeight() throws GraphicException {
+    public int getPixelHeight() throws GraphicException {
         this.parseBasicsWrapper();
         return this.pixelHeight;
     }

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/TempImage.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/TempImage.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/TempImage.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -94,12 +94,12 @@
     }
 
     @Override
-    public int pixelWidth() throws GraphicException {
+    public int getPixelWidth() throws GraphicException {
         return this.width;
     }
 
     @Override
-    public int pixelHeight() throws GraphicException {
+    public int getPixelHeight() throws GraphicException {
         return this.height;
     }
 
@@ -159,12 +159,12 @@
     }
 
     @Override
-    public int absoluteWidth(final int pixelsPerInch) throws GraphicException {
+    public int getAbsoluteWidth(final int pixelsPerInch) throws GraphicException {
         return -1;
     }
 
     @Override
-    public int absoluteHeight(final int pixelsPerInch) throws GraphicException {
+    public int getAbsoluteHeight(final int pixelsPerInch) throws GraphicException {
         return -1;
     }
 

Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/TiffGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/TiffGraphic.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/TiffGraphic.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -350,7 +350,7 @@
 
     @Override
     public int absoluteWidthReal() throws GraphicException {
-        return Math.round(this.pixelWidth()
+        return Math.round(getPixelWidth()
                 / this.xResolution
                 * TypographicConstants.POINTS_PER_INCH
                 * TypographicConstants.MILLIPOINTS_PER_POINT);
@@ -358,7 +358,7 @@
 
     @Override
     public int absoluteHeightReal() throws GraphicException {
-        return Math.round(this.pixelHeight()
+        return Math.round(getPixelHeight()
                 / this.yResolution
                 * TypographicConstants.POINTS_PER_INCH
                 * TypographicConstants.MILLIPOINTS_PER_POINT);
@@ -386,13 +386,13 @@
     }
 
     @Override
-    public int pixelWidth() throws GraphicException {
+    public int getPixelWidth() throws GraphicException {
         this.parseBasicsWrapper();
         return this.pixelWidth;
     }
 
     @Override
-    public int pixelHeight() throws GraphicException {
+    public int getPixelHeight() throws GraphicException {
         this.parseBasicsWrapper();
         return this.pixelHeight;
     }

Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/BmpGraphicTests.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/BmpGraphicTests.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/BmpGraphicTests.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -62,8 +62,8 @@
         final Graphic4a bmp = this.getServer().procureGraphic(graphicUri.toURL(), false);
         assertNotNull(bmp);
         assertTrue(bmp instanceof BmpGraphic);
-        assertEquals(70, bmp.pixelWidth());
-        assertEquals(62, bmp.pixelHeight());
+        assertEquals(70, bmp.getPixelWidth());
+        assertEquals(62, bmp.getPixelHeight());
         assertEquals(8, bmp.getBitsPerComponent());
         assertTrue(bmp.getColorSpace().getType() == ColorSpace.TYPE_RGB);
         assertEquals(3, bmp.getColorSpace().getNumComponents());

Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/GifGraphicTests.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/GifGraphicTests.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/GifGraphicTests.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -61,8 +61,8 @@
         final Graphic4a gif = this.getServer().procureGraphic(graphicUri.toURL(), false);
         assertNotNull(gif);
         assertTrue(gif instanceof GifGraphic);
-        assertEquals(221, gif.pixelWidth());
-        assertEquals(96, gif.pixelHeight());
+        assertEquals(221, gif.getPixelWidth());
+        assertEquals(96, gif.getPixelHeight());
         assertEquals(8, gif.getBitsPerComponent());
         assertTrue(gif.getColorSpace().getType() == ColorSpace.TYPE_RGB);
 
@@ -92,8 +92,8 @@
         final Graphic4a gif = this.getServer().procureGraphic(graphicUri.toURL(), false);
         assertNotNull(gif);
         assertTrue(gif instanceof GifGraphic);
-        assertEquals(221, gif.pixelWidth());
-        assertEquals(96, gif.pixelHeight());
+        assertEquals(221, gif.getPixelWidth());
+        assertEquals(96, gif.getPixelHeight());
         assertEquals(8, gif.getBitsPerComponent());
         assertTrue(gif.getColorSpace().getType() == ColorSpace.TYPE_RGB);
         assertTrue(gif.isTransparent());

Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/JpegGraphicTests.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/JpegGraphicTests.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/JpegGraphicTests.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -62,8 +62,8 @@
         final Graphic4a jpeg = this.getServer().procureGraphic(graphicUri.toURL(), false);
         assertNotNull(jpeg);
         assertTrue(jpeg instanceof JpegGraphic);
-        assertEquals(216, jpeg.pixelWidth());
-        assertEquals(144, jpeg.pixelHeight());
+        assertEquals(216, jpeg.getPixelWidth());
+        assertEquals(144, jpeg.getPixelHeight());
         assertEquals(8, jpeg.getBitsPerComponent());
         assertTrue(jpeg.getColorSpace().getType() == ColorSpace.TYPE_RGB);
         assertFalse(jpeg.isTransparent());

Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/PngGraphicTests.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/PngGraphicTests.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/PngGraphicTests.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -62,8 +62,8 @@
         final Graphic4a png = this.getServer().procureGraphic(graphicUri.toURL(), false);
         assertNotNull(png);
         assertTrue(png instanceof PngGraphic);
-        assertEquals(216, png.pixelWidth());
-        assertEquals(144, png.pixelHeight());
+        assertEquals(216, png.getPixelWidth());
+        assertEquals(144, png.getPixelHeight());
         assertEquals(8, png.getBitsPerComponent());
         assertTrue(png.getColorSpace().getType() == ColorSpace.TYPE_RGB);
         assertFalse(png.isTransparent());

Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/SvgGraphicTests.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/SvgGraphicTests.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/SvgGraphicTests.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -77,8 +77,8 @@
         assertNotNull(graphic);
         assertTrue(graphic instanceof SvgGraphic);
         final SvgGraphic svg = (SvgGraphic) graphic;
-        assertEquals(200, svg.pixelWidth());
-        assertEquals(50, svg.pixelHeight());
+        assertEquals(200, svg.getPixelWidth());
+        assertEquals(50, svg.getPixelHeight());
         final SVGDocument svgDoc = svg.getSvgDocument();
         assertNotNull(svgDoc);
 

Modified: trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TiffGraphicTests.java
===================================================================
--- trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TiffGraphicTests.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-graphic/src/test/java/org/foray/graphic/TiffGraphicTests.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -62,8 +62,8 @@
         final Graphic4a tiff = this.getServer().procureGraphic(graphicUri.toURL(), false);
         assertNotNull(tiff);
         assertTrue(tiff instanceof TiffGraphic);
-        assertEquals(700, tiff.pixelWidth());
-        assertEquals(81, tiff.pixelHeight());
+        assertEquals(700, tiff.getPixelWidth());
+        assertEquals(81, tiff.getPixelHeight());
         assertEquals(1, tiff.getBitsPerComponent());
         assertTrue(tiff.getColorSpace().getType() == ColorSpace.TYPE_GRAY);
         assertFalse(tiff.isTransparent());

Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfImageXobject.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfImageXobject.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfImageXobject.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -117,8 +117,8 @@
         ColorSpace cs = null;
         boolean isTransparent = false;
         Color transp = null;
-        pixelWidth = getGraphic().pixelWidth();
-        pixelHeight = getGraphic().pixelHeight();
+        pixelWidth = getGraphic().getPixelWidth();
+        pixelHeight = getGraphic().getPixelHeight();
         bitsPerPixel = getGraphic().getBitsPerComponent();
         cs = getGraphic().getColorSpace();
         isTransparent = getGraphic().isTransparent();

Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfXformMath.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfXformMath.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfXformMath.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -112,8 +112,8 @@
         final float[] box = new float[BoundingBox.QTY_ENTRIES];
         box[BoundingBox.LOWER_LEFT_X_INDEX] = 0;
         box[BoundingBox.LOWER_LEFT_Y_INDEX] = 0;
-        box[BoundingBox.UPPER_RIGHT_X_INDEX] = this.getGraphic().pixelWidth();
-        box[BoundingBox.UPPER_RIGHT_Y_INDEX] = this.getGraphic().pixelHeight();
+        box[BoundingBox.UPPER_RIGHT_X_INDEX] = this.getGraphic().getPixelWidth();
+        box[BoundingBox.UPPER_RIGHT_Y_INDEX] = this.getGraphic().getPixelHeight();
         return BoundingBoxUtils.makeBoundingBox(box);
     }
 
@@ -133,7 +133,7 @@
          * top of the image when it is actually at the bottom. Therefore, we
          * need a translate to move it up the page by the height of the
          * graphic. */
-        transform.translate(0, this.getGraphic().pixelHeight() * -1);
+        transform.translate(0, this.getGraphic().getPixelHeight() * -1);
 
         return transform;
     }

Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfXformSvg.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfXformSvg.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfXformSvg.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -112,8 +112,8 @@
         final float[] box = new float[BoundingBox.QTY_ENTRIES];
         box[BoundingBox.LOWER_LEFT_X_INDEX] = 0;
         box[BoundingBox.LOWER_LEFT_Y_INDEX] = 0;
-        box[BoundingBox.UPPER_RIGHT_X_INDEX] = this.getGraphic().pixelWidth();
-        box[BoundingBox.UPPER_RIGHT_Y_INDEX] = this.getGraphic().pixelHeight();
+        box[BoundingBox.UPPER_RIGHT_X_INDEX] = this.getGraphic().getPixelWidth();
+        box[BoundingBox.UPPER_RIGHT_Y_INDEX] = this.getGraphic().getPixelHeight();
         return BoundingBoxUtils.makeBoundingBox(box);
     }
 
@@ -133,7 +133,7 @@
          * top of the image when it is actually at the bottom. Therefore, we
          * need a translate to move it up the page by the height of the
          * graphic. */
-        transform.translate(0, this.getGraphic().pixelHeight() * -1);
+        transform.translate(0, this.getGraphic().getPixelHeight() * -1);
 
         return transform;
     }

Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfXobject4a.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfXobject4a.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/graphics/PdfXobject4a.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -183,7 +183,7 @@
             case CCITT_GROUP_4:
                 filter = psServer.createEncodeFilter(PsFilterType.CCITT_FAX, outputStream);
                 filter.setInactive();
-                filter.setDecodeParms("<< /K -1 /Columns " + graphic.pixelWidth() + " >>");
+                filter.setDecodeParms("<< /K -1 /Columns " + graphic.getPixelWidth() + " >>");
                 return filter;
             case JPEG:
                 filter = psServer.createEncodeFilter(PsFilterType.DCT, outputStream);

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/Renderer4a.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/Renderer4a.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/Renderer4a.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -177,8 +177,8 @@
         final int imgW;
         final int imgH;
         try {
-            imgW = backgroundImage.absoluteWidth(getPixelsPerInch());
-            imgH = backgroundImage.absoluteHeight(getPixelsPerInch());
+            imgW = backgroundImage.getAbsoluteWidth(getPixelsPerInch());
+            imgH = backgroundImage.getAbsoluteHeight(getPixelsPerInch());
         } catch (final GraphicException fie) {
             logError("Error obtaining bg image width and height");
             logError(fie.getMessage());

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -393,8 +393,8 @@
         int ix = 0;
         int iy = 0;
         int indx = 0;
-        final int iw = img.pixelWidth();
-        final int ih = img.pixelHeight();
+        final int iw = img.getPixelWidth();
+        final int ih = img.getPixelHeight();
         int bytewidth = iw / PrimitiveConstants.BITS_PER_BYTE;
         if ((iw % PrimitiveConstants.BITS_PER_BYTE) != 0) {
             bytewidth++;

Modified: trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2025-05-03 19:00:29 UTC (rev 13587)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java	2025-05-03 20:30:51 UTC (rev 13588)
@@ -512,8 +512,8 @@
         float w = 0;
         float h = 0;
         try {
-            w = svgGraphic.pixelWidth();
-            h = svgGraphic.pixelHeight();
+            w = svgGraphic.getPixelWidth();
+            h = svgGraphic.getPixelHeight();
         } catch (final GraphicException e) {
             logError("Error getting graphic dimensions in "
                     + this.getClass().getName());
@@ -619,8 +619,8 @@
             write("clippath");
 
             try {
-                final int w = image.pixelWidth() * 1000;
-                final int h = image.pixelHeight() * 1000;
+                final int w = image.getPixelWidth() * 1000;
+                final int h = image.getPixelHeight() * 1000;
                 final Rectangle rect = new Rectangle(x, y, w, h);
                 drawGraphic(area, image, rect, null);
             } catch (final GraphicException e) {
@@ -767,8 +767,8 @@
             }
             write("<<");
             write("  /ImageType 1");
-            write("  /Width " + img.pixelWidth());
-            write("  /Height " + img.pixelHeight());
+            write("  /Width " + img.getPixelWidth());
+            write("  /Height " + img.getPixelHeight());
             write("  /BitsPerComponent 8");
             if (img.getColorSpace().getType() == ColorSpace.TYPE_CMYK) {
                 if (img.isInverted()) {
@@ -782,8 +782,8 @@
                 write("  /Decode [0 1]");
             }
             // Setup scanning for left-to-right and top-to-bottom
-            write("  /ImageMatrix [" + img.pixelWidth() + " 0 0 -"
-                  + img.pixelHeight() + " 0 " + img.pixelHeight() + "]");
+            write("  /ImageMatrix [" + img.getPixelWidth() + " 0 0 -"
+                  + img.getPixelHeight() + " 0 " + img.getPixelHeight() + "]");
 
             write("  /DataSource Data");
             write(">>");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.