# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1550141555 -3600
# Node ID 4351f52f15d5b869444796abbb6d14a78a15cd8f
# Parent  9a83d94b2a1ebe347ae2ce729b7e330c90c1ca64
fix

diff -r 9a83d94b2a1e -r 4351f52f15d5 Core/Enumerations.cpp
--- a/Core/Enumerations.cpp	Thu Feb 14 11:32:14 2019 +0100
+++ b/Core/Enumerations.cpp	Thu Feb 14 11:52:35 2019 +0100
@@ -1213,7 +1213,7 @@
       return Encoding_Korean;
     }
 
-    if (s == "JAPANESE_KANJI")
+    if (s == "JAPANESEKANJI")
     {
       return Encoding_JapaneseKanji;
     }
diff -r 9a83d94b2a1e -r 4351f52f15d5 UnitTestsSources/FromDcmtkTests.cpp
--- a/UnitTestsSources/FromDcmtkTests.cpp	Thu Feb 14 11:32:14 2019 +0100
+++ b/UnitTestsSources/FromDcmtkTests.cpp	Thu Feb 14 11:52:35 2019 +0100
@@ -260,7 +260,7 @@
   ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 166"));  ASSERT_EQ(Encoding_Thai, e);
 
   // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#table_C.12-4
-  ASSERT_FALSE(GetDicomEncoding(e, "ISO 2022 IR 87"));   //ASSERT_EQ(Encoding_JapaneseKanji, e);
+  ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 87"));    ASSERT_EQ(Encoding_JapaneseKanji, e);
   ASSERT_FALSE(GetDicomEncoding(e, "ISO 2022 IR 159"));  //ASSERT_EQ(Encoding_JapaneseKanjiSupplementary, e);
   ASSERT_TRUE(GetDicomEncoding(e, "ISO 2022 IR 149"));   ASSERT_EQ(Encoding_Korean, e);