Backout Rev 18389. String returns correctly with KDU 7.1

indra/cmake/LLKDU.cmake

@@ -22,5 +22,4 @@ if (USE_KDU)
   endif (STANDALONE)
   set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu)
   set(LLKDU_LIBRARIES llkdu)
-  add_definitions( -DUSE_KDU )
 endif (USE_KDU)

indra/llimage/CMakeLists.txt

@@ -63,10 +63,6 @@ target_link_libraries(llimage
     ${ZLIB_LIBRARIES}
     )
 
-if (USE_KDU)
-    add_definitions( -DUSE_KDU )
-endif (USE_KDU)
-
 # Add tests
 if (LL_TESTS)
   SET(llimage_TEST_SOURCE_FILES

indra/llimage/llimagej2c.cpp

@@ -50,16 +50,7 @@ const std::string sTesterName("ImageCompressionTester");
 //static
 std::string LLImageJ2C::getEngineInfo()
 {
-    //return fallbackEngineInfoLLImageJ2CImpl(); # AO, returns corrupted string, needs investigation. Workaround below.
-    std::string J2CEngineStr;
-    llinfos << "Raw engine string was '" << fallbackEngineInfoLLImageJ2CImpl() << "'" << llendl;
-#ifdef USE_KDU
-    J2CEngineStr = "KDU";
-#else
-    J2CEngineStr = "OpenJPEG";
-    J2CEngineStr = fallbackEngineInfoLLImageJ2CImpl();
-#endif
-    return J2CEngineStr;
+    return fallbackEngineInfoLLImageJ2CImpl();
 }
 
 LLImageJ2C::LLImageJ2C() : 	LLImageFormatted(IMG_CODEC_J2C),