Skip to content

MapFish Print V2 update for JAI to ImageN rename of classes and constants #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jodygarnett merged 1 commit into from
Oct 5, 2025
Merged

MapFish Print V2 update for JAI to ImageN rename of classes and constants #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<log4j-version>2.24.3</log4j-version>
<spring-version>5.3.39</spring-version>
<gt-version>34-SNAPSHOT</gt-version>
<imagen.version>0.4.0</imagen.version>
<imagen.version>0.9.0-SNAPSHOT</imagen.version>
<pdfbox-version>2.0.34</pdfbox-version>
<metrics-version>4.2.30</metrics-version>
<jackson2.version>2.18.2</jackson2.version>
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/mapfish/print/output/FileCachingJaiMosaicOutputFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
*/
Expand Down Expand Up @@ -115,7 +115,7 @@ private void drawImage(OutputStream out, List<ImageInfo> 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);
Expand All @@ -126,7 +126,7 @@ private void drawImage(OutputStream out, List<ImageInfo> 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);
}

Expand All @@ -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<ImageInfo> createImages(PJsonObject jsonSpec, File tmpFile, RenderingContext context) throws IOException {
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/mapfish/print/output/InMemoryJaiMosaicOutputFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -136,18 +136,18 @@ private void drawImage(OutputStream out, List<? extends RenderedImage> 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);

height += source.getHeight() + MARGIN;
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);
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/apps/ListJAIOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions src/test/java/apps/MosiacImages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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"));
}
Expand Down
Loading