diff --git a/openpdf/src/main/java/com/lowagie/text/Image.java b/openpdf/src/main/java/com/lowagie/text/Image.java
index 2636c5aad..79f93cb8b 100644
--- a/openpdf/src/main/java/com/lowagie/text/Image.java
+++ b/openpdf/src/main/java/com/lowagie/text/Image.java
@@ -551,6 +551,21 @@ public static Image getInstance(String filename)
return getInstance(Utilities.toURL(filename));
}
+ /**
+ * Gets an instance of an Image from the classpath.
+ *
+ * @param filename a filename
+ * @return an object of type Gif
,Jpeg
or
+ * Png
+ * @throws BadElementException if error in creating {@link ImgWMF#ImgWMF(byte[]) ImgWMF}
+ * @throws IOException if image is not recognized
+ */
+ public static Image getInstanceFromClasspath(String filename)
+ throws BadElementException, IOException {
+ URL url = Image.class.getResource("/" + filename);
+ return getInstance(url);
+ }
+
/**
* gets an instance of an Image
*
diff --git a/openpdf/src/test/java/com/lowagie/text/ImageTest.java b/openpdf/src/test/java/com/lowagie/text/ImageTest.java
index 0139b3611..87c51a2ac 100644
--- a/openpdf/src/test/java/com/lowagie/text/ImageTest.java
+++ b/openpdf/src/test/java/com/lowagie/text/ImageTest.java
@@ -26,6 +26,13 @@ void shouldReturnImageWithUrlForPath() throws Exception {
assertNotNull(image.getUrl());
}
+ @Test
+ void shouldReturnImageWithUrlFromClasspath() throws Exception {
+ String fileName = "H.gif";
+ final Image image = Image.getInstanceFromClasspath(fileName);
+ assertNotNull(image.getUrl());
+ }
+
@Test
void shouldReturnImageWithoutUrl() throws IOException {
byte[] imageBytes = readFileBytes();
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Images.java b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Images.java
index 9c6176152..40f1cf104 100644
--- a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Images.java
+++ b/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/Images.java
@@ -49,25 +49,25 @@ public static void main(String[] args) {
// step 4:
document.add(new Paragraph("A picture of my dog: otsoe.jpg"));
- Image jpg = Image.getInstance("otsoe.jpg");
+ Image jpg = Image.getInstanceFromClasspath("otsoe.jpg");
document.add(jpg);
document.add(new Paragraph("getacro.gif"));
- Image gif = Image.getInstance("getacro.gif");
+ Image gif = Image.getInstanceFromClasspath("getacro.gif");
document.add(gif);
document.add(new Paragraph("pngnow.png"));
- Image png = Image.getInstance("pngnow.png");
+ Image png = Image.getInstanceFromClasspath("pngnow.png");
document.add(png);
document.add(new Paragraph("grayscaled.png"));
- Image grayscaledPng = Image.getInstance("grayscaled.png");
+ Image grayscaledPng = Image.getInstanceFromClasspath("grayscaled.png");
document.add(grayscaledPng);
document.add(new Paragraph("iText.bmp"));
- Image bmp = Image.getInstance("iText.bmp");
+ Image bmp = Image.getInstanceFromClasspath("iText.bmp");
document.add(bmp);
document.add(new Paragraph("iText.wmf"));
- Image wmf = Image.getInstance("iText.wmf");
+ Image wmf = Image.getInstanceFromClasspath("iText.wmf");
document.add(wmf);
document.add(new Paragraph("iText.tif"));
- Image tif = Image.getInstance("iText.tif");
+ Image tif = Image.getInstanceFromClasspath("iText.tif");
document.add(tif);
} catch (DocumentException | IOException de) {
System.err.println(de.getMessage());
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/getacro.gif b/pdf-toolbox/src/test/resources/getacro.gif
similarity index 100%
rename from pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/getacro.gif
rename to pdf-toolbox/src/test/resources/getacro.gif
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/grayscaled.png b/pdf-toolbox/src/test/resources/grayscaled.png
similarity index 100%
rename from pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/grayscaled.png
rename to pdf-toolbox/src/test/resources/grayscaled.png
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/iText.bmp b/pdf-toolbox/src/test/resources/iText.bmp
similarity index 100%
rename from pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/iText.bmp
rename to pdf-toolbox/src/test/resources/iText.bmp
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/iText.tif b/pdf-toolbox/src/test/resources/iText.tif
similarity index 100%
rename from pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/iText.tif
rename to pdf-toolbox/src/test/resources/iText.tif
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/iText.wmf b/pdf-toolbox/src/test/resources/iText.wmf
similarity index 100%
rename from pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/iText.wmf
rename to pdf-toolbox/src/test/resources/iText.wmf
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/otsoe.jpg b/pdf-toolbox/src/test/resources/otsoe.jpg
similarity index 100%
rename from pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/otsoe.jpg
rename to pdf-toolbox/src/test/resources/otsoe.jpg
diff --git a/pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/pngnow.png b/pdf-toolbox/src/test/resources/pngnow.png
similarity index 100%
rename from pdf-toolbox/src/test/java/com/lowagie/examples/objects/images/pngnow.png
rename to pdf-toolbox/src/test/resources/pngnow.png