svn commit: r1902747 - in /poi/trunk: poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java

[fa...@apache.org]

Author: fanningpj
Date: Fri Jul 15 20:54:22 2022
New Revision: 1902747

URL: http://svn.apache.org/viewvc?rev=1902747&view=rev
Log:
[github-360] HSSFExtendedColor does not set RGB colors properly. Thanks to XenoAmess. This closes #360

Modified:
    poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java
    poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java
    poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java?rev=1902747&r1=1902746&r2=1902747&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java Fri Jul 15 20:54:22 2022
@@ -52,7 +52,7 @@ import org.openxmlformats.schemas.spread
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.STFontScheme;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.STUnderlineValues;
 
-public final class TestXSSFFont extends BaseTestFont{
+public final class TestXSSFFont extends BaseTestFont {
 
     public TestXSSFFont() {
         super(XSSFITestDataProvider.instance);

Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java?rev=1902747&r1=1902746&r2=1902747&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java Fri Jul 15 20:54:22 2022
@@ -89,6 +89,7 @@ public class HSSFExtendedColor extends E
             byte[] rgba = new byte[4];
             System.arraycopy(rgb, 0, rgba, 0, 3);
             rgba[3] = -1;
+            color.setRGBA(rgba);
         } else {
             // Shuffle from ARGB to RGBA
             byte a = rgb[0];

Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java?rev=1902747&r1=1902746&r2=1902747&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java Fri Jul 15 20:54:22 2022
@@ -17,6 +17,7 @@
 
 package org.apache.poi.ss.usermodel;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -27,6 +28,7 @@ import static org.junit.jupiter.api.Asse
 
 import java.io.IOException;
 
+import org.apache.commons.codec.binary.Hex;
 import org.apache.poi.ss.ITestDataProvider;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -220,4 +222,14 @@ public abstract class BaseTestFont {
             );
         }
     }
+
+    @Test
+    void testRGBColor() throws Exception {
+        try (Workbook wb1 = _testDataProvider.createWorkbook()) {
+            String colorHex = "FFEB84";
+            ExtendedColor color = wb1.getCreationHelper().createExtendedColor();
+            color.setRGB(Hex.decodeHex(colorHex));
+            assertArrayEquals(Hex.decodeHex(colorHex), color.getRGB());
+        }
+    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org