Porting update.

git-svn-id: svn://svn.code.sf.net/p/itextsharp/code/trunk@21 820d3149-562b-4f88-9aa4-a8e61a3485cf
master
psoares33 2009-06-03 22:43:40 +00:00
parent b972119de6
commit a8cf4120eb
7 changed files with 1059 additions and 396 deletions

View File

@ -263,18 +263,23 @@ namespace iTextSharp.text.pdf {
} }
} }
} }
ThrowError("Unexpected end of file"); // if we hit here, the file is either corrupt (stream ended unexpectedly),
// or the last token ended exactly at the end of a stream. This last
// case can occur inside an Object Stream.
} }
public bool NextToken() { public bool NextToken() {
StringBuilder outBuf = null;
stringValue = EMPTY;
int ch = 0; int ch = 0;
do { do {
ch = file.Read(); ch = file.Read();
} while (ch != -1 && IsWhitespace(ch)); } while (ch != -1 && IsWhitespace(ch));
if (ch == -1) if (ch == -1)
return false; return false;
// Note: We have to initialize stringValue here, after we've looked for the end of the stream,
// to ensure that we don't lose the value of a token that might end exactly at the end
// of the stream
StringBuilder outBuf = null;
stringValue = EMPTY;
switch (ch) { switch (ch) {
case '[': case '[':
type = TK_START_ARRAY; type = TK_START_ARRAY;

View File

@ -407,16 +407,16 @@ public class PdfEncryption {
else else
stdcf.Put(PdfName.CFM, PdfName.V2); stdcf.Put(PdfName.CFM, PdfName.V2);
PdfDictionary cf = new PdfDictionary(); PdfDictionary cf = new PdfDictionary();
cf.Put(PdfName.DEFAULTCRYPTFILER, stdcf); cf.Put(PdfName.DEFAULTCRYPTFILTER, stdcf);
dic.Put(PdfName.CF, cf); dic.Put(PdfName.CF, cf);
if (embeddedFilesOnly) { if (embeddedFilesOnly) {
dic.Put(PdfName.EFF, PdfName.DEFAULTCRYPTFILER); dic.Put(PdfName.EFF, PdfName.DEFAULTCRYPTFILTER);
dic.Put(PdfName.STRF, PdfName.IDENTITY); dic.Put(PdfName.STRF, PdfName.IDENTITY);
dic.Put(PdfName.STMF, PdfName.IDENTITY); dic.Put(PdfName.STMF, PdfName.IDENTITY);
} }
else { else {
dic.Put(PdfName.STRF, PdfName.DEFAULTCRYPTFILER); dic.Put(PdfName.STRF, PdfName.DEFAULTCRYPTFILTER);
dic.Put(PdfName.STMF, PdfName.DEFAULTCRYPTFILER); dic.Put(PdfName.STMF, PdfName.DEFAULTCRYPTFILTER);
} }
} }

View File

@ -1,321 +1,321 @@
using System; using System;
using System.Collections; using System.Collections;
/* /*
* Copyright 2004 by Paulo Soares. * Copyright 2004 by Paulo Soares.
* *
* The contents of this file are subject to the Mozilla Public License Version 1.1 * The contents of this file are subject to the Mozilla Public License Version 1.1
* (the "License"); you may not use this file except in compliance with the License. * (the "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at http://www.mozilla.org/MPL/ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
* *
* Software distributed under the License is distributed on an "AS IS" basis, * Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the License. * for the specific language governing rights and limitations under the License.
* *
* The Original Code is 'iText, a free JAVA-PDF library'. * The Original Code is 'iText, a free JAVA-PDF library'.
* *
* The Initial Developer of the Original Code is Bruno Lowagie. Portions created by * The Initial Developer of the Original Code is Bruno Lowagie. Portions created by
* the Initial Developer are Copyright (C) 1999, 2000, 2001, 2002 by Bruno Lowagie. * the Initial Developer are Copyright (C) 1999, 2000, 2001, 2002 by Bruno Lowagie.
* All Rights Reserved. * All Rights Reserved.
* Co-Developer of the code is Paulo Soares. Portions created by the Co-Developer * Co-Developer of the code is Paulo Soares. Portions created by the Co-Developer
* are Copyright (C) 2000, 2001, 2002 by Paulo Soares. All Rights Reserved. * are Copyright (C) 2000, 2001, 2002 by Paulo Soares. All Rights Reserved.
* *
* Contributor(s): all the names of the contributors are added in the source code * Contributor(s): all the names of the contributors are added in the source code
* where applicable. * where applicable.
* *
* Alternatively, the contents of this file may be used under the terms of the * Alternatively, the contents of this file may be used under the terms of the
* LGPL license (the "GNU LIBRARY GENERAL PUBLIC LICENSE"), in which case the * LGPL license (the "GNU LIBRARY GENERAL PUBLIC LICENSE"), in which case the
* provisions of LGPL are applicable instead of those above. If you wish to * provisions of LGPL are applicable instead of those above. If you wish to
* allow use of your version of this file only under the terms of the LGPL * allow use of your version of this file only under the terms of the LGPL
* License and not to allow others to use your version of this file under * License and not to allow others to use your version of this file under
* the MPL, indicate your decision by deleting the provisions above and * the MPL, indicate your decision by deleting the provisions above and
* replace them with the notice and other provisions required by the LGPL. * replace them with the notice and other provisions required by the LGPL.
* If you do not delete the provisions above, a recipient may use your version * If you do not delete the provisions above, a recipient may use your version
* of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE. * of this file under either the MPL or the GNU LIBRARY GENERAL PUBLIC LICENSE.
* *
* This library is free software; you can redistribute it and/or modify it * This library is free software; you can redistribute it and/or modify it
* under the terms of the MPL as stated above or under the terms of the GNU * under the terms of the MPL as stated above or under the terms of the GNU
* Library General Public License as published by the Free Software Foundation; * Library General Public License as published by the Free Software Foundation;
* either version 2 of the License, or any later version. * either version 2 of the License, or any later version.
* *
* This library is distributed in the hope that it will be useful, but WITHOUT * This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Library general Public License for more * FOR A PARTICULAR PURPOSE. See the GNU Library general Public License for more
* details. * details.
* *
* If you didn't download this code from the following link, you should check if * If you didn't download this code from the following link, you should check if
* you aren't using an obsolete version: * you aren't using an obsolete version:
* http://www.lowagie.com/iText/ * http://www.lowagie.com/iText/
*/ */
namespace iTextSharp.text.pdf { namespace iTextSharp.text.pdf {
/** /**
* An optional content group is a dictionary representing a collection of graphics * An optional content group is a dictionary representing a collection of graphics
* that can be made visible or invisible dynamically by users of viewer applications. * that can be made visible or invisible dynamically by users of viewer applications.
* In iText they are referenced as layers. * In iText they are referenced as layers.
* *
* @author Paulo Soares (psoares@consiste.pt) * @author Paulo Soares (psoares@consiste.pt)
*/ */
public class PdfLayer : PdfDictionary, IPdfOCG { public class PdfLayer : PdfDictionary, IPdfOCG {
protected PdfIndirectReference refi; protected PdfIndirectReference refi;
protected ArrayList children; protected ArrayList children;
protected PdfLayer parent; protected PdfLayer parent;
protected String title; protected String title;
/** /**
* Holds value of property on. * Holds value of property on.
*/ */
private bool on = true; private bool on = true;
/** /**
* Holds value of property onPanel. * Holds value of property onPanel.
*/ */
private bool onPanel = true; private bool onPanel = true;
internal PdfLayer(String title) { internal PdfLayer(String title) {
this.title = title; this.title = title;
} }
/** /**
* Creates a title layer. A title layer is not really a layer but a collection of layers * Creates a title layer. A title layer is not really a layer but a collection of layers
* under the same title heading. * under the same title heading.
* @param title the title text * @param title the title text
* @param writer the <CODE>PdfWriter</CODE> * @param writer the <CODE>PdfWriter</CODE>
* @return the title layer * @return the title layer
*/ */
public static PdfLayer CreateTitle(String title, PdfWriter writer) { public static PdfLayer CreateTitle(String title, PdfWriter writer) {
if (title == null) if (title == null)
throw new ArgumentNullException("Title cannot be null."); throw new ArgumentNullException("Title cannot be null.");
PdfLayer layer = new PdfLayer(title); PdfLayer layer = new PdfLayer(title);
writer.RegisterLayer(layer); writer.RegisterLayer(layer);
return layer; return layer;
} }
/** /**
* Creates a new layer. * Creates a new layer.
* @param name the name of the layer * @param name the name of the layer
* @param writer the writer * @param writer the writer
*/ */
public PdfLayer(String name, PdfWriter writer) : base(PdfName.OCG) { public PdfLayer(String name, PdfWriter writer) : base(PdfName.OCG) {
Name = name; Name = name;
refi = writer.PdfIndirectReference; refi = writer.PdfIndirectReference;
writer.RegisterLayer(this); writer.RegisterLayer(this);
} }
internal String Title { internal String Title {
get { get {
return title; return title;
} }
} }
/** /**
* Adds a child layer. Nested layers can only have one parent. * Adds a child layer. Nested layers can only have one parent.
* @param child the child layer * @param child the child layer
*/ */
public void AddChild(PdfLayer child) { public void AddChild(PdfLayer child) {
if (child.parent != null) if (child.parent != null)
throw new ArgumentException("The layer '" + ((PdfString)child.Get(PdfName.NAME)).ToUnicodeString() + "' already has a parent."); throw new ArgumentException("The layer '" + ((PdfString)child.Get(PdfName.NAME)).ToUnicodeString() + "' already has a parent.");
child.parent = this; child.parent = this;
if (children == null) if (children == null)
children = new ArrayList(); children = new ArrayList();
children.Add(child); children.Add(child);
} }
/** /**
* Gets the parent layer. * Gets the parent layer.
* @return the parent layer or <CODE>null</CODE> if the layer has no parent * @return the parent layer or <CODE>null</CODE> if the layer has no parent
*/ */
public PdfLayer Parent { public PdfLayer Parent {
get { get {
return parent; return parent;
} }
} }
/** /**
* Gets the children layers. * Gets the children layers.
* @return the children layers or <CODE>null</CODE> if the layer has no children * @return the children layers or <CODE>null</CODE> if the layer has no children
*/ */
public ArrayList Children { public ArrayList Children {
get { get {
return children; return children;
} }
} }
/** /**
* Gets the <CODE>PdfIndirectReference</CODE> that represents this layer. * Gets the <CODE>PdfIndirectReference</CODE> that represents this layer.
* @return the <CODE>PdfIndirectReference</CODE> that represents this layer * @return the <CODE>PdfIndirectReference</CODE> that represents this layer
*/ */
public PdfIndirectReference Ref { public PdfIndirectReference Ref {
get { get {
return refi; return refi;
} }
set { set {
refi = value; refi = value;
} }
} }
/** /**
* Sets the name of this layer. * Sets the name of this layer.
* @param name the name of this layer * @param name the name of this layer
*/ */
public string Name { public string Name {
set { set {
Put(PdfName.NAME, new PdfString(value, PdfObject.TEXT_UNICODE)); Put(PdfName.NAME, new PdfString(value, PdfObject.TEXT_UNICODE));
} }
} }
/** /**
* Gets the dictionary representing the layer. It just returns <CODE>this</CODE>. * Gets the dictionary representing the layer. It just returns <CODE>this</CODE>.
* @return the dictionary representing the layer * @return the dictionary representing the layer
*/ */
public PdfObject PdfObject { public PdfObject PdfObject {
get { get {
return this; return this;
} }
} }
/** /**
* Gets the initial visibility of the layer. * Gets the initial visibility of the layer.
* @return the initial visibility of the layer * @return the initial visibility of the layer
*/ */
public bool On { public bool On {
get { get {
return this.on; return this.on;
} }
set { set {
on = value; on = value;
} }
} }
private PdfDictionary Usage { private PdfDictionary Usage {
get { get {
PdfDictionary usage = (PdfDictionary)Get(PdfName.USAGE); PdfDictionary usage = (PdfDictionary)Get(PdfName.USAGE);
if (usage == null) { if (usage == null) {
usage = new PdfDictionary(); usage = new PdfDictionary();
Put(PdfName.USAGE, usage); Put(PdfName.USAGE, usage);
} }
return usage; return usage;
} }
} }
/** /**
* Used by the creating application to store application-specific * Used by the creating application to store application-specific
* data associated with this optional content group. * data associated with this optional content group.
* @param creator a text string specifying the application that created the group * @param creator a text string specifying the application that created the group
* @param subtype a string defining the type of content controlled by the group. Suggested * @param subtype a string defining the type of content controlled by the group. Suggested
* values include but are not limited to <B>Artwork</B>, for graphic-design or publishing * values include but are not limited to <B>Artwork</B>, for graphic-design or publishing
* applications, and <B>Technical</B>, for technical designs such as building plans or * applications, and <B>Technical</B>, for technical designs such as building plans or
* schematics * schematics
*/ */
public void SetCreatorInfo(String creator, String subtype) { public void SetCreatorInfo(String creator, String subtype) {
PdfDictionary usage = Usage; PdfDictionary usage = Usage;
PdfDictionary dic = new PdfDictionary(); PdfDictionary dic = new PdfDictionary();
dic.Put(PdfName.CREATOR, new PdfString(creator, PdfObject.TEXT_UNICODE)); dic.Put(PdfName.CREATOR, new PdfString(creator, PdfObject.TEXT_UNICODE));
dic.Put(PdfName.SUBTYPE, new PdfName(subtype)); dic.Put(PdfName.SUBTYPE, new PdfName(subtype));
usage.Put(PdfName.CREATORINFO, dic); usage.Put(PdfName.CREATORINFO, dic);
} }
/** /**
* Specifies the language of the content controlled by this * Specifies the language of the content controlled by this
* optional content group * optional content group
* @param lang a language string which specifies a language and possibly a locale * @param lang a language string which specifies a language and possibly a locale
* (for example, <B>es-MX</B> represents Mexican Spanish) * (for example, <B>es-MX</B> represents Mexican Spanish)
* @param preferred used by viewer applications when there is a partial match but no exact * @param preferred used by viewer applications when there is a partial match but no exact
* match between the system language and the language strings in all usage dictionaries * match between the system language and the language strings in all usage dictionaries
*/ */
public void SetLanguage(String lang, bool preferred) { public void SetLanguage(String lang, bool preferred) {
PdfDictionary usage = Usage; PdfDictionary usage = Usage;
PdfDictionary dic = new PdfDictionary(); PdfDictionary dic = new PdfDictionary();
dic.Put(PdfName.LANG, new PdfString(lang, PdfObject.TEXT_UNICODE)); dic.Put(PdfName.LANG, new PdfString(lang, PdfObject.TEXT_UNICODE));
if (preferred) if (preferred)
dic.Put(PdfName.PREFERRED, PdfName.ON); dic.Put(PdfName.PREFERRED, PdfName.ON);
usage.Put(PdfName.LANGUAGE, dic); usage.Put(PdfName.LANGUAGE, dic);
} }
/** /**
* Specifies the recommended state for content in this * Specifies the recommended state for content in this
* group when the document (or part of it) is saved by a viewer application to a format * group when the document (or part of it) is saved by a viewer application to a format
* that does not support optional content (for example, an earlier version of * that does not support optional content (for example, an earlier version of
* PDF or a raster image format). * PDF or a raster image format).
* @param export the export state * @param export the export state
*/ */
public bool Export { public bool Export {
set { set {
PdfDictionary usage = Usage; PdfDictionary usage = Usage;
PdfDictionary dic = new PdfDictionary(); PdfDictionary dic = new PdfDictionary();
dic.Put(PdfName.EXPORTSTATE, value ? PdfName.ON : PdfName.OFF); dic.Put(PdfName.EXPORTSTATE, value ? PdfName.ON : PdfName.OFF);
usage.Put(PdfName.EXPORT, dic); usage.Put(PdfName.EXPORT, dic);
} }
} }
/** /**
* Specifies a range of magnifications at which the content * Specifies a range of magnifications at which the content
* in this optional content group is best viewed. * in this optional content group is best viewed.
* @param min the minimum recommended magnification factors at which the group * @param min the minimum recommended magnification factors at which the group
* should be ON. A negative value will set the default to 0 * should be ON. A negative value will set the default to 0
* @param max the maximum recommended magnification factor at which the group * @param max the maximum recommended magnification factor at which the group
* should be ON. A negative value will set the largest possible magnification supported by the * should be ON. A negative value will set the largest possible magnification supported by the
* viewer application * viewer application
*/ */
public void SetZoom(float min, float max) { public void SetZoom(float min, float max) {
if (min <= 0 && max < 0) if (min <= 0 && max < 0)
return; return;
PdfDictionary usage = Usage; PdfDictionary usage = Usage;
PdfDictionary dic = new PdfDictionary(); PdfDictionary dic = new PdfDictionary();
if (min > 0) if (min > 0)
dic.Put(PdfName.MIN, new PdfNumber(min)); dic.Put(PdfName.MIN_LOWER_CASE, new PdfNumber(min));
if (max >= 0) if (max >= 0)
dic.Put(PdfName.MAX, new PdfNumber(max)); dic.Put(PdfName.MAX_LOWER_CASE, new PdfNumber(max));
usage.Put(PdfName.ZOOM, dic); usage.Put(PdfName.ZOOM, dic);
} }
/** /**
* Specifies that the content in this group is intended for * Specifies that the content in this group is intended for
* use in printing * use in printing
* @param subtype a name specifying the kind of content controlled by the group; * @param subtype a name specifying the kind of content controlled by the group;
* for example, <B>Trapping</B>, <B>PrintersMarks</B> and <B>Watermark</B> * for example, <B>Trapping</B>, <B>PrintersMarks</B> and <B>Watermark</B>
* @param printstate indicates that the group should be * @param printstate indicates that the group should be
* set to that state when the document is printed from a viewer application * set to that state when the document is printed from a viewer application
*/ */
public void SetPrint(String subtype, bool printstate) { public void SetPrint(String subtype, bool printstate) {
PdfDictionary usage = Usage; PdfDictionary usage = Usage;
PdfDictionary dic = new PdfDictionary(); PdfDictionary dic = new PdfDictionary();
dic.Put(PdfName.SUBTYPE, new PdfName(subtype)); dic.Put(PdfName.SUBTYPE, new PdfName(subtype));
dic.Put(PdfName.PRINTSTATE, printstate ? PdfName.ON : PdfName.OFF); dic.Put(PdfName.PRINTSTATE, printstate ? PdfName.ON : PdfName.OFF);
usage.Put(PdfName.PRINT, dic); usage.Put(PdfName.PRINT, dic);
} }
/** /**
* Indicates that the group should be set to that state when the * Indicates that the group should be set to that state when the
* document is opened in a viewer application. * document is opened in a viewer application.
* @param view the view state * @param view the view state
*/ */
public bool View { public bool View {
set { set {
PdfDictionary usage = Usage; PdfDictionary usage = Usage;
PdfDictionary dic = new PdfDictionary(); PdfDictionary dic = new PdfDictionary();
dic.Put(PdfName.VIEWSTATE, value ? PdfName.ON : PdfName.OFF); dic.Put(PdfName.VIEWSTATE, value ? PdfName.ON : PdfName.OFF);
usage.Put(PdfName.VIEW, dic); usage.Put(PdfName.VIEW, dic);
} }
} }
/** /**
* Gets the layer visibility in Acrobat's layer panel * Gets the layer visibility in Acrobat's layer panel
* @return the layer visibility in Acrobat's layer panel * @return the layer visibility in Acrobat's layer panel
*/ */
/** /**
* Sets the visibility of the layer in Acrobat's layer panel. If <CODE>false</CODE> * Sets the visibility of the layer in Acrobat's layer panel. If <CODE>false</CODE>
* the layer cannot be directly manipulated by the user. Note that any children layers will * the layer cannot be directly manipulated by the user. Note that any children layers will
* also be absent from the panel. * also be absent from the panel.
* @param onPanel the visibility of the layer in Acrobat's layer panel * @param onPanel the visibility of the layer in Acrobat's layer panel
*/ */
public bool OnPanel { public bool OnPanel {
get { get {
return this.onPanel; return this.onPanel;
} }
set { set {
onPanel = value; onPanel = value;
} }
} }
} }
} }

File diff suppressed because it is too large Load Diff

View File

@ -657,7 +657,7 @@ namespace iTextSharp.text.pdf {
PdfDictionary dic = (PdfDictionary)enc.Get(PdfName.CF); PdfDictionary dic = (PdfDictionary)enc.Get(PdfName.CF);
if (dic == null) if (dic == null)
throw new IOException("/CF not found (encryption)"); throw new IOException("/CF not found (encryption)");
dic = (PdfDictionary)dic.Get(PdfName.DEFAULTCRYPTFILER); dic = (PdfDictionary)dic.Get(PdfName.DEFAULTCRYPTFILTER);
if (dic == null) if (dic == null)
throw new IOException("/DefaultCryptFilter not found (encryption)"); throw new IOException("/DefaultCryptFilter not found (encryption)");
if (PdfName.V2.Equals(dic.Get(PdfName.CFM))) if (PdfName.V2.Equals(dic.Get(PdfName.CFM)))

View File

@ -197,6 +197,10 @@ namespace iTextSharp.text.pdf {
public PdfIndirectReference IndirectReference { public PdfIndirectReference IndirectReference {
get { get {
// uncomment the null check as soon as we're sure all examples still work
if (thisReference == null /* && writer != null */) {
thisReference = writer.PdfIndirectReference;
}
return thisReference; return thisReference;
} }
} }

View File

@ -143,7 +143,7 @@ namespace iTextSharp.text.pdf.codec {
private const int PNG_FILTER_AVERAGE = 3; private const int PNG_FILTER_AVERAGE = 3;
private const int PNG_FILTER_PAETH = 4; private const int PNG_FILTER_PAETH = 4;
private static PdfName[] intents = {PdfName.PERCEPTUAL, private static PdfName[] intents = {PdfName.PERCEPTUAL,
PdfName.RELATIVECALORIMETRIC,PdfName.SATURATION,PdfName.ABSOLUTECALORIMETRIC}; PdfName.RELATIVECOLORIMETRIC,PdfName.SATURATION,PdfName.ABSOLUTECOLORIMETRIC};
Stream isp; Stream isp;
Stream dataStream; Stream dataStream;
@ -738,6 +738,8 @@ namespace iTextSharp.text.pdf.codec {
int idx = outp[srcX]; int idx = outp[srcX];
if (idx < trans.Length) if (idx < trans.Length)
v[0] = trans[idx]; v[0] = trans[idx];
else
v[0] = 255; // Patrick Valsecchi
SetPixel(smask, v, 0, 1, dstX, y, 8, yStride); SetPixel(smask, v, 0, 1, dstX, y, 8, yStride);
dstX += step; dstX += step;
} }
@ -751,8 +753,7 @@ namespace iTextSharp.text.pdf.codec {
dstX = xOffset; dstX = xOffset;
for (srcX = 0; srcX < width; srcX++) { for (srcX = 0; srcX < width; srcX++) {
int idx = outp[srcX]; int idx = outp[srcX];
if (idx < trans.Length) v[0] = ((idx < trans.Length && trans[idx] == 0) ? 1 : 0);
v[0] = (trans[idx] == 0 ? 1 : 0);
SetPixel(smask, v, 0, 1, dstX, y, 1, yStride); SetPixel(smask, v, 0, 1, dstX, y, 1, yStride);
dstX += step; dstX += step;
} }