Description: Fix typos and remove some warnings Author: Mathieu Malaterre Index: jxrlib-1.1/CMakeLists.txt =================================================================== --- jxrlib-1.1.orig/CMakeLists.txt +++ jxrlib-1.1/CMakeLists.txt @@ -91,7 +91,7 @@ add_library(jxrglue ${OBJ_GLUE} ${OBJ_TE set_property(TARGET jxrglue PROPERTY COMPILE_DEFINITIONS __ANSI__ DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN} ) -set_property(TARGET jxrglue PROPERTY LINK_INTERFACE_LIBRARIES "") +#set_property(TARGET jxrglue PROPERTY LINK_INTERFACE_LIBRARIES "") set_property(TARGET jxrglue PROPERTY COMPILE_FLAGS -w) # VERSION/SOVERSION set_property(TARGET jxrglue PROPERTY VERSION 1.1) @@ -104,14 +104,15 @@ install(TARGETS jxrglue #if(HAVE_STRLCPY_BSD) # target_link_libraries(jxrglue ${BSD_LIBRARY}) #endif() -target_link_libraries(jxrglue jpegxr m) +#target_link_libraries(jxrglue m) +target_link_libraries(jxrglue PRIVATE jpegxr m) # Enc app files set(ENCAPP JxrEncApp) add_executable(${ENCAPP} ${DIR_EXEC}/${ENCAPP}.c) set_property(TARGET ${ENCAPP} PROPERTY COMPILE_DEFINITIONS __ANSI__ DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN} ) -set_property(TARGET ${ENCAPP} PROPERTY COMPILE_FLAGS -w) +#set_property(TARGET ${ENCAPP} PROPERTY COMPILE_FLAGS -w) target_link_libraries(${ENCAPP} jxrglue) # jpegxr) install(TARGETS ${ENCAPP} RUNTIME DESTINATION ${JXRLIB_INSTALL_BIN_DIR}) # Dec app files Index: jxrlib-1.1/jxrencoderdecoder/JxrEncApp.c =================================================================== --- jxrlib-1.1.orig/jxrencoderdecoder/JxrEncApp.c +++ jxrlib-1.1/jxrencoderdecoder/JxrEncApp.c @@ -578,7 +578,7 @@ main(int argc, char* argv[]) //================================ Call(PKCreateCodecFactory(&pCodecFactory, WMP_SDK_VERSION)); - Call(pCodecFactory->CreateCodec(&IID_PKImageWmpEncode, &pEncoder)); + Call(pCodecFactory->CreateCodec(&IID_PKImageWmpEncode, (void**)&pEncoder)); //---------------------------------------------------------------- Call(PKCreateTestFactory(&pTestFactory, WMP_SDK_VERSION)); Index: jxrlib-1.1/jxrgluelib/JXRMeta.h =================================================================== --- jxrlib-1.1.orig/jxrgluelib/JXRMeta.h +++ jxrlib-1.1/jxrgluelib/JXRMeta.h @@ -34,7 +34,7 @@ #ifndef UNREFERENCED_PARAMETER #define UNREFERENCED_PARAMETER(P) { (P) = (P); } -#endif UNREFERENCED_PARAMETER +#endif /*UNREFERENCED_PARAMETER*/ //================================================================ // Container