You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2014/03/31 00:46:15 UTC
svn commit: r1583219 - in /pdfbox/trunk:
examples/src/main/java/org/apache/pdfbox/examples/fdf/
examples/src/main/java/org/apache/pdfbox/examples/lucene/
examples/src/main/java/org/apache/pdfbox/examples/pdmodel/
examples/src/main/java/org/apache/pdfbo...
Author: tilman
Date: Sun Mar 30 22:46:15 2014
New Revision: 1583219
URL: http://svn.apache.org/r1583219
Log:
PDFBOX-2002: replaced deprecated calls to document.decrypt() with calls to new security layer
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintBookmarks.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintDocumentMetaData.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/ExtractTextByArea.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextLocations.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java Sun Mar 30 22:46:15 2014
@@ -24,6 +24,7 @@ import org.apache.pdfbox.pdmodel.PDDocum
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
import org.apache.pdfbox.pdmodel.common.COSObjectable;
import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
import org.apache.pdfbox.pdmodel.interactive.form.PDField;
import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
@@ -125,7 +126,8 @@ public class PrintFields
{
try
{
- pdf.decrypt("");
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
+ pdf.openProtection(sdm);
}
catch (InvalidPasswordException e)
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java Sun Mar 30 22:46:15 2014
@@ -37,6 +37,7 @@ import org.apache.lucene.document.TextFi
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentInformation;
import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
import org.apache.pdfbox.util.PDFTextStripper;
/**
@@ -441,7 +442,8 @@ public class LucenePDFDocument
if (pdfDocument.isEncrypted())
{
// Just try using the default password and move on
- pdfDocument.decrypt("");
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
+ pdfDocument.openProtection(sdm);
}
}
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java Sun Mar 30 22:46:15 2014
@@ -30,6 +30,7 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
/**
* This is an example on how to extract all embedded files from a PDF document.
@@ -70,7 +71,8 @@ public class ExtractEmbeddedFiles
{
try
{
- document.decrypt("");
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
+ document.openProtection(sdm);
}
catch( InvalidPasswordException e )
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java Sun Mar 30 22:46:15 2014
@@ -31,6 +31,7 @@ import java.text.DateFormat;
import java.util.Calendar;
import java.util.Iterator;
import java.util.List;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
/**
* This is an example on how to extract metadata from a PDF document.
@@ -71,7 +72,8 @@ public class ExtractMetadata
{
try
{
- document.decrypt("");
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
+ document.openProtection(sdm);
}
catch( InvalidPasswordException e )
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java Sun Mar 30 22:46:15 2014
@@ -27,6 +27,7 @@ import org.apache.pdfbox.pdmodel.PDDocum
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDResources;
import org.apache.pdfbox.pdmodel.common.PDStream;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
import org.apache.pdfbox.pdmodel.font.PDCIDFontType2Font;
import org.apache.pdfbox.pdmodel.font.PDFont;
import org.apache.pdfbox.pdmodel.font.PDFontDescriptorDictionary;
@@ -127,7 +128,8 @@ public class ExtractTTFFonts
if (document.isEncrypted())
{
- document.decrypt(password);
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial(password);
+ document.openProtection(sdm);
}
Iterator<PDPage> iter = document.getDocumentCatalog().getAllPages().iterator();
while (iter.hasNext())
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintBookmarks.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintBookmarks.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintBookmarks.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintBookmarks.java Sun Mar 30 22:46:15 2014
@@ -26,6 +26,7 @@ import org.apache.pdfbox.pdmodel.interac
import java.io.FileInputStream;
import java.io.IOException;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
/**
* This is an example on how to access the bookmarks that are part of a pdf document.
@@ -64,7 +65,8 @@ public class PrintBookmarks
{
try
{
- document.decrypt( "" );
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
+ document.openProtection(sdm);
}
catch( InvalidPasswordException e )
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintDocumentMetaData.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintDocumentMetaData.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintDocumentMetaData.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintDocumentMetaData.java Sun Mar 30 22:46:15 2014
@@ -30,6 +30,7 @@ import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
/**
* This is an example on how to get a documents metadata information.
@@ -68,7 +69,8 @@ public class PrintDocumentMetaData
{
try
{
- document.decrypt( "" );
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
+ document.openProtection(sdm);
}
catch( InvalidPasswordException e )
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java Sun Mar 30 22:46:15 2014
@@ -31,6 +31,7 @@ import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
/**
* This will read a document from the filesystem, decrypt it and do something with the signature.
@@ -74,7 +75,8 @@ public class ShowSignature
if( document.isEncrypted() )
{
- document.decrypt( password );
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial(password);
+ document.openProtection(sdm);
}
else
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/ExtractTextByArea.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/ExtractTextByArea.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/ExtractTextByArea.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/ExtractTextByArea.java Sun Mar 30 22:46:15 2014
@@ -24,6 +24,7 @@ import org.apache.pdfbox.util.PDFTextStr
import java.awt.Rectangle;
import java.util.List;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
/**
* This is an example on how to extract text from a specific area on the PDF document.
@@ -64,7 +65,8 @@ public class ExtractTextByArea
{
try
{
- document.decrypt( "" );
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
+ document.openProtection(sdm);
}
catch( InvalidPasswordException e )
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java Sun Mar 30 22:46:15 2014
@@ -37,6 +37,7 @@ import java.io.IOException;
import java.util.List;
import java.util.Map;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
/**
* This is an example on how to get the x/y coordinates of image locations.
@@ -84,7 +85,8 @@ public class PrintImageLocations extends
{
try
{
- document.decrypt( "" );
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
+ document.openProtection(sdm);
}
catch( InvalidPasswordException e )
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextLocations.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextLocations.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextLocations.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextLocations.java Sun Mar 30 22:46:15 2014
@@ -26,6 +26,7 @@ import org.apache.pdfbox.text.TextPositi
import java.io.IOException;
import java.util.List;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
/**
* This is an example on how to get some x/y coordinates of text.
@@ -70,7 +71,8 @@ public class PrintTextLocations extends
{
try
{
- document.decrypt( "" );
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
+ document.openProtection(sdm);
}
catch( InvalidPasswordException e )
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java Sun Mar 30 22:46:15 2014
@@ -42,6 +42,7 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.pdfbox.pdmodel.common.PDRectangle;
import org.apache.pdfbox.pdmodel.common.PDStream;
import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
import org.apache.pdfbox.pdmodel.interactive.pagenavigation.PDThreadBead;
import org.apache.pdfbox.text.PositionWrapper;
@@ -336,7 +337,8 @@ public class PDFTextStripper extends PDF
//
try
{
- document.decrypt("");
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
+ document.openProtection(sdm);
}
catch (InvalidPasswordException e)
{
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java Sun Mar 30 22:46:15 2014
@@ -44,6 +44,7 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.InputStream;
import java.io.IOException;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
/**
*
@@ -407,7 +408,8 @@ public class PDFDebugger extends javax.s
{
try
{
- document.decrypt( password );
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial(password);
+ document.openProtection(sdm);
}
catch( InvalidPasswordException e )
{
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java Sun Mar 30 22:46:15 2014
@@ -39,6 +39,7 @@ import org.apache.pdfbox.tools.gui.PageW
import org.apache.pdfbox.tools.gui.ReaderBottomPanel;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
import org.apache.pdfbox.util.ImageIOUtil;
/**
@@ -379,7 +380,8 @@ public class PDFReader extends JFrame
{
try
{
- document.decrypt(password);
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial(password);
+ document.openProtection(sdm);
}
catch (InvalidPasswordException e)
{
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java Sun Mar 30 22:46:15 2014
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdfwriter.COSWriter;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
import org.apache.pdfbox.util.Splitter;
/**
@@ -139,7 +140,8 @@ public class PDFSplit
{
try
{
- document.decrypt( password );
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial(password);
+ document.openProtection(sdm);
}
catch( InvalidPasswordException e )
{
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java Sun Mar 30 22:46:15 2014
@@ -29,6 +29,7 @@ import org.apache.pdfbox.pdmodel.encrypt
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
import org.apache.pdfbox.rendering.ImageType;
import org.apache.pdfbox.rendering.PDFRenderer;
import org.apache.pdfbox.util.ImageIOUtil;
@@ -187,7 +188,8 @@ public class PDFToImage
{
try
{
- document.decrypt( password );
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial(password);
+ document.openProtection(sdm);
}
catch( InvalidPasswordException e )
{
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java Sun Mar 30 22:46:15 2014
@@ -22,6 +22,7 @@ import java.io.File;
import javax.print.PrintService;
import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
import org.apache.pdfbox.rendering.PDFPrinter;
import org.apache.pdfbox.rendering.PDFRenderer;
@@ -101,7 +102,8 @@ public class PrintPDF
if (document.isEncrypted())
{
- document.decrypt(password);
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial(password);
+ document.openProtection(sdm);
}
PrinterJob printJob = PrinterJob.getPrinterJob();
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java?rev=1583219&r1=1583218&r2=1583219&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java Sun Mar 30 22:46:15 2014
@@ -28,6 +28,7 @@ import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
+import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
/**
* load document and write with all streams decoded.
@@ -92,7 +93,8 @@ public class WriteDecodedDoc
{
try
{
- doc.decrypt( password );
+ StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
+ doc.openProtection(sdm);
doc.setAllSecurityToBeRemoved(true);
}
catch( InvalidPasswordException e )