From: Tae-Young Chung Date: Mon, 1 Feb 2016 05:05:01 +0000 (+0900) Subject: Remove libjpeg-turbo and libjpeg-turbo-devel dependency X-Git-Tag: accepted/tizen/ivi/20160218.022847~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=78a087a1bf3dd81011b68b976fe560d3ebf9424f;p=platform%2Fcore%2Fapi%2Fmediavision.git Remove libjpeg-turbo and libjpeg-turbo-devel dependency Change-Id: Ic9206d3813ab1378ac64057780cc44ec5a8815a4 Signed-off-by: Tae-Young Chung --- diff --git a/mv_common/CMakeLists.txt b/mv_common/CMakeLists.txt index db991e8..05e8310 100644 --- a/mv_common/CMakeLists.txt +++ b/mv_common/CMakeLists.txt @@ -34,6 +34,6 @@ else() add_library(${PROJECT_NAME} SHARED ${MV_COMMON_INCLUDE_LIST} ${MV_COMMON_SRC_LIST}) endif() -TARGET_LINK_LIBRARIES(${MV_COMMON_LIB_NAME} jpeg ${OpenCV_LIBS} capi-media-tool tbm json-glib-1.0) +TARGET_LINK_LIBRARIES(${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} capi-media-tool tbm json-glib-1.0) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec index d53e0ba..f2c445a 100644 --- a/packaging/capi-media-vision.spec +++ b/packaging/capi-media-vision.spec @@ -1,7 +1,7 @@ Name: capi-media-vision Summary: Media Vision library for Tizen Native API Version: 0.3.6 -Release: 0 +Release: 1 Group: Multimedia/Framework License: Apache-2.0 and BSD-2.0 Source0: %{name}-%{version}.tar.gz @@ -18,8 +18,6 @@ BuildRequires: zint BuildRequires: zint-devel BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: dlogutil -BuildRequires: libjpeg-turbo -BuildRequires: libjpeg-turbo-devel BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libswscale) diff --git a/test/testsuites/common/image_helper/CMakeLists.txt b/test/testsuites/common/image_helper/CMakeLists.txt index a89a88a..523bef7 100644 --- a/test/testsuites/common/image_helper/CMakeLists.txt +++ b/test/testsuites/common/image_helper/CMakeLists.txt @@ -32,6 +32,6 @@ else() add_library(${PROJECT_NAME} SHARED ${MV_IMAGE_HELPER_INCLUDE_LIST} ${MV_IMAGE_HELPER_SRC_LIST}) endif() -TARGET_LINK_LIBRARIES(${PROJECT_NAME} jpeg ${OpenCV_LIBS}) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${OpenCV_LIBS}) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) diff --git a/test/testsuites/common/image_helper/include/ImageHelper.h b/test/testsuites/common/image_helper/include/ImageHelper.h index 179484f..43109e4 100644 --- a/test/testsuites/common/image_helper/include/ImageHelper.h +++ b/test/testsuites/common/image_helper/include/ImageHelper.h @@ -22,8 +22,6 @@ #include #include -#include - /** * @file ImageHelper.h * @brief ImageHelper class definition. @@ -173,37 +171,6 @@ public: unsigned char *pDataBuffer); /** - * @brief Convers libjpeg colorspace to the Tizen 'image util' colorspace. - * - * @since_tizen 3.0 - * @param [in] inColorspace The libjpeg colorspace to be converted. - * @param [out] pOutColorspace The Tizen 'image util' colorspace that - * will be obtained after conversion - * @return @c 0 on success, otherwise a negative error value - * - * @see ImageHelper::convertMVColorspaceToJpeglibColorspace() - */ - static int convertJpeglibColorspaceToMVColorspace( - J_COLOR_SPACE inColorspace, - mv_colorspace_e *pOutColorspace); - - /** - * @brief Convers libjpeg colorspace to the Tizen image util colorspace. - * - * @since_tizen 3.0 - * @param [in] inColorspace The Tizen 'image util' colorspace to be - * converted - * @param [out] pOutColorspace The libjpeg colorspace that will be - * obtained after conversion - * @return @c 0 on success, otherwise a negative error value - * - * @see ImageHelper::convertJpeglibColorspaceToMVColorspace() - */ - static int convertMVColorspaceToJpeglibColorspace( - mv_colorspace_e inColorspace, - J_COLOR_SPACE *pOutColorspace); - - /** * @brief Converts image data to the image data of RGB888 colorspace. * * @since_tizen 3.0 diff --git a/test/testsuites/common/image_helper/include/image_helper.h b/test/testsuites/common/image_helper/include/image_helper.h index 480c883..f74c163 100644 --- a/test/testsuites/common/image_helper/include/image_helper.h +++ b/test/testsuites/common/image_helper/include/image_helper.h @@ -31,8 +31,6 @@ extern "C" { #include #endif -#include - /** * @file image_helper.h * @brief Helper functions that provides set of useful methods for image management @@ -155,37 +153,6 @@ int draw_quadrangle_on_buffer( unsigned char *data_buffer); /** - * @brief Converts libjpeg colorspace to the Tizen 'image util' colorspace. - * - * @since_tizen 3.0 - * @param [in] in_colorspace The libjpeg colorspace to be converted. - * @param [out] out_colorspace The Tizen 'image util' colorspace that - * will be obtained after conversion - * @return @c 0 on success, otherwise a negative error value - * - * @see convert_mv_colorspace_to_jpeglib_colorspace() - */ -int convert_jpeglib_colorspace_to_mv_colorspace( - J_COLOR_SPACE in_colorspace, - mv_colorspace_e *out_colorspace); - -/** - * @brief Converts libjpeg colorspace to the Tizen image util colorspace. - * - * @since_tizen 3.0 - * @param [in] in_colorspace The Tizen 'image util' colorspace to be - * converted - * @param [out] out_colorspace The libjpeg colorspace that will be - * obtained after conversion - * @return @c 0 on success, otherwise a negative error value - * - * @see convert_jpeglib_colorspace_to_mv_colorspace() - */ -int convert_mv_colorspace_to_jpeglib_colorspace( - mv_colorspace_e in_colorspace, - J_COLOR_SPACE *out_colorspace); - -/** * @brief Converts image data to the image data of RGB888 colorspace. * * @since_tizen 3.0 diff --git a/test/testsuites/common/image_helper/src/ImageHelper.cpp b/test/testsuites/common/image_helper/src/ImageHelper.cpp index 67ac386..d362316 100644 --- a/test/testsuites/common/image_helper/src/ImageHelper.cpp +++ b/test/testsuites/common/image_helper/src/ImageHelper.cpp @@ -284,50 +284,6 @@ int ImageHelper::drawQuadrangleOnBuffer( return MEDIA_VISION_ERROR_NONE; } -int ImageHelper::convertJpeglibColorspaceToMVColorspace( - J_COLOR_SPACE inColorspace, - mv_colorspace_e *pOutColorspace) -{ - if (pOutColorspace == NULL) - { - return MEDIA_VISION_ERROR_INVALID_PARAMETER; - } - - switch(inColorspace) - { - case JCS_GRAYSCALE: - (*pOutColorspace) = MEDIA_VISION_COLORSPACE_Y800; - return MEDIA_VISION_ERROR_NONE; - case JCS_RGB: - (*pOutColorspace) = MEDIA_VISION_COLORSPACE_RGB888; - return MEDIA_VISION_ERROR_NONE; - default: - return MEDIA_VISION_ERROR_NOT_SUPPORTED; - } - - return MEDIA_VISION_ERROR_NONE; -} - -int ImageHelper::convertMVColorspaceToJpeglibColorspace( - mv_colorspace_e inColorspace, - J_COLOR_SPACE *pOutColorspace) -{ - // todo: support more colorspaces: - switch (inColorspace) - { - case MEDIA_VISION_COLORSPACE_Y800: - (*pOutColorspace) = JCS_GRAYSCALE; - return MEDIA_VISION_ERROR_NONE; - case MEDIA_VISION_COLORSPACE_RGB888: - (*pOutColorspace) = JCS_RGB; - return MEDIA_VISION_ERROR_NONE; - default: - return MEDIA_VISION_ERROR_NOT_SUPPORTED; - } - - return MEDIA_VISION_ERROR_NOT_SUPPORTED; -} - int ImageHelper::convertBufferToRGB888( const unsigned char *pInBuffer, const ImageData& imageData, diff --git a/test/testsuites/common/image_helper/src/image_helper.cpp b/test/testsuites/common/image_helper/src/image_helper.cpp index ecebee1..825cd7a 100644 --- a/test/testsuites/common/image_helper/src/image_helper.cpp +++ b/test/testsuites/common/image_helper/src/image_helper.cpp @@ -141,20 +141,6 @@ int draw_quadrangle_on_buffer( data_buffer); } -int convert_jpeglib_colorspace_to_mv_colorspace( - J_COLOR_SPACE in_colorspace, - mv_colorspace_e *out_colorspace) -{ - return ImageHelper::convertJpeglibColorspaceToMVColorspace(in_colorspace, out_colorspace); -} - -int convert_mv_colorspace_to_jpeglib_colorspace( - mv_colorspace_e in_colorspace, - J_COLOR_SPACE *out_colorspace) -{ - return ImageHelper::convertMVColorspaceToJpeglibColorspace(in_colorspace, out_colorspace); -} - int convert_buffer_to_RGB888( const unsigned char *in_buffer, const image_data_s *image_data,