Reverted changes in rev 797899 (but xgc.jar updated rather than reverted)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@800133 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/fop/afp/AFPGraphics2D.java

@@ -548,7 +548,7 @@ public class AFPGraphics2D extends AbstractGraphics2D implements NativeImageHand
         ImageSize size = new ImageSize(img.getWidth(), img.getHeight(), 72);
         imageInfo.setSize(size);
 
-        ImageRendered imageRendered = new ImageRendered(imageInfo, img, null, null);
+        ImageRendered imageRendered = new ImageRendered(imageInfo, img, null);
         RenderedImage renderedImage = imageRendered.getRenderedImage();
 
         // create image object info

src/java/org/apache/fop/svg/PDFGraphics2D.java

@@ -1259,7 +1259,7 @@ public class PDFGraphics2D extends AbstractGraphics2D implements NativeImageHand
         ImageInfo info = new ImageInfo(null, "image/unknown");
         ImageSize size = new ImageSize(img.getWidth(), img.getHeight(), 72);
         info.setSize(size);
-        ImageRendered imgRend = new ImageRendered(info, img, null, null);
+        ImageRendered imgRend = new ImageRendered(info, img, null);
         ImageRenderedAdapter adapter = new ImageRenderedAdapter(imgRend, key);
         PDFXObject xObject = pdfDoc.addImage(resourceContext, adapter);
         flushPDFDocument();