You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2010/03/28 19:57:20 UTC
svn commit: r928462 [2/2] - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: encoding/
pdmodel/font/ pdmodel/graphics/ pdmodel/graphics/color/
pdmodel/graphics/xobject/ util/
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/WinAnsiEncoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/WinAnsiEncoding.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/WinAnsiEncoding.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/WinAnsiEncoding.java Sun Mar 28 17:57:19 2010
@@ -32,227 +32,227 @@ public class WinAnsiEncoding extends Enc
*/
public WinAnsiEncoding()
{
- addCharacterEncoding( 0101, COSName.getPDFName( "A" ) );
- addCharacterEncoding( 0306, COSName.getPDFName( "AE" ) );
- addCharacterEncoding( 0301, COSName.getPDFName( "Aacute" ) );
- addCharacterEncoding( 0302, COSName.getPDFName( "Acircumflex" ) );
- addCharacterEncoding( 0304, COSName.getPDFName( "Adieresis" ) );
- addCharacterEncoding( 0300, COSName.getPDFName( "Agrave" ) );
- addCharacterEncoding( 0305, COSName.getPDFName( "Aring" ) );
- addCharacterEncoding( 0303, COSName.getPDFName( "Atilde" ) );
- addCharacterEncoding( 0102, COSName.getPDFName( "B" ) );
- addCharacterEncoding( 0103, COSName.getPDFName( "C" ) );
- addCharacterEncoding( 0307, COSName.getPDFName( "Ccedilla" ) );
- addCharacterEncoding( 0104, COSName.getPDFName( "D" ) );
- addCharacterEncoding( 0105, COSName.getPDFName( "E" ) );
- addCharacterEncoding( 0311, COSName.getPDFName( "Eacute" ) );
- addCharacterEncoding( 0312, COSName.getPDFName( "Ecircumflex" ) );
- addCharacterEncoding( 0313, COSName.getPDFName( "Edieresis" ) );
- addCharacterEncoding( 0310, COSName.getPDFName( "Egrave" ) );
- addCharacterEncoding( 0320, COSName.getPDFName( "Eth" ) );
- addCharacterEncoding( 0200, COSName.getPDFName( "Euro" ) );
- addCharacterEncoding( 0106, COSName.getPDFName( "F" ) );
- addCharacterEncoding( 0107, COSName.getPDFName( "G" ) );
- addCharacterEncoding( 0110, COSName.getPDFName( "H" ) );
- addCharacterEncoding( 0111, COSName.getPDFName( "I" ) );
- addCharacterEncoding( 0315, COSName.getPDFName( "Iacute" ) );
- addCharacterEncoding( 0316, COSName.getPDFName( "Icircumflex" ) );
- addCharacterEncoding( 0317, COSName.getPDFName( "Idieresis" ) );
- addCharacterEncoding( 0314, COSName.getPDFName( "Igrave" ) );
- addCharacterEncoding( 0112, COSName.getPDFName( "J" ) );
- addCharacterEncoding( 0113, COSName.getPDFName( "K" ) );
- addCharacterEncoding( 0114, COSName.getPDFName( "L" ) );
- addCharacterEncoding( 0115, COSName.getPDFName( "M" ) );
- addCharacterEncoding( 0116, COSName.getPDFName( "N" ) );
- addCharacterEncoding( 0321, COSName.getPDFName( "Ntilde" ) );
- addCharacterEncoding( 0117, COSName.getPDFName( "O" ) );
- addCharacterEncoding( 0214, COSName.getPDFName( "OE" ) );
- addCharacterEncoding( 0323, COSName.getPDFName( "Oacute" ) );
- addCharacterEncoding( 0324, COSName.getPDFName( "Ocircumflex" ) );
- addCharacterEncoding( 0326, COSName.getPDFName( "Odieresis" ) );
- addCharacterEncoding( 0322, COSName.getPDFName( "Ograve" ) );
- addCharacterEncoding( 0330, COSName.getPDFName( "Oslash" ) );
- addCharacterEncoding( 0325, COSName.getPDFName( "Otilde" ) );
- addCharacterEncoding( 0120, COSName.getPDFName( "P" ) );
- addCharacterEncoding( 0121, COSName.getPDFName( "Q" ) );
- addCharacterEncoding( 0122, COSName.getPDFName( "R" ) );
- addCharacterEncoding( 0123, COSName.getPDFName( "S" ) );
- addCharacterEncoding( 0212, COSName.getPDFName( "Scaron" ) );
- addCharacterEncoding( 0124, COSName.getPDFName( "T" ) );
- addCharacterEncoding( 0336, COSName.getPDFName( "Thorn" ) );
- addCharacterEncoding( 0125, COSName.getPDFName( "U" ) );
- addCharacterEncoding( 0332, COSName.getPDFName( "Uacute" ) );
- addCharacterEncoding( 0333, COSName.getPDFName( "Ucircumflex" ) );
- addCharacterEncoding( 0334, COSName.getPDFName( "Udieresis" ) );
- addCharacterEncoding( 0331, COSName.getPDFName( "Ugrave" ) );
- addCharacterEncoding( 0126, COSName.getPDFName( "V" ) );
- addCharacterEncoding( 0127, COSName.getPDFName( "W" ) );
- addCharacterEncoding( 0130, COSName.getPDFName( "X" ) );
- addCharacterEncoding( 0131, COSName.getPDFName( "Y" ) );
- addCharacterEncoding( 0335, COSName.getPDFName( "Yacute" ) );
- addCharacterEncoding( 0237, COSName.getPDFName( "Ydieresis" ) );
- addCharacterEncoding( 0132, COSName.getPDFName( "Z" ) );
- addCharacterEncoding( 0216, COSName.getPDFName( "Zcaron" ) );
- addCharacterEncoding( 0141, COSName.getPDFName( "a" ) );
- addCharacterEncoding( 0341, COSName.getPDFName( "aacute" ) );
- addCharacterEncoding( 0342, COSName.getPDFName( "acircumflex" ) );
- addCharacterEncoding( 0264, COSName.getPDFName( "acute" ) );
- addCharacterEncoding( 0344, COSName.getPDFName( "adieresis" ) );
- addCharacterEncoding( 0346, COSName.getPDFName( "ae" ) );
- addCharacterEncoding( 0340, COSName.getPDFName( "agrave" ) );
- addCharacterEncoding( 046, COSName.getPDFName( "ampersand" ) );
- addCharacterEncoding( 0345, COSName.getPDFName( "aring" ) );
- addCharacterEncoding( 0136, COSName.getPDFName( "asciicircum" ) );
- addCharacterEncoding( 0176, COSName.getPDFName( "asciitilde" ) );
- addCharacterEncoding( 052, COSName.getPDFName( "asterisk" ) );
- addCharacterEncoding( 0100, COSName.getPDFName( "at" ) );
- addCharacterEncoding( 0343, COSName.getPDFName( "atilde" ) );
- addCharacterEncoding( 0142, COSName.getPDFName( "b" ) );
- addCharacterEncoding( 0134, COSName.getPDFName( "backslash" ) );
- addCharacterEncoding( 0174, COSName.getPDFName( "bar" ) );
- addCharacterEncoding( 0173, COSName.getPDFName( "braceleft" ) );
- addCharacterEncoding( 0175, COSName.getPDFName( "braceright" ) );
- addCharacterEncoding( 0133, COSName.getPDFName( "bracketleft" ) );
- addCharacterEncoding( 0135, COSName.getPDFName( "bracketright" ) );
- addCharacterEncoding( 0246, COSName.getPDFName( "brokenbar" ) );
- addCharacterEncoding( 0225, COSName.getPDFName( "bullet" ) );
- addCharacterEncoding( 0143, COSName.getPDFName( "c" ) );
- addCharacterEncoding( 0347, COSName.getPDFName( "ccedilla" ) );
- addCharacterEncoding( 0270, COSName.getPDFName( "cedilla" ) );
- addCharacterEncoding( 0242, COSName.getPDFName( "cent" ) );
- addCharacterEncoding( 0210, COSName.getPDFName( "circumflex" ) );
- addCharacterEncoding( 072, COSName.getPDFName( "colon" ) );
- addCharacterEncoding( 054, COSName.getPDFName( "comma" ) );
- addCharacterEncoding( 0251, COSName.getPDFName( "copyright" ) );
+ addCharacterEncoding( 0101, "A" );;
+ addCharacterEncoding( 0306, "AE" );;
+ addCharacterEncoding( 0301, "Aacute" );;
+ addCharacterEncoding( 0302, "Acircumflex" );;
+ addCharacterEncoding( 0304, "Adieresis" );;
+ addCharacterEncoding( 0300, "Agrave" );;
+ addCharacterEncoding( 0305, "Aring" );;
+ addCharacterEncoding( 0303, "Atilde" );;
+ addCharacterEncoding( 0102, "B" );;
+ addCharacterEncoding( 0103, "C" );;
+ addCharacterEncoding( 0307, "Ccedilla" );;
+ addCharacterEncoding( 0104, "D" );;
+ addCharacterEncoding( 0105, "E" );;
+ addCharacterEncoding( 0311, "Eacute" );;
+ addCharacterEncoding( 0312, "Ecircumflex" );;
+ addCharacterEncoding( 0313, "Edieresis" );;
+ addCharacterEncoding( 0310, "Egrave" );;
+ addCharacterEncoding( 0320, "Eth" );;
+ addCharacterEncoding( 0200, "Euro" );;
+ addCharacterEncoding( 0106, "F" );;
+ addCharacterEncoding( 0107, "G" );;
+ addCharacterEncoding( 0110, "H" );;
+ addCharacterEncoding( 0111, "I" );;
+ addCharacterEncoding( 0315, "Iacute" );;
+ addCharacterEncoding( 0316, "Icircumflex" );;
+ addCharacterEncoding( 0317, "Idieresis" );;
+ addCharacterEncoding( 0314, "Igrave" );;
+ addCharacterEncoding( 0112, "J" );;
+ addCharacterEncoding( 0113, "K" );;
+ addCharacterEncoding( 0114, "L" );;
+ addCharacterEncoding( 0115, "M" );;
+ addCharacterEncoding( 0116, "N" );;
+ addCharacterEncoding( 0321, "Ntilde" );;
+ addCharacterEncoding( 0117, "O" );;
+ addCharacterEncoding( 0214, "OE" );;
+ addCharacterEncoding( 0323, "Oacute" );;
+ addCharacterEncoding( 0324, "Ocircumflex" );;
+ addCharacterEncoding( 0326, "Odieresis" );;
+ addCharacterEncoding( 0322, "Ograve" );;
+ addCharacterEncoding( 0330, "Oslash" );;
+ addCharacterEncoding( 0325, "Otilde" );;
+ addCharacterEncoding( 0120, "P" );;
+ addCharacterEncoding( 0121, "Q" );;
+ addCharacterEncoding( 0122, "R" );;
+ addCharacterEncoding( 0123, "S" );;
+ addCharacterEncoding( 0212, "Scaron" );;
+ addCharacterEncoding( 0124, "T" );;
+ addCharacterEncoding( 0336, "Thorn" );;
+ addCharacterEncoding( 0125, "U" );;
+ addCharacterEncoding( 0332, "Uacute" );;
+ addCharacterEncoding( 0333, "Ucircumflex" );;
+ addCharacterEncoding( 0334, "Udieresis" );;
+ addCharacterEncoding( 0331, "Ugrave" );;
+ addCharacterEncoding( 0126, "V" );;
+ addCharacterEncoding( 0127, "W" );;
+ addCharacterEncoding( 0130, "X" );;
+ addCharacterEncoding( 0131, "Y" );;
+ addCharacterEncoding( 0335, "Yacute" );;
+ addCharacterEncoding( 0237, "Ydieresis" );;
+ addCharacterEncoding( 0132, "Z" );;
+ addCharacterEncoding( 0216, "Zcaron" );;
+ addCharacterEncoding( 0141, "a" );;
+ addCharacterEncoding( 0341, "aacute" );;
+ addCharacterEncoding( 0342, "acircumflex" );;
+ addCharacterEncoding( 0264, "acute" );;
+ addCharacterEncoding( 0344, "adieresis" );;
+ addCharacterEncoding( 0346, "ae" );;
+ addCharacterEncoding( 0340, "agrave" );;
+ addCharacterEncoding( 046, "ampersand" );;
+ addCharacterEncoding( 0345, "aring" );;
+ addCharacterEncoding( 0136, "asciicircum" );;
+ addCharacterEncoding( 0176, "asciitilde" );;
+ addCharacterEncoding( 052, "asterisk" );;
+ addCharacterEncoding( 0100, "at" );;
+ addCharacterEncoding( 0343, "atilde" );;
+ addCharacterEncoding( 0142, "b" );;
+ addCharacterEncoding( 0134, "backslash" );;
+ addCharacterEncoding( 0174, "bar" );;
+ addCharacterEncoding( 0173, "braceleft" );;
+ addCharacterEncoding( 0175, "braceright" );;
+ addCharacterEncoding( 0133, "bracketleft" );;
+ addCharacterEncoding( 0135, "bracketright" );;
+ addCharacterEncoding( 0246, "brokenbar" );;
+ addCharacterEncoding( 0225, "bullet" );;
+ addCharacterEncoding( 0143, "c" );;
+ addCharacterEncoding( 0347, "ccedilla" );;
+ addCharacterEncoding( 0270, "cedilla" );;
+ addCharacterEncoding( 0242, "cent" );;
+ addCharacterEncoding( 0210, "circumflex" );;
+ addCharacterEncoding( 072, "colon" );;
+ addCharacterEncoding( 054, "comma" );;
+ addCharacterEncoding( 0251, "copyright" );;
/**
* Added because cweb.pdf uses circlecopyrt
*/
- addCharacterEncoding( 0251, COSName.getPDFName( "circlecopyrt" ) );
- addCharacterEncoding( 0244, COSName.getPDFName( "currency" ) );
- addCharacterEncoding( 0144, COSName.getPDFName( "d" ) );
- addCharacterEncoding( 0206, COSName.getPDFName( "dagger" ) );
- addCharacterEncoding( 0207, COSName.getPDFName( "daggerdbl" ) );
- addCharacterEncoding( 0260, COSName.getPDFName( "degree" ) );
- addCharacterEncoding( 0250, COSName.getPDFName( "dieresis" ) );
- addCharacterEncoding( 0367, COSName.getPDFName( "divide" ) );
- addCharacterEncoding( 044, COSName.getPDFName( "dollar" ) );
- addCharacterEncoding( 0145, COSName.getPDFName( "e" ) );
- addCharacterEncoding( 0351, COSName.getPDFName( "eacute" ) );
- addCharacterEncoding( 0352, COSName.getPDFName( "ecircumflex" ) );
- addCharacterEncoding( 0353, COSName.getPDFName( "edieresis" ) );
- addCharacterEncoding( 0350, COSName.getPDFName( "egrave" ) );
- addCharacterEncoding( 070, COSName.getPDFName( "eight" ) );
- addCharacterEncoding( 0205, COSName.getPDFName( "ellipsis" ) );
- addCharacterEncoding( 0227, COSName.getPDFName( "emdash" ) );
- addCharacterEncoding( 0226, COSName.getPDFName( "endash" ) );
- addCharacterEncoding( 075, COSName.getPDFName( "equal" ) );
- addCharacterEncoding( 0360, COSName.getPDFName( "eth" ) );
- addCharacterEncoding( 041, COSName.getPDFName( "exclam" ) );
- addCharacterEncoding( 0241, COSName.getPDFName( "exclamdown" ) );
- addCharacterEncoding( 0146, COSName.getPDFName( "f" ) );
- addCharacterEncoding( 065, COSName.getPDFName( "five" ) );
- addCharacterEncoding( 0203, COSName.getPDFName( "florin" ) );
- addCharacterEncoding( 064, COSName.getPDFName( "four" ) );
- addCharacterEncoding( 0147, COSName.getPDFName( "g" ) );
- addCharacterEncoding( 0337, COSName.getPDFName( "germandbls" ) );
- addCharacterEncoding( 0140, COSName.getPDFName( "grave" ) );
- addCharacterEncoding( 076, COSName.getPDFName( "greater" ) );
- addCharacterEncoding( 0253, COSName.getPDFName( "guillemotleft" ) );
- addCharacterEncoding( 0273, COSName.getPDFName( "guillemotright" ) );
- addCharacterEncoding( 0213, COSName.getPDFName( "guilsinglleft" ) );
- addCharacterEncoding( 0233, COSName.getPDFName( "guilsinglright" ) );
- addCharacterEncoding( 0150, COSName.getPDFName( "h" ) );
- addCharacterEncoding( 055, COSName.getPDFName( "hyphen" ) );
- addCharacterEncoding( 0151, COSName.getPDFName( "i" ) );
- addCharacterEncoding( 0355, COSName.getPDFName( "iacute" ) );
- addCharacterEncoding( 0356, COSName.getPDFName( "icircumflex" ) );
- addCharacterEncoding( 0357, COSName.getPDFName( "idieresis" ) );
- addCharacterEncoding( 0354, COSName.getPDFName( "igrave" ) );
- addCharacterEncoding( 0152, COSName.getPDFName( "j" ) );
- addCharacterEncoding( 0153, COSName.getPDFName( "k" ) );
- addCharacterEncoding( 0154, COSName.getPDFName( "l" ) );
- addCharacterEncoding( 074, COSName.getPDFName( "less" ) );
- addCharacterEncoding( 0254, COSName.getPDFName( "logicalnot" ) );
- addCharacterEncoding( 0155, COSName.getPDFName( "m" ) );
- addCharacterEncoding( 0257, COSName.getPDFName( "macron" ) );
- addCharacterEncoding( 0265, COSName.getPDFName( "mu" ) );
- addCharacterEncoding( 0327, COSName.getPDFName( "multiply" ) );
- addCharacterEncoding( 0156, COSName.getPDFName( "n" ) );
- addCharacterEncoding( 071, COSName.getPDFName( "nine" ) );
- addCharacterEncoding( 0361, COSName.getPDFName( "ntilde" ) );
- addCharacterEncoding( 043, COSName.getPDFName( "numbersign" ) );
- addCharacterEncoding( 0157, COSName.getPDFName( "o" ) );
- addCharacterEncoding( 0363, COSName.getPDFName( "oacute" ) );
- addCharacterEncoding( 0364, COSName.getPDFName( "ocircumflex" ) );
- addCharacterEncoding( 0366, COSName.getPDFName( "odieresis" ) );
- addCharacterEncoding( 0234, COSName.getPDFName( "oe" ) );
- addCharacterEncoding( 0362, COSName.getPDFName( "ograve" ) );
- addCharacterEncoding( 061, COSName.getPDFName( "one" ) );
- addCharacterEncoding( 0275, COSName.getPDFName( "onehalf" ) );
- addCharacterEncoding( 0274, COSName.getPDFName( "onequarter" ) );
- addCharacterEncoding( 0271, COSName.getPDFName( "onesuperior" ) );
- addCharacterEncoding( 0252, COSName.getPDFName( "ordfeminine" ) );
- addCharacterEncoding( 0272, COSName.getPDFName( "ordmasculine" ) );
- addCharacterEncoding( 0370, COSName.getPDFName( "oslash" ) );
- addCharacterEncoding( 0365, COSName.getPDFName( "otilde" ) );
- addCharacterEncoding( 0160, COSName.getPDFName( "p" ) );
- addCharacterEncoding( 0266, COSName.getPDFName( "paragraph" ) );
- addCharacterEncoding( 050, COSName.getPDFName( "parenleft" ) );
- addCharacterEncoding( 051, COSName.getPDFName( "parenright" ) );
- addCharacterEncoding( 045, COSName.getPDFName( "percent" ) );
- addCharacterEncoding( 056, COSName.getPDFName( "period" ) );
- addCharacterEncoding( 0267, COSName.getPDFName( "periodcentered" ) );
- addCharacterEncoding( 0211, COSName.getPDFName( "perthousand" ) );
- addCharacterEncoding( 053, COSName.getPDFName( "plus" ) );
- addCharacterEncoding( 0261, COSName.getPDFName( "plusminus" ) );
- addCharacterEncoding( 0161, COSName.getPDFName( "q" ) );
- addCharacterEncoding( 077, COSName.getPDFName( "question" ) );
- addCharacterEncoding( 0277, COSName.getPDFName( "questiondown" ) );
- addCharacterEncoding( 042, COSName.getPDFName( "quotedbl" ) );
- addCharacterEncoding( 0204, COSName.getPDFName( "quotedblbase" ) );
- addCharacterEncoding( 0223, COSName.getPDFName( "quotedblleft" ) );
- addCharacterEncoding( 0224, COSName.getPDFName( "quotedblright" ) );
- addCharacterEncoding( 0221, COSName.getPDFName( "quoteleft" ) );
- addCharacterEncoding( 0222, COSName.getPDFName( "quoteright" ) );
- addCharacterEncoding( 0202, COSName.getPDFName( "quotesinglbase" ) );
- addCharacterEncoding( 047, COSName.getPDFName( "quotesingle" ) );
- addCharacterEncoding( 0162, COSName.getPDFName( "r" ) );
- addCharacterEncoding( 0256, COSName.getPDFName( "registered" ) );
- addCharacterEncoding( 0163, COSName.getPDFName( "s" ) );
- addCharacterEncoding( 0232, COSName.getPDFName( "scaron" ) );
- addCharacterEncoding( 0247, COSName.getPDFName( "section" ) );
- addCharacterEncoding( 073, COSName.getPDFName( "semicolon" ) );
- addCharacterEncoding( 067, COSName.getPDFName( "seven" ) );
- addCharacterEncoding( 066, COSName.getPDFName( "six" ) );
- addCharacterEncoding( 057, COSName.getPDFName( "slash" ) );
- addCharacterEncoding( 040, COSName.getPDFName( "space" ) );
- addCharacterEncoding( 0243, COSName.getPDFName( "sterling" ) );
- addCharacterEncoding( 0164, COSName.getPDFName( "t" ) );
- addCharacterEncoding( 0376, COSName.getPDFName( "thorn" ) );
- addCharacterEncoding( 063, COSName.getPDFName( "three" ) );
- addCharacterEncoding( 0276, COSName.getPDFName( "threequarters" ) );
- addCharacterEncoding( 0263, COSName.getPDFName( "threesuperior" ) );
- addCharacterEncoding( 0230, COSName.getPDFName( "tilde" ) );
- addCharacterEncoding( 0231, COSName.getPDFName( "trademark" ) );
- addCharacterEncoding( 062, COSName.getPDFName( "two" ) );
- addCharacterEncoding( 0262, COSName.getPDFName( "twosuperior" ) );
- addCharacterEncoding( 0165, COSName.getPDFName( "u" ) );
- addCharacterEncoding( 0372, COSName.getPDFName( "uacute" ) );
- addCharacterEncoding( 0373, COSName.getPDFName( "ucircumflex" ) );
- addCharacterEncoding( 0374, COSName.getPDFName( "udieresis" ) );
- addCharacterEncoding( 0371, COSName.getPDFName( "ugrave" ) );
- addCharacterEncoding( 0137, COSName.getPDFName( "underscore" ) );
- addCharacterEncoding( 0166, COSName.getPDFName( "v" ) );
- addCharacterEncoding( 0167, COSName.getPDFName( "w" ) );
- addCharacterEncoding( 0170, COSName.getPDFName( "x" ) );
- addCharacterEncoding( 0171, COSName.getPDFName( "y" ) );
- addCharacterEncoding( 0375, COSName.getPDFName( "yacute" ) );
- addCharacterEncoding( 0377, COSName.getPDFName( "ydieresis" ) );
- addCharacterEncoding( 0245, COSName.getPDFName( "yen" ) );
- addCharacterEncoding( 0172, COSName.getPDFName( "z" ) );
- addCharacterEncoding( 0236, COSName.getPDFName( "zcaron" ) );
- addCharacterEncoding( 060, COSName.getPDFName( "zero" ) );
+ addCharacterEncoding( 0251, "circlecopyrt" );;
+ addCharacterEncoding( 0244, "currency" );;
+ addCharacterEncoding( 0144, "d" );;
+ addCharacterEncoding( 0206, "dagger" );;
+ addCharacterEncoding( 0207, "daggerdbl" );;
+ addCharacterEncoding( 0260, "degree" );;
+ addCharacterEncoding( 0250, "dieresis" );;
+ addCharacterEncoding( 0367, "divide" );;
+ addCharacterEncoding( 044, "dollar" );;
+ addCharacterEncoding( 0145, "e" );;
+ addCharacterEncoding( 0351, "eacute" );;
+ addCharacterEncoding( 0352, "ecircumflex" );;
+ addCharacterEncoding( 0353, "edieresis" );;
+ addCharacterEncoding( 0350, "egrave" );;
+ addCharacterEncoding( 070, "eight" );;
+ addCharacterEncoding( 0205, "ellipsis" );;
+ addCharacterEncoding( 0227, "emdash" );;
+ addCharacterEncoding( 0226, "endash" );;
+ addCharacterEncoding( 075, "equal" );;
+ addCharacterEncoding( 0360, "eth" );;
+ addCharacterEncoding( 041, "exclam" );;
+ addCharacterEncoding( 0241, "exclamdown" );;
+ addCharacterEncoding( 0146, "f" );;
+ addCharacterEncoding( 065, "five" );;
+ addCharacterEncoding( 0203, "florin" );;
+ addCharacterEncoding( 064, "four" );;
+ addCharacterEncoding( 0147, "g" );;
+ addCharacterEncoding( 0337, "germandbls" );;
+ addCharacterEncoding( 0140, "grave" );;
+ addCharacterEncoding( 076, "greater" );;
+ addCharacterEncoding( 0253, "guillemotleft" );;
+ addCharacterEncoding( 0273, "guillemotright" );;
+ addCharacterEncoding( 0213, "guilsinglleft" );;
+ addCharacterEncoding( 0233, "guilsinglright" );;
+ addCharacterEncoding( 0150, "h" );;
+ addCharacterEncoding( 055, "hyphen" );;
+ addCharacterEncoding( 0151, "i" );;
+ addCharacterEncoding( 0355, "iacute" );;
+ addCharacterEncoding( 0356, "icircumflex" );;
+ addCharacterEncoding( 0357, "idieresis" );;
+ addCharacterEncoding( 0354, "igrave" );;
+ addCharacterEncoding( 0152, "j" );;
+ addCharacterEncoding( 0153, "k" );;
+ addCharacterEncoding( 0154, "l" );;
+ addCharacterEncoding( 074, "less" );;
+ addCharacterEncoding( 0254, "logicalnot" );;
+ addCharacterEncoding( 0155, "m" );;
+ addCharacterEncoding( 0257, "macron" );;
+ addCharacterEncoding( 0265, "mu" );;
+ addCharacterEncoding( 0327, "multiply" );;
+ addCharacterEncoding( 0156, "n" );;
+ addCharacterEncoding( 071, "nine" );;
+ addCharacterEncoding( 0361, "ntilde" );;
+ addCharacterEncoding( 043, "numbersign" );;
+ addCharacterEncoding( 0157, "o" );;
+ addCharacterEncoding( 0363, "oacute" );;
+ addCharacterEncoding( 0364, "ocircumflex" );;
+ addCharacterEncoding( 0366, "odieresis" );;
+ addCharacterEncoding( 0234, "oe" );;
+ addCharacterEncoding( 0362, "ograve" );;
+ addCharacterEncoding( 061, "one" );;
+ addCharacterEncoding( 0275, "onehalf" );;
+ addCharacterEncoding( 0274, "onequarter" );;
+ addCharacterEncoding( 0271, "onesuperior" );;
+ addCharacterEncoding( 0252, "ordfeminine" );;
+ addCharacterEncoding( 0272, "ordmasculine" );;
+ addCharacterEncoding( 0370, "oslash" );;
+ addCharacterEncoding( 0365, "otilde" );;
+ addCharacterEncoding( 0160, "p" );;
+ addCharacterEncoding( 0266, "paragraph" );;
+ addCharacterEncoding( 050, "parenleft" );;
+ addCharacterEncoding( 051, "parenright" );;
+ addCharacterEncoding( 045, "percent" );;
+ addCharacterEncoding( 056, "period" );;
+ addCharacterEncoding( 0267, "periodcentered" );;
+ addCharacterEncoding( 0211, "perthousand" );;
+ addCharacterEncoding( 053, "plus" );;
+ addCharacterEncoding( 0261, "plusminus" );;
+ addCharacterEncoding( 0161, "q" );;
+ addCharacterEncoding( 077, "question" );;
+ addCharacterEncoding( 0277, "questiondown" );;
+ addCharacterEncoding( 042, "quotedbl" );;
+ addCharacterEncoding( 0204, "quotedblbase" );;
+ addCharacterEncoding( 0223, "quotedblleft" );;
+ addCharacterEncoding( 0224, "quotedblright" );;
+ addCharacterEncoding( 0221, "quoteleft" );;
+ addCharacterEncoding( 0222, "quoteright" );;
+ addCharacterEncoding( 0202, "quotesinglbase" );;
+ addCharacterEncoding( 047, "quotesingle" );;
+ addCharacterEncoding( 0162, "r" );;
+ addCharacterEncoding( 0256, "registered" );;
+ addCharacterEncoding( 0163, "s" );;
+ addCharacterEncoding( 0232, "scaron" );;
+ addCharacterEncoding( 0247, "section" );;
+ addCharacterEncoding( 073, "semicolon" );;
+ addCharacterEncoding( 067, "seven" );;
+ addCharacterEncoding( 066, "six" );;
+ addCharacterEncoding( 057, "slash" );;
+ addCharacterEncoding( 040, "space" );;
+ addCharacterEncoding( 0243, "sterling" );;
+ addCharacterEncoding( 0164, "t" );;
+ addCharacterEncoding( 0376, "thorn" );;
+ addCharacterEncoding( 063, "three" );;
+ addCharacterEncoding( 0276, "threequarters" );;
+ addCharacterEncoding( 0263, "threesuperior" );;
+ addCharacterEncoding( 0230, "tilde" );;
+ addCharacterEncoding( 0231, "trademark" );;
+ addCharacterEncoding( 062, "two" );;
+ addCharacterEncoding( 0262, "twosuperior" );;
+ addCharacterEncoding( 0165, "u" );;
+ addCharacterEncoding( 0372, "uacute" );;
+ addCharacterEncoding( 0373, "ucircumflex" );;
+ addCharacterEncoding( 0374, "udieresis" );;
+ addCharacterEncoding( 0371, "ugrave" );;
+ addCharacterEncoding( 0137, "underscore" );;
+ addCharacterEncoding( 0166, "v" );;
+ addCharacterEncoding( 0167, "w" );;
+ addCharacterEncoding( 0170, "x" );;
+ addCharacterEncoding( 0171, "y" );;
+ addCharacterEncoding( 0375, "yacute" );;
+ addCharacterEncoding( 0377, "ydieresis" );;
+ addCharacterEncoding( 0245, "yen" );;
+ addCharacterEncoding( 0172, "z" );;
+ addCharacterEncoding( 0236, "zcaron" );;
+ addCharacterEncoding( 060, "zero" );;
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java Sun Mar 28 17:57:19 2010
@@ -83,34 +83,34 @@ public abstract class PDFont implements
*/
private CMap cmap = null;
- private static Map<COSName, String> afmResources = null;
+ private static Map<String, String> afmResources = null;
private static Map<COSName, CMap> cmapObjects = null;
- private static Map<COSName, FontMetric> afmObjects = null;
+ private static Map<String, FontMetric> afmObjects = null;
static
{
//these are read-only once they are created
- afmResources = new HashMap<COSName, String>();
+ afmResources = new HashMap<String, String>();
//these are read-write
cmapObjects = Collections.synchronizedMap( new HashMap<COSName, CMap>() );
- afmObjects = Collections.synchronizedMap( new HashMap<COSName, FontMetric>() );
+ afmObjects = Collections.synchronizedMap( new HashMap<String, FontMetric>() );
- afmResources.put( COSName.getPDFName( "Courier-Bold" ), "Resources/afm/Courier-Bold.afm" );
- afmResources.put( COSName.getPDFName( "Courier-BoldOblique" ), "Resources/afm/Courier-BoldOblique.afm" );
- afmResources.put( COSName.getPDFName( "Courier" ), "Resources/afm/Courier.afm" );
- afmResources.put( COSName.getPDFName( "Courier-Oblique" ), "Resources/afm/Courier-Oblique.afm" );
- afmResources.put( COSName.getPDFName( "Helvetica" ), "Resources/afm/Helvetica.afm" );
- afmResources.put( COSName.getPDFName( "Helvetica-Bold" ), "Resources/afm/Helvetica-Bold.afm" );
- afmResources.put( COSName.getPDFName( "Helvetica-BoldOblique" ), "Resources/afm/Helvetica-BoldOblique.afm" );
- afmResources.put( COSName.getPDFName( "Helvetica-Oblique" ), "Resources/afm/Helvetica-Oblique.afm" );
- afmResources.put( COSName.getPDFName( "Symbol" ), "Resources/afm/Symbol.afm" );
- afmResources.put( COSName.getPDFName( "Times-Bold" ), "Resources/afm/Times-Bold.afm" );
- afmResources.put( COSName.getPDFName( "Times-BoldItalic" ), "Resources/afm/Times-BoldItalic.afm" );
- afmResources.put( COSName.getPDFName( "Times-Italic" ), "Resources/afm/Times-Italic.afm" );
- afmResources.put( COSName.getPDFName( "Times-Roman" ), "Resources/afm/Times-Roman.afm" );
- afmResources.put( COSName.getPDFName( "ZapfDingbats" ), "Resources/afm/ZapfDingbats.afm" );
+ afmResources.put( "Courier-Bold" , "Resources/afm/Courier-Bold.afm" );
+ afmResources.put( "Courier-BoldOblique" , "Resources/afm/Courier-BoldOblique.afm" );
+ afmResources.put( "Courier" , "Resources/afm/Courier.afm" );
+ afmResources.put( "Courier-Oblique" , "Resources/afm/Courier-Oblique.afm" );
+ afmResources.put( "Helvetica" , "Resources/afm/Helvetica.afm" );
+ afmResources.put( "Helvetica-Bold" , "Resources/afm/Helvetica-Bold.afm" );
+ afmResources.put( "Helvetica-BoldOblique" , "Resources/afm/Helvetica-BoldOblique.afm" );
+ afmResources.put( "Helvetica-Oblique" , "Resources/afm/Helvetica-Oblique.afm" );
+ afmResources.put( "Symbol" , "Resources/afm/Symbol.afm" );
+ afmResources.put( "Times-Bold" , "Resources/afm/Times-Bold.afm" );
+ afmResources.put( "Times-BoldItalic" , "Resources/afm/Times-BoldItalic.afm" );
+ afmResources.put( "Times-Italic" , "Resources/afm/Times-Italic.afm" );
+ afmResources.put( "Times-Roman" , "Resources/afm/Times-Roman.afm" );
+ afmResources.put( "ZapfDingbats" , "Resources/afm/ZapfDingbats.afm" );
}
/**
@@ -263,8 +263,8 @@ public abstract class PDFont implements
if( metric != null )
{
Encoding encoding = getEncoding();
- COSName characterName = encoding.getName( code );
- retval = metric.getCharacterWidth( characterName.getName() );
+ String characterName = encoding.getName( code );
+ retval = metric.getCharacterWidth( characterName );
}
return retval;
}
@@ -298,15 +298,20 @@ public abstract class PDFont implements
{
if(afm==null){
COSBase baseFont = font.getDictionaryObject( COSName.BASE_FONT );
- COSName name = null;
+ String name = null;
if( baseFont instanceof COSName )
{
- name = (COSName)baseFont;
+ name = ((COSName)baseFont).getName();
+ if (name.indexOf("+") > -1)
+ {
+ name = name.substring(name.indexOf("+")+1);
+ }
+
}
else if( baseFont instanceof COSString )
{
COSString string = (COSString)baseFont;
- name = COSName.getPDFName( string.getString() );
+ name = string.getString();
}
if( name != null )
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java Sun Mar 28 17:57:19 2010
@@ -97,8 +97,8 @@ public abstract class PDSimpleFont exten
if( metric != null )
{
Encoding encoding = getEncoding();
- COSName characterName = encoding.getName( code );
- retval = metric.getCharacterHeight( characterName.getName() );
+ String characterName = encoding.getName( code );
+ retval = metric.getCharacterHeight( characterName );
}
else
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1AfmPfbFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1AfmPfbFont.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1AfmPfbFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1AfmPfbFont.java Sun Mar 28 17:57:19 2010
@@ -151,19 +151,19 @@ public class PDType1AfmPfbFont extends P
int lastchar = 0;
// widths
- List listmetric = metric.getCharMetrics();
+ List<CharMetric> listmetric = metric.getCharMetrics();
Encoding encoding = getEncoding();
int maxWidths = 256;
- List widths = new ArrayList(maxWidths);
+ List<Number> widths = new ArrayList(maxWidths);
Integer zero = new Integer(250);
- Iterator iter = listmetric.iterator();
+ Iterator<CharMetric> iter = listmetric.iterator();
for( int i=0; i<maxWidths; i++ )
{
widths.add(zero);
}
while (iter.hasNext())
{
- CharMetric m = (CharMetric) iter.next();
+ CharMetric m = iter.next();
int n = m.getCharacterCode();
if (n > 0)
{
@@ -188,27 +188,27 @@ public class PDType1AfmPfbFont extends P
// so that I've to add them here by hand
if (m.getName().equals("adieresis"))
{
- widths.set(0344,(Float)widths.get(encoding.getCode(COSName.getPDFName( "a" ))));
+ widths.set(0344,(Float)widths.get(encoding.getCode("a")));
}
else if (m.getName().equals("odieresis"))
{
- widths.set(0366,(Float)widths.get(encoding.getCode(COSName.getPDFName( "o" ))));
+ widths.set(0366,(Float)widths.get(encoding.getCode("o")));
}
else if (m.getName().equals("udieresis"))
{
- widths.set(0374,(Float)widths.get(encoding.getCode(COSName.getPDFName( "u" ))));
+ widths.set(0374,(Float)widths.get(encoding.getCode("u")));
}
else if (m.getName().equals("Adieresis"))
{
- widths.set(0304,(Float)widths.get(encoding.getCode(COSName.getPDFName( "A" ))));
+ widths.set(0304,(Float)widths.get(encoding.getCode("A")));
}
else if (m.getName().equals("Odieresis"))
{
- widths.set(0326,(Float)widths.get(encoding.getCode(COSName.getPDFName( "O" ))));
+ widths.set(0326,(Float)widths.get(encoding.getCode("O")));
}
else if (m.getName().equals("Udieresis"))
{
- widths.set(0334,(Float)widths.get(encoding.getCode(COSName.getPDFName( "U" ))));
+ widths.set(0334,(Float)widths.get(encoding.getCode("U")));
}
}
}
@@ -229,7 +229,7 @@ public class PDType1AfmPfbFont extends P
array.add(COSInteger.ZERO);
for (int i = 0; i < 256; i++)
{
- array.add(encoding.getName(i));
+ array.add(COSName.getPDFName(encoding.getName(i)));
}
// my AFMPFB-Fonts has no character-codes for german umlauts
// so that I've to add them here by hand
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java Sun Mar 28 17:57:19 2010
@@ -357,7 +357,7 @@ public class PDType1CFont extends PDSimp
Integer code = (Integer)entry.getKey();
String name = (String)entry.getValue();
String uniName = "uni";
- String character = (String)nameToCharacter.get(COSName.getPDFName(name));
+ String character = (String)nameToCharacter.get(name);
if( character != null )
{
for( int j = 0; j < character.length(); j++ )
@@ -456,11 +456,11 @@ public class PDType1CFont extends PDSimp
Map<Integer,String> result = new LinkedHashMap<Integer,String>();
EncodingManager encodingManager = new EncodingManager();
Encoding encoding = encodingManager.getEncoding(name);
- for( Iterator<Map.Entry<Integer,COSName>> it = (encoding.getCodeToNameMap().entrySet()).iterator();
+ for( Iterator<Map.Entry<Integer,String>> it = (encoding.getCodeToNameMap().entrySet()).iterator();
it.hasNext();)
{
- Map.Entry<Integer,COSName> entry = it.next();
- result.put(entry.getKey(), (entry.getValue()).getName());
+ Map.Entry<Integer,String> entry = it.next();
+ result.put(entry.getKey(), (entry.getValue()));
}
return result;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDExtendedGraphicsState.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDExtendedGraphicsState.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDExtendedGraphicsState.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDExtendedGraphicsState.java Sun Mar 28 17:57:19 2010
@@ -27,7 +27,6 @@ import org.apache.pdfbox.pdmodel.common.
import java.io.IOException;
-import java.util.Iterator;
/**
* This class represents the graphics state dictionary that is stored in the PDF document.
@@ -38,24 +37,6 @@ import java.util.Iterator;
*/
public class PDExtendedGraphicsState implements COSObjectable
{
- private static final COSName LW = COSName.getPDFName( "LW" );
- private static final COSName LC = COSName.getPDFName( "LC" );
- private static final COSName LJ = COSName.getPDFName( "LJ" );
- private static final COSName ML = COSName.getPDFName( "ML" );
- private static final COSName D = COSName.getPDFName( "D" );
- private static final COSName RI = COSName.getPDFName( "RI" );
- private static final COSName OP = COSName.getPDFName( "OP" );
- private static final COSName OP_NS = COSName.getPDFName( "op" );
- private static final COSName OPM = COSName.getPDFName( "OPM" );
- private static final COSName FONT = COSName.getPDFName( "Font" );
- private static final COSName FL = COSName.getPDFName( "FL" );
- private static final COSName SM = COSName.getPDFName( "SM" );
- private static final COSName SA = COSName.getPDFName( "SA" );
- private static final COSName CA = COSName.getPDFName( "CA" );
- private static final COSName CA_NS = COSName.getPDFName( "ca" );
- private static final COSName AIS = COSName.getPDFName( "AIS" );
- private static final COSName TK = COSName.getPDFName( "TK" );
-
/**
* Rendering intent constants, see PDF Reference 1.5 Section 4.5.4 Rendering Intents.
*/
@@ -82,7 +63,7 @@ public class PDExtendedGraphicsState imp
public PDExtendedGraphicsState()
{
graphicsState = new COSDictionary();
- graphicsState.setItem( COSName.TYPE, COSName.getPDFName( "ExtGState" ) );
+ graphicsState.setItem( COSName.TYPE, COSName.EXT_G_STATE );
}
/**
@@ -106,64 +87,64 @@ public class PDExtendedGraphicsState imp
{
for( COSName key : graphicsState.keySet() )
{
- if( key.equals( LW ) )
+ if( key.equals( COSName.LW ) )
{
gs.setLineWidth( getLineWidth().doubleValue() );
}
- else if( key.equals( LC ) )
+ else if( key.equals( COSName.LC ) )
{
gs.setLineCap( getLineCapStyle() );
}
- else if( key.equals( LJ ) )
+ else if( key.equals( COSName.LJ ) )
{
gs.setLineJoin( getLineJoinStyle() );
}
- else if( key.equals( ML ) )
+ else if( key.equals( COSName.ML ) )
{
gs.setMiterLimit( getMiterLimit().doubleValue() );
}
- else if( key.equals( D ) )
+ else if( key.equals( COSName.D ) )
{
gs.setLineDashPattern( getLineDashPattern() );
}
- else if( key.equals( RI ) )
+ else if( key.equals( COSName.RI ) )
{
gs.setRenderingIntent( getRenderingIntent() );
}
- else if( key.equals( OPM ) )
+ else if( key.equals( COSName.OPM ) )
{
gs.setOverprintMode( getOverprintMode().doubleValue() );
}
- else if( key.equals( FONT ) )
+ else if( key.equals( COSName.FONT ) )
{
PDFontSetting setting = getFontSetting();
gs.getTextState().setFont( setting.getFont() );
gs.getTextState().setFontSize( setting.getFontSize() );
}
- else if( key.equals( FL ) )
+ else if( key.equals( COSName.FL ) )
{
gs.setFlatness( getFlatnessTolerance().floatValue() );
}
- else if( key.equals( SM ) )
+ else if( key.equals( COSName.SM ) )
{
gs.setSmoothness( getSmoothnessTolerance().floatValue() );
}
- else if( key.equals( SA ) )
+ else if( key.equals( COSName.SA ) )
{
gs.setStrokeAdjustment( getAutomaticStrokeAdjustment() );
}
- else if( key.equals( CA ) )
+ else if( key.equals( COSName.CA ) )
{
gs.setAlphaConstants( getStrokingAlpaConstant().floatValue() );
}/**
else if( key.equals( CA_NS ) )
{
}**/
- else if( key.equals( AIS ) )
+ else if( key.equals( COSName.AIS ) )
{
gs.setAlphaSource( getAlphaSourceFlag() );
}
- else if( key.equals( TK ) )
+ else if( key.equals( COSName.TK ) )
{
gs.getTextState().setKnockoutFlag( getTextKnockoutFlag() );
}
@@ -197,7 +178,7 @@ public class PDExtendedGraphicsState imp
*/
public Float getLineWidth()
{
- return getFloatItem( LW );
+ return getFloatItem( COSName.LW );
}
/**
@@ -207,7 +188,7 @@ public class PDExtendedGraphicsState imp
*/
public void setLineWidth( Float width )
{
- setFloatItem( LW, width );
+ setFloatItem( COSName.LW, width );
}
/**
@@ -217,7 +198,7 @@ public class PDExtendedGraphicsState imp
*/
public int getLineCapStyle()
{
- return graphicsState.getInt( LC );
+ return graphicsState.getInt( COSName.LC );
}
/**
@@ -227,7 +208,7 @@ public class PDExtendedGraphicsState imp
*/
public void setLineCapStyle( int style )
{
- graphicsState.setInt( LC, style );
+ graphicsState.setInt( COSName.LC, style );
}
/**
@@ -237,7 +218,7 @@ public class PDExtendedGraphicsState imp
*/
public int getLineJoinStyle()
{
- return graphicsState.getInt( LJ );
+ return graphicsState.getInt( COSName.LJ );
}
/**
@@ -247,7 +228,7 @@ public class PDExtendedGraphicsState imp
*/
public void setLineJoinStyle( int style )
{
- graphicsState.setInt( LJ, style );
+ graphicsState.setInt( COSName.LJ, style );
}
@@ -258,7 +239,7 @@ public class PDExtendedGraphicsState imp
*/
public Float getMiterLimit()
{
- return getFloatItem( ML );
+ return getFloatItem( COSName.ML );
}
/**
@@ -268,7 +249,7 @@ public class PDExtendedGraphicsState imp
*/
public void setMiterLimit( Float miterLimit )
{
- setFloatItem( ML, miterLimit );
+ setFloatItem( COSName.ML, miterLimit );
}
/**
@@ -279,7 +260,7 @@ public class PDExtendedGraphicsState imp
public PDLineDashPattern getLineDashPattern()
{
PDLineDashPattern retval = null;
- COSArray dp = (COSArray)graphicsState.getDictionaryObject( D );
+ COSArray dp = (COSArray)graphicsState.getDictionaryObject( COSName.D );
if( dp != null )
{
retval = new PDLineDashPattern( dp );
@@ -294,7 +275,7 @@ public class PDExtendedGraphicsState imp
*/
public void setLineDashPattern( PDLineDashPattern dashPattern )
{
- graphicsState.setItem( D, dashPattern.getCOSObject() );
+ graphicsState.setItem( COSName.D, dashPattern.getCOSObject() );
}
/**
@@ -324,7 +305,7 @@ public class PDExtendedGraphicsState imp
*/
public boolean getStrokingOverprintControl()
{
- return graphicsState.getBoolean( OP, false );
+ return graphicsState.getBoolean( COSName.OP, false );
}
/**
@@ -334,7 +315,7 @@ public class PDExtendedGraphicsState imp
*/
public void setStrokingOverprintControl( boolean op )
{
- graphicsState.setBoolean( OP, op );
+ graphicsState.setBoolean( COSName.OP, op );
}
/**
@@ -345,7 +326,7 @@ public class PDExtendedGraphicsState imp
*/
public boolean getNonStrokingOverprintControl()
{
- return graphicsState.getBoolean( OP_NS, getStrokingOverprintControl() );
+ return graphicsState.getBoolean( COSName.OP_NS, getStrokingOverprintControl() );
}
/**
@@ -355,7 +336,7 @@ public class PDExtendedGraphicsState imp
*/
public void setNonStrokingOverprintControl( boolean op )
{
- graphicsState.setBoolean( OP_NS, op );
+ graphicsState.setBoolean( COSName.OP_NS, op );
}
/**
@@ -365,7 +346,7 @@ public class PDExtendedGraphicsState imp
*/
public Float getOverprintMode()
{
- return getFloatItem( OPM );
+ return getFloatItem( COSName.OPM );
}
/**
@@ -375,7 +356,7 @@ public class PDExtendedGraphicsState imp
*/
public void setOverprintMode( Float overprintMode )
{
- setFloatItem( OPM, overprintMode );
+ setFloatItem( COSName.OPM, overprintMode );
}
/**
@@ -386,7 +367,7 @@ public class PDExtendedGraphicsState imp
public PDFontSetting getFontSetting()
{
PDFontSetting setting = null;
- COSArray font = (COSArray)graphicsState.getDictionaryObject( FONT );
+ COSArray font = (COSArray)graphicsState.getDictionaryObject( COSName.FONT );
if( font != null )
{
setting = new PDFontSetting( font );
@@ -401,7 +382,7 @@ public class PDExtendedGraphicsState imp
*/
public void setFontSetting( PDFontSetting fs )
{
- graphicsState.setItem( FONT, fs );
+ graphicsState.setItem( COSName.FONT, fs );
}
/**
@@ -411,7 +392,7 @@ public class PDExtendedGraphicsState imp
*/
public Float getFlatnessTolerance()
{
- return getFloatItem( FL );
+ return getFloatItem( COSName.FL );
}
/**
@@ -421,7 +402,7 @@ public class PDExtendedGraphicsState imp
*/
public void setFlatnessTolerance( Float flatness )
{
- setFloatItem( FL, flatness );
+ setFloatItem( COSName.FL, flatness );
}
/**
@@ -431,7 +412,7 @@ public class PDExtendedGraphicsState imp
*/
public Float getSmoothnessTolerance()
{
- return getFloatItem( SM );
+ return getFloatItem( COSName.SM );
}
/**
@@ -441,7 +422,7 @@ public class PDExtendedGraphicsState imp
*/
public void setSmoothnessTolerance( Float smoothness )
{
- setFloatItem( SM, smoothness );
+ setFloatItem( COSName.SM, smoothness );
}
/**
@@ -451,7 +432,7 @@ public class PDExtendedGraphicsState imp
*/
public boolean getAutomaticStrokeAdjustment()
{
- return graphicsState.getBoolean( SA,false );
+ return graphicsState.getBoolean( COSName.SA,false );
}
/**
@@ -461,7 +442,7 @@ public class PDExtendedGraphicsState imp
*/
public void setAutomaticStrokeAdjustment( boolean sa )
{
- graphicsState.setBoolean( SA, sa );
+ graphicsState.setBoolean( COSName.SA, sa );
}
/**
@@ -471,7 +452,7 @@ public class PDExtendedGraphicsState imp
*/
public Float getStrokingAlpaConstant()
{
- return getFloatItem( CA );
+ return getFloatItem( COSName.CA );
}
/**
@@ -481,7 +462,7 @@ public class PDExtendedGraphicsState imp
*/
public void setStrokingAlphaConstant( Float alpha )
{
- setFloatItem( CA, alpha );
+ setFloatItem( COSName.CA, alpha );
}
/**
@@ -491,7 +472,7 @@ public class PDExtendedGraphicsState imp
*/
public Float getNonStrokingAlpaConstant()
{
- return getFloatItem( CA_NS );
+ return getFloatItem( COSName.CA_NS );
}
/**
@@ -501,7 +482,7 @@ public class PDExtendedGraphicsState imp
*/
public void setNonStrokingAlphaConstant( Float alpha )
{
- setFloatItem( CA_NS, alpha );
+ setFloatItem( COSName.CA_NS, alpha );
}
/**
@@ -511,7 +492,7 @@ public class PDExtendedGraphicsState imp
*/
public boolean getAlphaSourceFlag()
{
- return graphicsState.getBoolean( AIS, false );
+ return graphicsState.getBoolean( COSName.AIS, false );
}
/**
@@ -521,7 +502,7 @@ public class PDExtendedGraphicsState imp
*/
public void setAlphaSourceFlag( boolean alpha )
{
- graphicsState.setBoolean( AIS, alpha );
+ graphicsState.setBoolean( COSName.AIS, alpha );
}
/**
@@ -531,7 +512,7 @@ public class PDExtendedGraphicsState imp
*/
public boolean getTextKnockoutFlag()
{
- return graphicsState.getBoolean( TK,true );
+ return graphicsState.getBoolean( COSName.TK,true );
}
/**
@@ -541,7 +522,7 @@ public class PDExtendedGraphicsState imp
*/
public void setTextKnockoutFlag( boolean tk )
{
- graphicsState.setBoolean( TK, tk );
+ graphicsState.setBoolean( COSName.TK, tk );
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDShading.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDShading.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDShading.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDShading.java Sun Mar 28 17:57:19 2010
@@ -84,7 +84,7 @@ public class PDShading implements COSObj
*/
public COSBase getCOSObject()
{
- return COSName.getPDFName( getName() );
+ return COSName.SHADING;
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalGray.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalGray.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalGray.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalGray.java Sun Mar 28 17:57:19 2010
@@ -51,7 +51,7 @@ public class PDCalGray extends PDColorSp
{
array = new COSArray();
dictionary = new COSDictionary();
- array.add( COSName.getPDFName( NAME ) );
+ array.add( COSName.CALGRAY );
array.add( dictionary );
}
@@ -133,7 +133,7 @@ public class PDCalGray extends PDColorSp
public float getGamma()
{
float retval = 1.0f;
- COSNumber gamma = (COSNumber)dictionary.getDictionaryObject( COSName.getPDFName( "Gamma" ) );
+ COSNumber gamma = (COSNumber)dictionary.getDictionaryObject( COSName.GAMMA );
if( gamma != null )
{
retval = gamma.floatValue();
@@ -148,7 +148,7 @@ public class PDCalGray extends PDColorSp
*/
public void setGamma( float value )
{
- dictionary.setItem( COSName.getPDFName( "Gamma" ), new COSFloat( value ) );
+ dictionary.setItem( COSName.GAMMA, new COSFloat( value ) );
}
/**
@@ -160,14 +160,14 @@ public class PDCalGray extends PDColorSp
*/
public PDTristimulus getWhitepoint()
{
- COSArray wp = (COSArray)dictionary.getDictionaryObject( COSName.getPDFName( "WhitePoint" ) );
+ COSArray wp = (COSArray)dictionary.getDictionaryObject( COSName.WHITE_POINT );
if( wp == null )
{
wp = new COSArray();
wp.add( new COSFloat( 1.0f ) );
wp.add( new COSFloat( 1.0f ) );
wp.add( new COSFloat( 1.0f ) );
- dictionary.setItem( COSName.getPDFName( "WhitePoint" ), wp );
+ dictionary.setItem( COSName.WHITE_POINT, wp );
}
return new PDTristimulus( wp );
}
@@ -183,7 +183,7 @@ public class PDCalGray extends PDColorSp
COSBase wpArray = wp.getCOSObject();
if( wpArray != null )
{
- dictionary.setItem( COSName.getPDFName( "WhitePoint" ), wpArray );
+ dictionary.setItem( COSName.WHITE_POINT, wpArray );
}
}
@@ -196,14 +196,14 @@ public class PDCalGray extends PDColorSp
*/
public PDTristimulus getBlackPoint()
{
- COSArray bp = (COSArray)dictionary.getDictionaryObject( COSName.getPDFName( "BlackPoint" ) );
+ COSArray bp = (COSArray)dictionary.getDictionaryObject( COSName.BLACK_POINT );
if( bp == null )
{
bp = new COSArray();
bp.add( new COSFloat( 0.0f ) );
bp.add( new COSFloat( 0.0f ) );
bp.add( new COSFloat( 0.0f ) );
- dictionary.setItem( COSName.getPDFName( "BlackPoint" ), bp );
+ dictionary.setItem( COSName.BLACK_POINT, bp );
}
return new PDTristimulus( bp );
}
@@ -221,6 +221,6 @@ public class PDCalGray extends PDColorSp
{
bpArray = bp.getCOSObject();
}
- dictionary.setItem( COSName.getPDFName( "BlackPoint" ), bpArray );
+ dictionary.setItem( COSName.BLACK_POINT, bpArray );
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java Sun Mar 28 17:57:19 2010
@@ -52,7 +52,7 @@ public class PDCalRGB extends PDColorSpa
{
array = new COSArray();
dictionary = new COSDictionary();
- array.add( COSName.getPDFName( NAME ) );
+ array.add( COSName.CALRGB );
array.add( dictionary );
}
@@ -132,14 +132,14 @@ public class PDCalRGB extends PDColorSpa
*/
public PDTristimulus getWhitepoint()
{
- COSArray wp = (COSArray)dictionary.getDictionaryObject( COSName.getPDFName( "WhitePoint" ) );
+ COSArray wp = (COSArray)dictionary.getDictionaryObject( COSName.WHITE_POINT );
if( wp == null )
{
wp = new COSArray();
wp.add( new COSFloat( 1.0f ) );
wp.add( new COSFloat( 1.0f ) );
wp.add( new COSFloat( 1.0f ) );
- dictionary.setItem( COSName.getPDFName( "WhitePoint" ), wp );
+ dictionary.setItem( COSName.WHITE_POINT, wp );
}
return new PDTristimulus( wp );
}
@@ -155,7 +155,7 @@ public class PDCalRGB extends PDColorSpa
COSBase wpArray = wp.getCOSObject();
if( wpArray != null )
{
- dictionary.setItem( COSName.getPDFName( "WhitePoint" ), wpArray );
+ dictionary.setItem( COSName.WHITE_POINT, wpArray );
}
}
@@ -168,14 +168,14 @@ public class PDCalRGB extends PDColorSpa
*/
public PDTristimulus getBlackPoint()
{
- COSArray bp = (COSArray)dictionary.getDictionaryObject( COSName.getPDFName( "BlackPoint" ) );
+ COSArray bp = (COSArray)dictionary.getDictionaryObject( COSName.BLACK_POINT );
if( bp == null )
{
bp = new COSArray();
bp.add( new COSFloat( 0.0f ) );
bp.add( new COSFloat( 0.0f ) );
bp.add( new COSFloat( 0.0f ) );
- dictionary.setItem( COSName.getPDFName( "BlackPoint" ), bp );
+ dictionary.setItem( COSName.BLACK_POINT, bp );
}
return new PDTristimulus( bp );
}
@@ -194,7 +194,7 @@ public class PDCalRGB extends PDColorSpa
{
bpArray = bp.getCOSObject();
}
- dictionary.setItem( COSName.getPDFName( "BlackPoint" ), bpArray );
+ dictionary.setItem( COSName.BLACK_POINT, bpArray );
}
/**
@@ -205,14 +205,14 @@ public class PDCalRGB extends PDColorSpa
*/
public PDGamma getGamma()
{
- COSArray gamma = (COSArray)dictionary.getDictionaryObject( COSName.getPDFName( "Gamma" ) );
+ COSArray gamma = (COSArray)dictionary.getDictionaryObject( COSName.GAMMA );
if( gamma == null )
{
gamma = new COSArray();
gamma.add( new COSFloat( 1.0f ) );
gamma.add( new COSFloat( 1.0f ) );
gamma.add( new COSFloat( 1.0f ) );
- dictionary.setItem( COSName.getPDFName( "Gamma" ), gamma );
+ dictionary.setItem( COSName.GAMMA, gamma );
}
return new PDGamma( gamma );
}
@@ -229,7 +229,7 @@ public class PDCalRGB extends PDColorSpa
{
gamma = value.getCOSArray();
}
- dictionary.setItem( COSName.getPDFName( "Gamma" ), gamma );
+ dictionary.setItem( COSName.GAMMA, gamma );
}
/**
@@ -242,7 +242,7 @@ public class PDCalRGB extends PDColorSpa
public PDMatrix getLinearInterpretation()
{
PDMatrix retval = null;
- COSArray matrix = (COSArray)dictionary.getDictionaryObject( COSName.getPDFName( "Matrix" ) );
+ COSArray matrix = (COSArray)dictionary.getDictionaryObject( COSName.MATRIX );
if( matrix == null )
{
retval = new PDMatrix();
@@ -268,6 +268,6 @@ public class PDCalRGB extends PDColorSpa
{
matrixArray = matrix.getCOSArray();
}
- dictionary.setItem( COSName.getPDFName( "Matrix" ), matrixArray );
+ dictionary.setItem( COSName.MATRIX, matrixArray );
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java Sun Mar 28 17:57:19 2010
@@ -52,7 +52,7 @@ public class PDDeviceN extends PDColorSp
public PDDeviceN()
{
array = new COSArray();
- array.add( COSName.getPDFName( NAME ) );
+ array.add( COSName.DEVICEN );
array.add( COSName.getPDFName( "" ) );
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNAttributes.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNAttributes.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNAttributes.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNAttributes.java Sun Mar 28 17:57:19 2010
@@ -78,11 +78,11 @@ public class PDDeviceNAttributes
public Map getColorants() throws IOException
{
Map actuals = new HashMap();
- COSDictionary colorants = (COSDictionary)dictionary.getDictionaryObject( COSName.getPDFName( "Colorants" ) );
+ COSDictionary colorants = (COSDictionary)dictionary.getDictionaryObject( COSName.COLORANTS );
if( colorants == null )
{
colorants = new COSDictionary();
- dictionary.setItem( COSName.getPDFName( "Colorants" ), colorants );
+ dictionary.setItem( COSName.COLORANTS, colorants );
}
for( COSName name : colorants.keySet() )
{
@@ -105,6 +105,6 @@ public class PDDeviceNAttributes
{
colorantDict = COSDictionaryMap.convert( colorants );
}
- dictionary.setItem( COSName.getPDFName( "Colorants" ), colorantDict );
+ dictionary.setItem( COSName.COLORANTS, colorantDict );
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java Sun Mar 28 17:57:19 2010
@@ -67,7 +67,7 @@ public class PDICCBased extends PDColorS
public PDICCBased( PDDocument doc )
{
array = new COSArray();
- array.add( COSName.getPDFName( NAME ) );
+ array.add( COSName.ICCBASED );
array.add( new PDStream( doc ) );
}
@@ -174,7 +174,7 @@ public class PDICCBased extends PDColorS
*/
public int getNumberOfComponents() throws IOException
{
- COSNumber n = (COSNumber)stream.getStream().getDictionaryObject( COSName.getPDFName( "N" ) );
+ COSNumber n = (COSNumber)stream.getStream().getDictionaryObject( COSName.N );
return n.intValue();
}
@@ -185,7 +185,7 @@ public class PDICCBased extends PDColorS
*/
public void setNumberOfComponents( int n )
{
- stream.getStream().setInt( COSName.getPDFName( "N" ), n );
+ stream.getStream().setInt( COSName.N, n );
}
/**
@@ -198,30 +198,30 @@ public class PDICCBased extends PDColorS
*/
public List getAlternateColorSpaces() throws IOException
{
- COSBase alternate = stream.getStream().getDictionaryObject( COSName.getPDFName( "Alternate" ) );
+ COSBase alternate = stream.getStream().getDictionaryObject( COSName.ALTERNATE );
COSArray alternateArray = null;
if( alternate == null )
{
alternateArray = new COSArray();
int numComponents = getNumberOfComponents();
- String csName = null;
+ COSName csName = null;
if( numComponents == 1 )
{
- csName = PDDeviceGray.NAME;
+ csName = COSName.DEVICEGRAY;
}
else if( numComponents == 3 )
{
- csName = PDDeviceRGB.NAME;
+ csName = COSName.DEVICERGB;
}
else if( numComponents == 4 )
{
- csName = PDDeviceCMYK.NAME;
+ csName = COSName.DEVICECMYK;
}
else
{
throw new IOException( "Unknown colorspace number of components:" + numComponents );
}
- alternateArray.add( COSName.getPDFName( csName ) );
+ alternateArray.add( csName );
}
else
{
@@ -261,16 +261,16 @@ public class PDICCBased extends PDColorS
{
altArray = COSArrayList.converterToCOSArray( list );
}
- stream.getStream().setItem( COSName.getPDFName( "Alternate" ), altArray );
+ stream.getStream().setItem( COSName.ALTERNATE, altArray );
}
private COSArray getRangeArray( int n )
{
- COSArray rangeArray = (COSArray)stream.getStream().getDictionaryObject( COSName.getPDFName( "Range" ) );
+ COSArray rangeArray = (COSArray)stream.getStream().getDictionaryObject( COSName.RANGE);
if( rangeArray == null )
{
rangeArray = new COSArray();
- stream.getStream().setItem( COSName.getPDFName( "Range" ), rangeArray );
+ stream.getStream().setItem( COSName.RANGE, rangeArray );
while( rangeArray.size() < n*2 )
{
rangeArray.add( new COSFloat( -100 ) );
@@ -316,7 +316,7 @@ public class PDICCBased extends PDColorS
*/
public COSStream getMetadata()
{
- return (COSStream)stream.getStream().getDictionaryObject( COSName.getPDFName( "Metadata" ) );
+ return (COSStream)stream.getStream().getDictionaryObject( COSName.METADATA );
}
/**
@@ -326,7 +326,7 @@ public class PDICCBased extends PDColorS
*/
public void setMetadata( COSStream metadata )
{
- stream.getStream().setItem( COSName.getPDFName( "Metadata" ), metadata );
+ stream.getStream().setItem( COSName.METADATA, metadata );
}
// Need more info on the ICCBased ones ... Array contains very little.
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDIndexed.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDIndexed.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDIndexed.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDIndexed.java Sun Mar 28 17:57:19 2010
@@ -60,8 +60,8 @@ public class PDIndexed extends PDColorSp
public PDIndexed()
{
array = new COSArray();
- array.add( COSName.getPDFName( NAME ) );
- array.add( COSName.getPDFName( PDDeviceRGB.NAME ) );
+ array.add( COSName.INDEXED );
+ array.add( COSName.DEVICERGB );
array.add( COSInteger.get( 255 ) );
array.add( org.apache.pdfbox.cos.COSNull.NULL );
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDLab.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDLab.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDLab.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDLab.java Sun Mar 28 17:57:19 2010
@@ -52,7 +52,7 @@ public class PDLab extends PDColorSpace
{
array = new COSArray();
dictionary = new COSDictionary();
- array.add( COSName.getPDFName( NAME ) );
+ array.add( COSName.LAB );
array.add( dictionary );
}
@@ -136,14 +136,14 @@ public class PDLab extends PDColorSpace
*/
public PDTristimulus getWhitepoint()
{
- COSArray wp = (COSArray)dictionary.getDictionaryObject( COSName.getPDFName( "WhitePoint" ) );
+ COSArray wp = (COSArray)dictionary.getDictionaryObject( COSName.WHITE_POINT );
if( wp == null )
{
wp = new COSArray();
wp.add( new COSFloat( 1.0f ) );
wp.add( new COSFloat( 1.0f ) );
wp.add( new COSFloat( 1.0f ) );
- dictionary.setItem( COSName.getPDFName( "WhitePoint" ), wp );
+ dictionary.setItem( COSName.WHITE_POINT, wp );
}
return new PDTristimulus( wp );
}
@@ -159,7 +159,7 @@ public class PDLab extends PDColorSpace
COSBase wpArray = wp.getCOSObject();
if( wpArray != null )
{
- dictionary.setItem( COSName.getPDFName( "WhitePoint" ), wpArray );
+ dictionary.setItem( COSName.WHITE_POINT, wpArray );
}
}
@@ -172,14 +172,14 @@ public class PDLab extends PDColorSpace
*/
public PDTristimulus getBlackPoint()
{
- COSArray bp = (COSArray)dictionary.getDictionaryObject( COSName.getPDFName( "BlackPoint" ) );
+ COSArray bp = (COSArray)dictionary.getDictionaryObject( COSName.BLACK_POINT );
if( bp == null )
{
bp = new COSArray();
bp.add( new COSFloat( 0.0f ) );
bp.add( new COSFloat( 0.0f ) );
bp.add( new COSFloat( 0.0f ) );
- dictionary.setItem( COSName.getPDFName( "BlackPoint" ), bp );
+ dictionary.setItem( COSName.BLACK_POINT, bp );
}
return new PDTristimulus( bp );
}
@@ -198,16 +198,16 @@ public class PDLab extends PDColorSpace
{
bpArray = bp.getCOSObject();
}
- dictionary.setItem( COSName.getPDFName( "BlackPoint" ), bpArray );
+ dictionary.setItem( COSName.BLACK_POINT, bpArray );
}
private COSArray getRangeArray()
{
- COSArray range = (COSArray)dictionary.getDictionaryObject( COSName.getPDFName( "Range" ) );
+ COSArray range = (COSArray)dictionary.getDictionaryObject( COSName.RANGE );
if( range == null )
{
range = new COSArray();
- dictionary.setItem( COSName.getPDFName( "Range" ), array );
+ dictionary.setItem( COSName.RANGE, array );
range.add( new COSFloat( -100 ) );
range.add( new COSFloat( 100 ) );
range.add( new COSFloat( -100 ) );
@@ -247,7 +247,7 @@ public class PDLab extends PDColorSpace
{
rangeArray = range.getCOSArray();
}
- dictionary.setItem( COSName.getPDFName( "Range" ), rangeArray );
+ dictionary.setItem( COSName.RANGE, rangeArray );
}
/**
@@ -281,6 +281,6 @@ public class PDLab extends PDColorSpace
{
rangeArray = range.getCOSArray();
}
- dictionary.setItem( COSName.getPDFName( "Range" ), rangeArray );
+ dictionary.setItem( COSName.RANGE, rangeArray );
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java Sun Mar 28 17:57:19 2010
@@ -45,7 +45,7 @@ public class PDPattern extends PDColorSp
public PDPattern()
{
array = new COSArray();
- array.add( COSName.getPDFName( NAME ) );
+ array.add( COSName.PATTERN );
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java Sun Mar 28 17:57:19 2010
@@ -56,7 +56,7 @@ public class PDSeparation extends PDColo
public PDSeparation()
{
array = new COSArray();
- array.add( COSName.getPDFName( NAME ) );
+ array.add( COSName.SEPARATION );
array.add( COSName.getPDFName( "" ) );
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java Sun Mar 28 17:57:19 2010
@@ -93,7 +93,7 @@ public class PDCcitt extends PDXObjectIm
dic.setItem( COSName.FILTER, COSName.CCITTFAX_DECODE);
dic.setItem( COSName.SUBTYPE, COSName.IMAGE);
- dic.setItem( COSName.TYPE, COSName.getPDFName( "XObject" ) );
+ dic.setItem( COSName.TYPE, COSName.XOBJECT );
dic.setItem( "DecodeParms", decodeParms);
setBitsPerComponent( 1 );
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDJpeg.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDJpeg.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDJpeg.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDJpeg.java Sun Mar 28 17:57:19 2010
@@ -78,7 +78,7 @@ public class PDJpeg extends PDXObjectIma
COSDictionary dic = getCOSStream();
dic.setItem( COSName.FILTER, COSName.DCT_DECODE );
dic.setItem( COSName.SUBTYPE, COSName.IMAGE);
- dic.setItem( COSName.TYPE, COSName.getPDFName( "XObject" ) );
+ dic.setItem( COSName.TYPE, COSName.XOBJECT );
BufferedImage image = getRGBImage();
if (image != null)
@@ -111,7 +111,7 @@ public class PDJpeg extends PDXObjectIma
COSDictionary dic = getCOSStream();
dic.setItem( COSName.FILTER, COSName.DCT_DECODE );
dic.setItem( COSName.SUBTYPE, COSName.IMAGE);
- dic.setItem( COSName.TYPE, COSName.getPDFName( "XObject" ) );
+ dic.setItem( COSName.TYPE, COSName.XOBJECT );
setBitsPerComponent( 8 );
setColorSpace( PDDeviceRGB.INSTANCE );
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java Sun Mar 28 17:57:19 2010
@@ -274,7 +274,7 @@ file.
{
base = cs.getCOSObject();
}
- getCOSStream().setItem( COSName.getPDFName( "ColorSpace" ), base );
+ getCOSStream().setItem( COSName.COLORSPACE, base );
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/ImageParameters.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/ImageParameters.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/ImageParameters.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/ImageParameters.java Sun Mar 28 17:57:19 2010
@@ -69,17 +69,17 @@ public class ImageParameters
return dictionary;
}
- private COSBase getCOSObject( String abbreviatedName, String name )
+ private COSBase getCOSObject( COSName abbreviatedName, COSName name )
{
- COSBase retval = dictionary.getDictionaryObject( COSName.getPDFName( abbreviatedName ) );
+ COSBase retval = dictionary.getDictionaryObject( abbreviatedName );
if( retval == null )
{
- retval = dictionary.getDictionaryObject( COSName.getPDFName( name ) );
+ retval = dictionary.getDictionaryObject( name );
}
return retval;
}
- private int getNumberOrNegativeOne( String abbreviatedName, String name )
+ private int getNumberOrNegativeOne( COSName abbreviatedName, COSName name )
{
int retval = -1;
COSNumber number = (COSNumber)getCOSObject( abbreviatedName, name );
@@ -98,7 +98,7 @@ public class ImageParameters
*/
public int getBitsPerComponent()
{
- return getNumberOrNegativeOne( "BPC", "BitsPerComponent" );
+ return getNumberOrNegativeOne( COSName.BPC, COSName.BITS_PER_COMPONENT );
}
/**
@@ -108,7 +108,7 @@ public class ImageParameters
*/
public void setBitsPerComponent( int bpc )
{
- dictionary.setInt( COSName.getPDFName( "BPC" ), bpc );
+ dictionary.setInt( COSName.BPC, bpc );
}
@@ -135,7 +135,7 @@ public class ImageParameters
*/
public PDColorSpace getColorSpace( Map colorSpaces ) throws IOException
{
- COSBase cs = getCOSObject( "CS", "ColorSpace" );
+ COSBase cs = getCOSObject( COSName.CS, COSName.COLORSPACE );
PDColorSpace retval = null;
if( cs != null )
{
@@ -156,7 +156,7 @@ public class ImageParameters
{
base = cs.getCOSObject();
}
- dictionary.setItem( COSName.getPDFName( "CS" ), base );
+ dictionary.setItem( COSName.CS, base );
}
/**
@@ -167,7 +167,7 @@ public class ImageParameters
*/
public int getHeight()
{
- return getNumberOrNegativeOne( "H", "Height" );
+ return getNumberOrNegativeOne( COSName.H, COSName.HEIGHT );
}
/**
@@ -177,7 +177,7 @@ public class ImageParameters
*/
public void setHeight( int h )
{
- dictionary.setInt( COSName.getPDFName( "H" ), h );
+ dictionary.setInt( COSName.H, h );
}
/**
@@ -188,7 +188,7 @@ public class ImageParameters
*/
public int getWidth()
{
- return getNumberOrNegativeOne( "W", "Width" );
+ return getNumberOrNegativeOne( COSName.W, COSName.WIDTH );
}
/**
@@ -198,7 +198,7 @@ public class ImageParameters
*/
public void setWidth( int w )
{
- dictionary.setInt( COSName.getPDFName( "W" ), w );
+ dictionary.setInt( COSName.W, w );
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java Sun Mar 28 17:57:19 2010
@@ -197,27 +197,26 @@ public class PDFMergerUtility
}
COSArray destThreads = (COSArray)destCatalog.getCOSDictionary().getDictionaryObject(
- COSName.getPDFName( "Threads" ));
+ COSName.THREADS);
COSArray srcThreads = (COSArray)cloneForNewDocument(
destination,
- destCatalog.getCOSDictionary().getDictionaryObject( COSName.getPDFName( "Threads" )));
+ destCatalog.getCOSDictionary().getDictionaryObject( COSName.THREADS ));
if( destThreads == null )
{
- destCatalog.getCOSDictionary().setItem( COSName.getPDFName( "Threads" ), srcThreads );
+ destCatalog.getCOSDictionary().setItem( COSName.THREADS, srcThreads );
}
else
{
destThreads.addAll( srcThreads );
}
- COSName names = COSName.getPDFName( "Names" );
PDDocumentNameDictionary destNames = destCatalog.getNames();
PDDocumentNameDictionary srcNames = srcCatalog.getNames();
if( srcNames != null )
{
if( destNames == null )
{
- destCatalog.getCOSDictionary().setItem( names, cloneForNewDocument( destination, srcNames ) );
+ destCatalog.getCOSDictionary().setItem( COSName.NAMES, cloneForNewDocument( destination, srcNames ) );
}
else
{
@@ -252,9 +251,8 @@ public class PDFMergerUtility
destCatalog.setPageMode( srcPageMode );
}
- COSName pageLabels = COSName.getPDFName( "PageLabels" );
- COSDictionary destLabels = (COSDictionary)destCatalog.getCOSDictionary().getDictionaryObject( pageLabels );
- COSDictionary srcLabels = (COSDictionary)srcCatalog.getCOSDictionary().getDictionaryObject( pageLabels );
+ COSDictionary destLabels = (COSDictionary)destCatalog.getCOSDictionary().getDictionaryObject( COSName.PAGE_LABELS );
+ COSDictionary srcLabels = (COSDictionary)srcCatalog.getCOSDictionary().getDictionaryObject( COSName.PAGE_LABELS );
if( srcLabels != null )
{
int destPageCount = destination.getNumberOfPages();
@@ -263,14 +261,14 @@ public class PDFMergerUtility
{
destLabels = new COSDictionary();
destNums = new COSArray();
- destLabels.setItem( COSName.getPDFName( "Nums" ), destNums );
- destCatalog.getCOSDictionary().setItem( pageLabels, destLabels );
+ destLabels.setItem( COSName.NUMS, destNums );
+ destCatalog.getCOSDictionary().setItem( COSName.PAGE_LABELS, destLabels );
}
else
{
- destNums = (COSArray)destLabels.getDictionaryObject( COSName.getPDFName( "Nums" ) );
+ destNums = (COSArray)destLabels.getDictionaryObject( COSName.NUMS );
}
- COSArray srcNums = (COSArray)srcLabels.getDictionaryObject( COSName.getPDFName( "Nums" ) );
+ COSArray srcNums = (COSArray)srcLabels.getDictionaryObject( COSName.NUMS );
if (srcNums != null)
{
for( int i=0; i<srcNums.size(); i+=2 )
@@ -283,15 +281,14 @@ public class PDFMergerUtility
}
}
- COSName metadata = COSName.getPDFName( "Metadata" );
- COSStream destMetadata = (COSStream)destCatalog.getCOSDictionary().getDictionaryObject( metadata );
- COSStream srcMetadata = (COSStream)srcCatalog.getCOSDictionary().getDictionaryObject( metadata );
+ COSStream destMetadata = (COSStream)destCatalog.getCOSDictionary().getDictionaryObject( COSName.METADATA );
+ COSStream srcMetadata = (COSStream)srcCatalog.getCOSDictionary().getDictionaryObject( COSName.METADATA );
if( destMetadata == null && srcMetadata != null )
{
PDStream newStream = new PDStream( destination, srcMetadata.getUnfilteredStream(), false );
newStream.getStream().mergeInto( srcMetadata );
newStream.addCompression();
- destCatalog.getCOSDictionary().setItem( metadata, newStream );
+ destCatalog.getCOSDictionary().setItem( COSName.METADATA, newStream );
}
//finally append the pages