You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2018/06/09 13:59:10 UTC
svn commit: r1833238 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendMode.java
Author: tilman
Date: Sat Jun 9 13:59:10 2018
New Revision: 1833238
URL: http://svn.apache.org/viewvc?rev=1833238&view=rev
Log:
PDFBOX-4071: move according to java coding convention
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendMode.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendMode.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendMode.java?rev=1833238&r1=1833237&r2=1833238&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendMode.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendMode.java Sat Jun 9 13:59:10 2018
@@ -30,39 +30,6 @@ import java.util.Map;
*/
public abstract class BlendMode
{
- /**
- * Determines the blend mode from the BM entry in the COS ExtGState.
- *
- * @param cosBlendMode name or array
- * @return blending mode
- */
- public static BlendMode getInstance(COSBase cosBlendMode)
- {
- BlendMode result = null;
- if (cosBlendMode instanceof COSName)
- {
- result = BLEND_MODES.get(cosBlendMode);
- }
- else if (cosBlendMode instanceof COSArray)
- {
- COSArray cosBlendModeArray = (COSArray) cosBlendMode;
- for (int i = 0; i < cosBlendModeArray.size(); i++)
- {
- result = BLEND_MODES.get(cosBlendModeArray.getObject(i));
- if (result != null)
- {
- break;
- }
- }
- }
-
- if (result != null)
- {
- return result;
- }
- return BlendMode.NORMAL;
- }
-
public static final SeparableBlendMode NORMAL = new SeparableBlendMode()
{
@Override
@@ -240,10 +207,46 @@ public abstract class BlendMode
}
};
+ // these maps *must* come after the BlendMode.* constant declarations, otherwise their values would be null
+ private static final Map<COSName, BlendMode> BLEND_MODES = createBlendModeMap();
+
BlendMode()
{
}
+ /**
+ * Determines the blend mode from the BM entry in the COS ExtGState.
+ *
+ * @param cosBlendMode name or array
+ * @return blending mode
+ */
+ public static BlendMode getInstance(COSBase cosBlendMode)
+ {
+ BlendMode result = null;
+ if (cosBlendMode instanceof COSName)
+ {
+ result = BLEND_MODES.get(cosBlendMode);
+ }
+ else if (cosBlendMode instanceof COSArray)
+ {
+ COSArray cosBlendModeArray = (COSArray) cosBlendMode;
+ for (int i = 0; i < cosBlendModeArray.size(); i++)
+ {
+ result = BLEND_MODES.get(cosBlendModeArray.getObject(i));
+ if (result != null)
+ {
+ break;
+ }
+ }
+ }
+
+ if (result != null)
+ {
+ return result;
+ }
+ return BlendMode.NORMAL;
+ }
+
private static int get255Value(float val)
{
return (int) Math.floor(val >= 1.0 ? 255 : val * 255.0);
@@ -369,9 +372,6 @@ public abstract class BlendMode
result[2] = b / 255.0f;
}
- // these maps *must* come after the BlendMode.* constant declarations, otherwise their values would be null
- private static final Map<COSName, BlendMode> BLEND_MODES = createBlendModeMap();
-
private static Map<COSName, BlendMode> createBlendModeMap()
{
Map<COSName, BlendMode> map = new HashMap<COSName, BlendMode>(13);