diff --git a/pom.xml b/pom.xml index 23d5b64..50d6f5c 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 2.24.3 5.3.39 34-SNAPSHOT - 0.4.0 + 0.9.0-SNAPSHOT 2.0.34 4.2.30 2.18.2 diff --git a/src/main/java/org/mapfish/print/output/FileCachingJaiMosaicOutputFactory.java b/src/main/java/org/mapfish/print/output/FileCachingJaiMosaicOutputFactory.java index d506b7a..61be689 100644 --- a/src/main/java/org/mapfish/print/output/FileCachingJaiMosaicOutputFactory.java +++ b/src/main/java/org/mapfish/print/output/FileCachingJaiMosaicOutputFactory.java @@ -26,7 +26,7 @@ import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.rendering.ImageType; import org.apache.pdfbox.rendering.PDFRenderer; -import org.eclipse.imagen.JAI; +import org.eclipse.imagen.ImageN; import org.eclipse.imagen.RenderedOp; import org.eclipse.imagen.media.codec.FileSeekableStream; import org.mapfish.print.RenderingContext; @@ -45,7 +45,7 @@ /** * Similar to {@link InMemoryJaiMosaicOutputFactory} in that it uses pdf box to parse pdf. However it writes - * each page to disk as an image before combining them using JAI mosaic. + * each page to disk as an image before combining them using ImageN mosaic. * * @author jeichar */ @@ -115,7 +115,7 @@ private void drawImage(OutputStream out, List images) throws IOExcept pb.add(new FileSeekableStream(imageinfo.imageFile)); pb.add(null); pb.add(null); - RenderedOp source = JAI.create("TIFF", pb); + RenderedOp source = ImageN.create("TIFF", pb); i++; LOGGER.debug("Adding page image " + i + " bounds: [" + 0 + "," + height + " " + source.getWidth() + "," + (height + source.getHeight()) + "]"); RenderedOp translated = translateImage(height, source); @@ -126,7 +126,7 @@ private void drawImage(OutputStream out, List images) throws IOExcept if (width < imageinfo.width) width = imageinfo.width; } - RenderedOp mosaic = JAI.create("mosaic", pbMosaic); + RenderedOp mosaic = ImageN.create("mosaic", pbMosaic); ImageIO.write(mosaic, format, out); } @@ -135,7 +135,7 @@ private RenderedOp translateImage(float height, RenderedImage source) { pbTranslate.addSource(source); pbTranslate.add(0f); pbTranslate.add(height); - return JAI.create("translate", pbTranslate); + return ImageN.create("translate", pbTranslate); } private List createImages(PJsonObject jsonSpec, File tmpFile, RenderingContext context) throws IOException { diff --git a/src/main/java/org/mapfish/print/output/InMemoryJaiMosaicOutputFactory.java b/src/main/java/org/mapfish/print/output/InMemoryJaiMosaicOutputFactory.java index c1d0bca..26eb628 100644 --- a/src/main/java/org/mapfish/print/output/InMemoryJaiMosaicOutputFactory.java +++ b/src/main/java/org/mapfish/print/output/InMemoryJaiMosaicOutputFactory.java @@ -26,7 +26,7 @@ import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.rendering.ImageType; import org.apache.pdfbox.rendering.PDFRenderer; -import org.eclipse.imagen.JAI; +import org.eclipse.imagen.ImageN; import org.eclipse.imagen.RenderedOp; import org.eclipse.imagen.TileCache; import org.eclipse.imagen.media.mosaic.MosaicDescriptor; @@ -49,7 +49,7 @@ /** * An output factory that uses pdf box to parse the pdf and create a collection of BufferedImages. * - * Then using JAI Mosaic operation the buffered images are combined into one RenderableImage (virtual image) + * Then using ImageN Mosaic operation the buffered images are combined into one RenderableImage (virtual image) * and that is written to a file using ImageIO * * User: jeichar @@ -136,7 +136,7 @@ private void drawImage(OutputStream out, List images) t pbTranslate.addSource(source); pbTranslate.add(0f); pbTranslate.add(height); - RenderedOp translated = JAI.create("translate", pbTranslate); + RenderedOp translated = ImageN.create("translate", pbTranslate); pbMosaic.addSource(translated); @@ -144,10 +144,10 @@ private void drawImage(OutputStream out, List images) t if (width < source.getWidth()) width = source.getWidth(); } - TileCache cache = JAI.createTileCache((long) (height * width * 400)); - RenderingHints hints = new RenderingHints(JAI.KEY_TILE_CACHE, cache); + TileCache cache = ImageN.createTileCache((long) (height * width * 400)); + RenderingHints hints = new RenderingHints(ImageN.KEY_TILE_CACHE, cache); - RenderedOp mosaic = JAI.create("mosaic", pbMosaic, hints); + RenderedOp mosaic = ImageN.create("mosaic", pbMosaic, hints); ImageIO.write(mosaic, format, out); } diff --git a/src/test/java/apps/ListJAIOperations.java b/src/test/java/apps/ListJAIOperations.java index 9340516..dafa87d 100644 --- a/src/test/java/apps/ListJAIOperations.java +++ b/src/test/java/apps/ListJAIOperations.java @@ -20,13 +20,13 @@ package apps; -import org.eclipse.imagen.JAI; +import org.eclipse.imagen.ImageN; import org.eclipse.imagen.OperationRegistry; import org.eclipse.imagen.RegistryMode; public class ListJAIOperations { public ListJAIOperations() { - or = JAI.getDefaultInstance().getOperationRegistry(); + or = ImageN.getDefaultInstance().getOperationRegistry(); String[] modeNames = RegistryMode.getModeNames(); String[] descriptorNames; diff --git a/src/test/java/apps/MosiacImages.java b/src/test/java/apps/MosiacImages.java index 87775e8..21e200e 100644 --- a/src/test/java/apps/MosiacImages.java +++ b/src/test/java/apps/MosiacImages.java @@ -27,7 +27,7 @@ import javax.imageio.ImageIO; import org.eclipse.imagen.ImageLayout; -import org.eclipse.imagen.JAI; +import org.eclipse.imagen.ImageN; import org.eclipse.imagen.PlanarImage; import org.eclipse.imagen.RenderedOp; @@ -55,19 +55,19 @@ public boolean accept(File dir, String name) { float height = 0; for (File imageFile : imageFiles) { - PlanarImage source = JAI.create("fileload", imageFile.getPath()); + PlanarImage source = ImageN.create("fileload", imageFile.getPath()); ParameterBlock pbTranslate=new ParameterBlock(); pbTranslate.addSource(source); pbTranslate.add(0f); pbTranslate.add(height); - RenderedOp translated = JAI.create("translate", pbTranslate, new RenderingHints(JAI.KEY_IMAGE_LAYOUT,layout)); + RenderedOp translated = ImageN.create("translate", pbTranslate, new RenderingHints(ImageN.KEY_IMAGE_LAYOUT,layout)); pbMosaic.addSource(translated); height += source.getHeight() + MARGIN; } - RenderedOp mosaic = JAI.create("mosaic", pbMosaic, new RenderingHints(JAI.KEY_IMAGE_LAYOUT,layout)); + RenderedOp mosaic = ImageN.create("mosaic", pbMosaic, new RenderingHints(ImageN.KEY_IMAGE_LAYOUT,layout)); ImageIO.write(mosaic, "png",new File("/tmp/mosaic-img.png")); }