diff --git a/print/pdf-renderer/files/patch-nbproject_project.properties b/print/pdf-renderer/files/patch-nbproject_project.properties index 6cd611b74e58..a4471166685e 100644 --- a/print/pdf-renderer/files/patch-nbproject_project.properties +++ b/print/pdf-renderer/files/patch-nbproject_project.properties @@ -1,10 +1,21 @@ ---- nbproject/project.properties.orig 2008-11-21 17:46:37.000000000 +0100 -+++ nbproject/project.properties 2008-11-21 17:47:11.000000000 +0100 -@@ -45,6 +45,7 @@ +--- nbproject/project.properties.orig 2011-09-15 09:33:54 UTC ++++ nbproject/project.properties +@@ -36,8 +36,8 @@ javac.deprecation=false + # Space-separated list of extra javac options + javac.compilerargs= + javac.deprecation=false +-javac.source=1.5 +-javac.target=1.5 ++javac.source=1.8 ++javac.target=1.8 + javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ +@@ -50,6 +50,7 @@ javadoc.private=false javadoc.nonavbar=false javadoc.notree=false javadoc.private=false +javadoc.srcpath=${src.dir} javadoc.splitindex=true javadoc.use=true javadoc.version=false diff --git a/print/pdf-renderer/files/patch-src_com_sun_pdfview_colorspace_PDFColorSpace.java b/print/pdf-renderer/files/patch-src_com_sun_pdfview_colorspace_PDFColorSpace.java index f6996492d4c4..c383dc3b220c 100644 --- a/print/pdf-renderer/files/patch-src_com_sun_pdfview_colorspace_PDFColorSpace.java +++ b/print/pdf-renderer/files/patch-src_com_sun_pdfview_colorspace_PDFColorSpace.java @@ -1,27 +1,27 @@ ---- ./src/com/sun/pdfview/colorspace/PDFColorSpace.java.orig 2011-11-17 09:12:43.000000000 +0100 -+++ ./src/com/sun/pdfview/colorspace/PDFColorSpace.java 2011-11-17 09:12:53.000000000 +0100 -@@ -161,7 +161,13 @@ +--- src/com/sun/pdfview/colorspace/PDFColorSpace.java.orig 2011-09-15 09:33:56 UTC ++++ src/com/sun/pdfview/colorspace/PDFColorSpace.java +@@ -161,7 +161,13 @@ public class PDFColorSpace { PDFObject[] ary = csobj.getArray(); name = ary[0].getStringValue(); - if (name.equals("CalGray")) { + if (name.equals("DeviceGray") || name.equals("G")) { + return getColorSpace(COLORSPACE_GRAY); + } else if (name.equals("DeviceRGB") || name.equals("RGB")) { + return getColorSpace(COLORSPACE_RGB); + } else if (name.equals("DeviceCMYK") || name.equals("CMYK")) { + return getColorSpace(COLORSPACE_CMYK); + } else if (name.equals("CalGray")) { value = new PDFColorSpace(new CalGrayColor(ary[1])); } else if (name.equals("CalRGB")) { value = new PDFColorSpace(new CalRGBColor(ary[1])); -@@ -194,8 +200,7 @@ +@@ -194,8 +200,7 @@ public class PDFColorSpace { return new PatternSpace(base); } else { - throw new PDFParseException("Unknown color space: " + name + - " with " + ary[1]); + throw new PDFParseException("Unknown color space: " + name); } csobj.setCache(value);