[gs-commits] mupdf 1.16.1.31 java: Use Java-style array declarations.
[email protected] (Sebastian Rasmussen)
| Newsgroups | gmane.comp.printing.ghostscript.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit 586b356f771a519740a77db984217c86180dff88 Author: Sebastian Rasmussen <[email protected]> Date: Tue Sep 3 13:33:16 2019 +0200 java: Use Java-style array declarations. Previously C-style array declarations were used, tripping up lint. diff --git a/platform/java/example/TraceDevice.java b/platform/java/example/TraceDevice.java index 9bb9c71..3b87d17 100644 --- a/platform/java/example/TraceDevice.java +++ b/platform/java/example/TraceDevice.java @@ -4,7 +4,7 @@ import com.artifex.mupdf.fitz.*; public class TraceDevice extends Device implements PathWalker, TextWalker { - public String traceColor(ColorSpace cs, float color[], float alpha) { + public String traceColor(ColorSpace cs, float[] color, float alpha) { String s = cs + " ["; int i; for (i = 0; i < color.length; ++i) { @@ -51,12 +51,12 @@ public class TraceDevice extends Device implements PathWalker, TextWalker public void close() { } - public void fillPath(Path path, boolean evenOdd, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp) { + public void fillPath(Path path, boolean evenOdd, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp) { System.out.println("fillPath " + evenOdd + " " + ctm + " " + traceColor(cs, color, alpha)); tracePath(path); } - public void strokePath(Path path, StrokeState stroke, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp) { + public void strokePath(Path path, StrokeState stroke, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp) { System.out.println("strokePath " + traceStroke(stroke) + " " + ctm + " " + traceColor(cs, color, alpha)); tracePath(path); } @@ -71,12 +71,12 @@ public class TraceDevice extends Device implements PathWalker, TextWalker tracePath(path); } - public void fillText(Text text, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp) { + public void fillText(Text text, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp) { System.out.println("fillText " + ctm + " " + traceColor(cs, color, alpha)); traceText(text); } - public void strokeText(Text text, StrokeState stroke, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp) { + public void strokeText(Text text, StrokeState stroke, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp) { System.out.println("strokeText " + ctm + " " + traceStroke(stroke) + " " + traceColor(cs, color, alpha)); traceText(text); } @@ -104,7 +104,7 @@ public class TraceDevice extends Device implements PathWalker, TextWalker System.out.println("fillImage " + ctm + " " + alpha); } - public void fillImageMask(Image img, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp) { + public void fillImageMask(Image img, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp) { System.out.println("fillImageMask " + ctm + " " + traceColor(cs, color, alpha)); } @@ -116,7 +116,7 @@ public class TraceDevice extends Device implements PathWalker, TextWalker System.out.println("popClip"); } - public void beginMask(Rect rect, boolean luminosity, ColorSpace cs, float bc[], int cp) { + public void beginMask(Rect rect, boolean luminosity, ColorSpace cs, float[] bc, int cp) { System.out.println("beginMask r=" + rect + " l=" + luminosity + " " + traceColor(cs, bc, 1)); diff --git a/platform/java/example/Viewer.java b/platform/java/example/Viewer.java index 200eb2e..b0d6a53 100644 --- a/platform/java/example/Viewer.java +++ b/platform/java/example/Viewer.java @@ -32,7 +32,7 @@ public class Viewer extends Frame implements WindowListener, ActionListener, Ite protected TextField searchField; protected Button searchPrevButton, searchNextButton; protected int searchHitPage = -1; - protected Quad searchHits[]; + protected Quad[] searchHits; protected List outlineList; protected Vector<Outline> flatOutline; @@ -45,7 +45,7 @@ public class Viewer extends Frame implements WindowListener, ActionListener, Ite protected int layoutEm = 12; protected float pixelScale; - protected static final int zoomList[] = { + protected static final int[] zoomList = { 18, 24, 36, 54, 72, 96, 120, 144, 180, 216, 288 }; diff --git a/platform/java/src/com/artifex/mupdf/fitz/Device.java b/platform/java/src/com/artifex/mupdf/fitz/Device.java index d56a41a..e8d6348 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/Device.java +++ b/platform/java/src/com/artifex/mupdf/fitz/Device.java @@ -38,21 +38,21 @@ abstract public class Device */ abstract public void close(); - abstract public void fillPath(Path path, boolean evenOdd, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); - abstract public void strokePath(Path path, StrokeState stroke, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); + abstract public void fillPath(Path path, boolean evenOdd, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp); + abstract public void strokePath(Path path, StrokeState stroke, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp); abstract public void clipPath(Path path, boolean evenOdd, Matrix ctm); abstract public void clipStrokePath(Path path, StrokeState stroke, Matrix ctm); - abstract public void fillText(Text text, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); - abstract public void strokeText(Text text, StrokeState stroke, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); + abstract public void fillText(Text text, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp); + abstract public void strokeText(Text text, StrokeState stroke, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp); abstract public void clipText(Text text, Matrix ctm); abstract public void clipStrokeText(Text text, StrokeState stroke, Matrix ctm); abstract public void ignoreText(Text text, Matrix ctm); abstract public void fillShade(Shade shd, Matrix ctm, float alpha, int cp); abstract public void fillImage(Image img, Matrix ctm, float alpha, int cp); - abstract public void fillImageMask(Image img, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); + abstract public void fillImageMask(Image img, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp); abstract public void clipImageMask(Image img, Matrix ctm); abstract public void popClip(); - abstract public void beginMask(Rect area, boolean luminosity, ColorSpace cs, float bc[], int cp); + abstract public void beginMask(Rect area, boolean luminosity, ColorSpace cs, float[] bc, int cp); abstract public void endMask(); abstract public void beginGroup(Rect area, ColorSpace cs, boolean isolated, boolean knockout, int blendmode, float alpha); abstract public void endGroup(); diff --git a/platform/java/src/com/artifex/mupdf/fitz/Document.java b/platform/java/src/com/artifex/mupdf/fitz/Document.java index 16d031e..f957ab6 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/Document.java +++ b/platform/java/src/com/artifex/mupdf/fitz/Document.java @@ -25,14 +25,14 @@ public class Document } protected native static Document openNativeWithPath(String filename); - protected native static Document openNativeWithBuffer(byte buffer[], String magic); + protected native static Document openNativeWithBuffer(byte[] buffer, String magic); protected native static Document openNativeWithStream(SeekableInputStream stream, String mimeType); public static Document openDocument(String filename) { return openNativeWithPath(filename); } - public static Document openDocument(byte buffer[], String magic) { + public static Document openDocument(byte[] buffer, String magic) { return openNativeWithBuffer(buffer, magic); } diff --git a/platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java b/platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java index 177bea0..557ee30 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java +++ b/platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java @@ -23,26 +23,26 @@ public class NativeDevice extends Device public native final void close(); - public native final void fillPath(Path path, boolean evenOdd, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); - public native final void strokePath(Path path, StrokeState stroke, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); + public native final void fillPath(Path path, boolean evenOdd, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp); + public native final void strokePath(Path path, StrokeState stroke, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp); public native final void clipPath(Path path, boolean evenOdd, Matrix ctm); public native final void clipStrokePath(Path path, StrokeState stroke, Matrix ctm); - public native final void fillText(Text text, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); - public native final void strokeText(Text text, StrokeState stroke, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); + public native final void fillText(Text text, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp); + public native final void strokeText(Text text, StrokeState stroke, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp); public native final void clipText(Text text, Matrix ctm); public native final void clipStrokeText(Text text, StrokeState stroke, Matrix ctm); public native final void ignoreText(Text text, Matrix ctm); public native final void fillShade(Shade shd, Matrix ctm, float alpha, int cp); public native final void fillImage(Image img, Matrix ctm, float alpha, int cp); - public native final void fillImageMask(Image img, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); + public native final void fillImageMask(Image img, Matrix ctm, ColorSpace cs, float[] color, float alpha, int cp); /* FIXME: Why no scissor? */ public native final void clipImageMask(Image img, Matrix ctm); public native final void popClip(); - public native final void beginMask(Rect rect, boolean luminosity, ColorSpace cs, float bc[], int cp); + public native final void beginMask(Rect rect, boolean luminosity, ColorSpace cs, float[] bc, int cp); public native final void endMask(); public native final void beginGroup(Rect rect, ColorSpace cs, boolean isolated, boolean knockout, int blendmode, float alpha); public native final void endGroup(); diff --git a/platform/java/src/com/artifex/mupdf/fitz/Outline.java b/platform/java/src/com/artifex/mupdf/fitz/Outline.java index eb30482..f230118 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/Outline.java +++ b/platform/java/src/com/artifex/mupdf/fitz/Outline.java @@ -5,7 +5,7 @@ public class Outline public String title; public String uri; public int page; - public Outline down[]; + public Outline[] down; public float x; public float y; diff --git a/platform/java/src/com/artifex/mupdf/fitz/StrokeState.java b/platform/java/src/com/artifex/mupdf/fitz/StrokeState.java index c835180..949def0 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/StrokeState.java +++ b/platform/java/src/com/artifex/mupdf/fitz/StrokeState.java @@ -26,7 +26,7 @@ public class StrokeState } private native long newNative(int startCap, int dashCap, int endCap, int lineJoin, float lineWidth, float miterLimit, - float dashPhase, float dash[]); + float dashPhase, float[] dash); // Private constructor for the C to use. Any objects created by the // C are done for purposes of calling back to a java device, and @@ -42,7 +42,7 @@ public class StrokeState } public StrokeState(int startCap, int dashCap, int endCap, int lineJoin, float lineWidth, float miterLimit, - float dashPhase, float dash[]) { + float dashPhase, float[] dash) { pointer = newNative(startCap, dashCap, endCap, lineJoin, lineWidth, miterLimit, dashPhase, dash); } http://git.ghostscript.com/?p=mupdf.git;a=commit;h=586b356f771a519740a77db984217c86180dff88 -- MuPDF library Artifex Software, Inc.