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/05/25 18:36:04 UTC
svn commit: r1832263 - in /pdfbox/branches/2.0/pdfbox/src:
main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendMode.java
test/java/org/apache/pdfbox/pdmodel/graphics/blend/
test/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendModeTest.java
Author: tilman
Date: Fri May 25 18:36:03 2018
New Revision: 1832263
URL: http://svn.apache.org/viewvc?rev=1832263&view=rev
Log:
PDFBOX-4071: add test to protect initialization sequence; move constructor to top for Sonar; avoid COMPATIBLE returning blend mode that specification says "shouldn't be used"
Added:
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/blend/
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendModeTest.java (with props)
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=1832263&r1=1832262&r2=1832263&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 Fri May 25 18:36:03 2018
@@ -60,7 +60,7 @@ public abstract class BlendMode
{
return result;
}
- return BlendMode.COMPATIBLE;
+ return BlendMode.NORMAL;
}
public static final SeparableBlendMode NORMAL = new SeparableBlendMode()
@@ -240,6 +240,10 @@ public abstract class BlendMode
}
};
+ BlendMode()
+ {
+ }
+
private static int get255Value(float val)
{
return (int) Math.floor(val >= 1.0 ? 255 : val * 255.0);
@@ -365,14 +369,15 @@ public abstract class BlendMode
result[2] = b / 255.0f;
}
- // this map *must* come after the declarations above, otherwise its values will be null
+ // 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);
map.put(COSName.NORMAL, BlendMode.NORMAL);
- map.put(COSName.COMPATIBLE, BlendMode.COMPATIBLE);
+ // BlendMode.COMPATIBLE should not be used
+ map.put(COSName.COMPATIBLE, BlendMode.NORMAL);
map.put(COSName.MULTIPLY, BlendMode.MULTIPLY);
map.put(COSName.SCREEN, BlendMode.SCREEN);
map.put(COSName.OVERLAY, BlendMode.OVERLAY);
@@ -390,8 +395,4 @@ public abstract class BlendMode
map.put(COSName.COLOR, BlendMode.COLOR);
return map;
}
-
- BlendMode()
- {
- }
}
Added: pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendModeTest.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendModeTest.java?rev=1832263&view=auto
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendModeTest.java (added)
+++ pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendModeTest.java Fri May 25 18:36:03 2018
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License")); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pdfbox.pdmodel.graphics.blend;
+
+import static junit.framework.TestCase.assertEquals;
+import org.apache.pdfbox.cos.COSName;
+import org.junit.Test;
+
+/**
+ *
+ * @author Tilman Hausherr
+ */
+public class BlendModeTest
+{
+ public BlendModeTest()
+ {
+ }
+
+ /**
+ * Check that BlendMode.* constant instances are not null. This could happen if the declaration
+ * sequence is changed.
+ */
+ @Test
+ public void testInstances()
+ {
+ assertEquals(BlendMode.NORMAL, BlendMode.getInstance(COSName.NORMAL));
+ assertEquals(BlendMode.NORMAL, BlendMode.getInstance(COSName.COMPATIBLE));
+ assertEquals(BlendMode.MULTIPLY, BlendMode.getInstance(COSName.MULTIPLY));
+ assertEquals(BlendMode.SCREEN, BlendMode.getInstance(COSName.SCREEN));
+ assertEquals(BlendMode.OVERLAY, BlendMode.getInstance(COSName.OVERLAY));
+ assertEquals(BlendMode.DARKEN, BlendMode.getInstance(COSName.DARKEN));
+ assertEquals(BlendMode.LIGHTEN, BlendMode.getInstance(COSName.LIGHTEN));
+ assertEquals(BlendMode.COLOR_DODGE, BlendMode.getInstance(COSName.COLOR_DODGE));
+ assertEquals(BlendMode.COLOR_BURN, BlendMode.getInstance(COSName.COLOR_BURN));
+ assertEquals(BlendMode.HARD_LIGHT, BlendMode.getInstance(COSName.HARD_LIGHT));
+ assertEquals(BlendMode.SOFT_LIGHT, BlendMode.getInstance(COSName.SOFT_LIGHT));
+ assertEquals(BlendMode.DIFFERENCE, BlendMode.getInstance(COSName.DIFFERENCE));
+ assertEquals(BlendMode.EXCLUSION, BlendMode.getInstance(COSName.EXCLUSION));
+ assertEquals(BlendMode.HUE, BlendMode.getInstance(COSName.HUE));
+ assertEquals(BlendMode.SATURATION, BlendMode.getInstance(COSName.SATURATION));
+ assertEquals(BlendMode.LUMINOSITY, BlendMode.getInstance(COSName.LUMINOSITY));
+ assertEquals(BlendMode.COLOR, BlendMode.getInstance(COSName.COLOR));
+ }
+}
Propchange: pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendModeTest.java
------------------------------------------------------------------------------
svn:eol-style = native