branch develop updated (2df99596 -> 0182a496)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 2df99596 - partial fix #10000 : problème de caractère dans émetteur/récepteur new 0182a496 - fixes #10081 : Contenu du PDF en JPEG2000 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0182a49603fce1c76fb7e0627f9ceb727fa9b1e4 Author: jcouteau <couteau@codelutin.com> Date: Mon Sep 10 09:25:05 2018 +0200 - fixes #10081 : Contenu du PDF en JPEG2000 Summary of changes: faxtomail-service/pom.xml | 6 +++++ .../services/FaxToMailServiceUtilsTest.java | 27 +++++++++++++++++++--- faxtomail-ui-swing/pom.xml | 6 +++++ pom.xml | 6 +++++ 4 files changed, 42 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 0182a49603fce1c76fb7e0627f9ceb727fa9b1e4 Author: jcouteau <couteau@codelutin.com> Date: Mon Sep 10 09:25:05 2018 +0200 - fixes #10081 : Contenu du PDF en JPEG2000 --- faxtomail-service/pom.xml | 6 +++++ .../services/FaxToMailServiceUtilsTest.java | 27 +++++++++++++++++++--- faxtomail-ui-swing/pom.xml | 6 +++++ pom.xml | 6 +++++ 4 files changed, 42 insertions(+), 3 deletions(-) diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 6de7ded1..383116df 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -233,6 +233,12 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>edu.ucar</groupId> + <artifactId>jj2000</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>com.twelvemonkeys.imageio</groupId> <artifactId>imageio-jpeg</artifactId> diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtilsTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtilsTest.java index 4f5d85c1..9c6a7b2a 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtilsTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/FaxToMailServiceUtilsTest.java @@ -27,6 +27,14 @@ package com.franciaflex.faxtomail.services; import org.junit.Assert; import org.junit.Test; +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.nio.charset.Charset; +import java.nio.charset.CharsetDecoder; +import java.nio.charset.CharsetEncoder; +import java.sql.SQLOutput; +import java.util.Map; + /** * @author Kevin Morin (Code Lutin) * @since 2.0.4 @@ -69,10 +77,23 @@ public class FaxToMailServiceUtilsTest { @Test public void testDecodeFrom() { try { - //String from = "=?iso-8859-1?b?qkfjrsbpvuvtvcbo?= =?iso-8859-1?b?qu5urvmgqkftu0ug?= =?iso-8859-1?b?r09vtefjtku=?= <agence.nantes@baie-ouest.fr>"; - //Assert.assertEquals("BAIE OUEST NANTES BASSE GOULAINE <agence.nantes@baie-ouest.fr>", FaxToMailServiceUtils.getDecodedFrom(from)); + String from = "=?iso-8859-1?b?qkfjrsbpvuvtvcbo?= =?iso-8859-1?b?qu5urvmgqkftu0ug?= =?iso-8859-1?b?r09vtefjtku=?= <agence.nantes@baie-ouest.fr>"; + from = "=?iso-8859-1?b?QkFJRSBPVUVTVCBO?= =?iso-8859-1?b?QU5URVMgQkFTU0Ug?= =?iso-8859-1?b?R09VTEFJTkU=?= <agence.nantes@baie-ouest.fr>"; + String test = FaxToMailServiceUtils.getDecodedFrom(from); + +// Map<String, Charset> charsetMap = Charset.availableCharsets(); +// for (Map.Entry<String, Charset> entry:charsetMap.entrySet()){ +// if (!"IBM290".equals(entry.getKey()) && !"IBM424".equals(entry.getKey()) && !"x-IBM1364".equals(entry.getKey()) && !"X-UTF-32LE-BOM".equals(entry.getKey()) && !"X-UTF-32BE-BOM".equals(entry.getKey()) && !"x-UTF-16LE-BOM".equals(entry.getKey()) && !"x-JIS0208".equals(entry.getKey()) && !"x-IBM933".equals(entry.getKey()) && !"x-IBM939".equals(entry.getKey()) && !"x-IBM937".equals(entry.getKey()) && !"x-IBM935".equals(entry.getKey()) && !"x-IBM930".equals(entry.g [...] +// CharsetDecoder decoder = entry.getValue().newDecoder(); +// //System.out.println(entry.getKey() + " : " + decoder.decode(ByteBuffer.wrap(test.getBytes()))); +// System.out.println(entry.getKey()); +// System.out.println(decoder.decode(ByteBuffer.wrap(from.getBytes()))); +// } +// } + + Assert.assertEquals("BAIE OUEST NANTES BASSE GOULAINE <agence.nantes@baie-ouest.fr>", FaxToMailServiceUtils.getDecodedFrom(from)); - String from = "=?iso-8859-1?q?henri_seguin__mail_=3a_henri=2eseguin=40homkia=2efr_-_t=e9?= =?iso-8859-1?q?l_=3a_09_84_07_18_47?= <henri.seguin@homkia.fr>"; + from = "=?iso-8859-1?q?henri_seguin__mail_=3a_henri=2eseguin=40homkia=2efr_-_t=e9?= =?iso-8859-1?q?l_=3a_09_84_07_18_47?= <henri.seguin@homkia.fr>"; Assert.assertEquals("henri seguin mail : henri.seguin@homkia.fr - tél : 09 84 07 18 47 <henri.seguin@homkia.fr>", FaxToMailServiceUtils.getDecodedFrom(from)); from = "Jean Couteau <couteau@codelutin.com>"; diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 090f8c7b..10218cd8 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -285,6 +285,12 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>edu.ucar</groupId> + <artifactId>jj2000</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> diff --git a/pom.xml b/pom.xml index 2088bb31..addcc929 100644 --- a/pom.xml +++ b/pom.xml @@ -791,6 +791,12 @@ <artifactId>jbig2-imageio</artifactId> <version>3.0.0</version> </dependency> + + <dependency> + <groupId>edu.ucar</groupId> + <artifactId>jj2000</artifactId> + <version>5.3</version> + </dependency> <dependency> <groupId>xerces</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm