From ca8f110730ad5aadbc80a450a46de62c4004cbd1 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Thu, 22 Sep 2016 14:01:31 +0200 Subject: Clean up annotation enum names. Put them in the PDF name space and separate words with underscores. Remove redundant namespace prefixes in java constants. Device.FLAG_MASK rather than Device.FZ_DEVFLAG_MASK. Use namespace for PDF annotation flag enum. --- .../java/src/com/artifex/mupdf/fitz/Device.java | 64 +++++++++++----------- .../src/com/artifex/mupdf/fitz/StrokeState.java | 18 +++--- 2 files changed, 41 insertions(+), 41 deletions(-) (limited to 'platform/java/src') diff --git a/platform/java/src/com/artifex/mupdf/fitz/Device.java b/platform/java/src/com/artifex/mupdf/fitz/Device.java index 295226fe..bbb5ae3b 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/Device.java +++ b/platform/java/src/com/artifex/mupdf/fitz/Device.java @@ -61,44 +61,44 @@ public class Device public void endTile() {} /* Flags */ - public static final int FZ_DEVFLAG_MASK = 1; - public static final int FZ_DEVFLAG_COLOR = 2; - public static final int FZ_DEVFLAG_UNCACHEABLE = 4; - public static final int FZ_DEVFLAG_FILLCOLOR_UNDEFINED = 8; - public static final int FZ_DEVFLAG_STROKECOLOR_UNDEFINED = 16; - public static final int FZ_DEVFLAG_STARTCAP_UNDEFINED = 32; - public static final int FZ_DEVFLAG_DASHCAP_UNDEFINED = 64; - public static final int FZ_DEVFLAG_ENDCAP_UNDEFINED = 128; - public static final int FZ_DEVFLAG_LINEJOIN_UNDEFINED = 256; - public static final int FZ_DEVFLAG_MITERLIMIT_UNDEFINED = 512; - public static final int FZ_DEVFLAG_LINEWIDTH_UNDEFINED = 1024; + public static final int FLAG_MASK = 1; + public static final int FLAG_COLOR = 2; + public static final int FLAG_UNCACHEABLE = 4; + public static final int FLAG_FILLCOLOR_UNDEFINED = 8; + public static final int FLAG_STROKECOLOR_UNDEFINED = 16; + public static final int FLAG_STARTCAP_UNDEFINED = 32; + public static final int FLAG_DASHCAP_UNDEFINED = 64; + public static final int FLAG_ENDCAP_UNDEFINED = 128; + public static final int FLAG_LINEJOIN_UNDEFINED = 256; + public static final int FLAG_MITERLIMIT_UNDEFINED = 512; + public static final int FLAG_LINEWIDTH_UNDEFINED = 1024; /* PDF 1.4 -- standard separable */ - public static final int FZ_BLEND_NORMAL = 0; - public static final int FZ_BLEND_MULTIPLY = 1; - public static final int FZ_BLEND_SCREEN = 2; - public static final int FZ_BLEND_OVERLAY = 3; - public static final int FZ_BLEND_DARKEN = 4; - public static final int FZ_BLEND_LIGHTEN = 5; - public static final int FZ_BLEND_COLOR_DODGE = 6; - public static final int FZ_BLEND_COLOR_BURN = 7; - public static final int FZ_BLEND_HARD_LIGHT = 8; - public static final int FZ_BLEND_SOFT_LIGHT = 9; - public static final int FZ_BLEND_DIFFERENCE = 10; - public static final int FZ_BLEND_EXCLUSION = 11; + public static final int BLEND_NORMAL = 0; + public static final int BLEND_MULTIPLY = 1; + public static final int BLEND_SCREEN = 2; + public static final int BLEND_OVERLAY = 3; + public static final int BLEND_DARKEN = 4; + public static final int BLEND_LIGHTEN = 5; + public static final int BLEND_COLOR_DODGE = 6; + public static final int BLEND_COLOR_BURN = 7; + public static final int BLEND_HARD_LIGHT = 8; + public static final int BLEND_SOFT_LIGHT = 9; + public static final int BLEND_DIFFERENCE = 10; + public static final int BLEND_EXCLUSION = 11; /* PDF 1.4 -- standard non-separable */ - public static final int FZ_BLEND_HUE = 12; - public static final int FZ_BLEND_SATURATION = 13; - public static final int FZ_BLEND_COLOR = 14; - public static final int FZ_BLEND_LUMINOSITY = 15; + public static final int BLEND_HUE = 12; + public static final int BLEND_SATURATION = 13; + public static final int BLEND_COLOR = 14; + public static final int BLEND_LUMINOSITY = 15; /* For packing purposes */ - public static final int FZ_BLEND_MODEMASK = 15; - public static final int FZ_BLEND_ISOLATED = 16; - public static final int FZ_BLEND_KNOCKOUT = 32; + public static final int BLEND_MODEMASK = 15; + public static final int BLEND_ISOLATED = 16; + public static final int BLEND_KNOCKOUT = 32; /* Device hints */ - public static final int FZ_IGNORE_IMAGE = 1; - public static final int FZ_IGNORE_SHADE = 2; + public static final int IGNORE_IMAGE = 1; + public static final int IGNORE_SHADE = 2; } diff --git a/platform/java/src/com/artifex/mupdf/fitz/StrokeState.java b/platform/java/src/com/artifex/mupdf/fitz/StrokeState.java index 7f333f76..c29291fc 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/StrokeState.java +++ b/platform/java/src/com/artifex/mupdf/fitz/StrokeState.java @@ -2,15 +2,15 @@ package com.artifex.mupdf.fitz; public class StrokeState { - public static final int FZ_LINECAP_BUTT = 0; - public static final int FZ_LINECAP_ROUND = 1; - public static final int FZ_LINECAP_SQUARE = 2; - public static final int FZ_LINECAP_TRIANGLE = 3; - - public static final int FZ_LINEJOIN_MITER = 0; - public static final int FZ_LINEJOIN_ROUND = 1; - public static final int FZ_LINEJOIN_BEVEL = 2; - public static final int FZ_LINEJOIN_MITER_XPS = 3; + public static final int LINECAP_BUTT = 0; + public static final int LINECAP_ROUND = 1; + public static final int LINECAP_SQUARE = 2; + public static final int LINECAP_TRIANGLE = 3; + + public static final int LINEJOIN_MITER = 0; + public static final int LINEJOIN_ROUND = 1; + public static final int LINEJOIN_BEVEL = 2; + public static final int LINEJOIN_MITER_XPS = 3; private long pointer; -- cgit v1.2.3