From 147bd126e27935c2f61283e0b9b247b713744127 Mon Sep 17 00:00:00 2001 From: hj kim Date: Thu, 4 Jun 2015 22:58:36 -0700 Subject: Revert "Revert "Modify error type"" This reverts commit 999b9402a56d7c9738d6d632eff2f90004bbfbaf. Change-Id: Ieadecdcb087ad27b7c60a1ed448db329df2b38c1 --- include/media-thumb-error.h | 63 --------------------------------------- include/media-thumb-types.h | 3 +- include/media-thumbnail-private.h | 2 -- include/media-thumbnail.h | 1 - 4 files changed, 1 insertion(+), 68 deletions(-) delete mode 100755 include/media-thumb-error.h (limited to 'include') diff --git a/include/media-thumb-error.h b/include/media-thumb-error.h deleted file mode 100755 index 3ec6cbe..0000000 --- a/include/media-thumb-error.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * libmedia-thumbnail - * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: Hyunjun Ko - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - - -#ifndef _MEDIA_THUMB_ERROR_H_ -#define _MEDIA_THUMB_ERROR_H_ - -/** - @addtogroup THUMB_GENERATE - @{ - * @file media-thumb-error.h - * @brief This file defines error codes for thumbnail generation. - - */ - -/** - @defgroup THUMB_GENERAE_ERROR error code - @{ - - @par - error code - */ - - -#define MEDIA_THUMB_ERROR_NONE 0 /* No Error */ -#define MEDIA_THUMB_ERROR_INVALID_PARAMETER -1 /* invalid parameter(s) */ -#define MEDIA_THUMB_ERROR_TOO_BIG -2 /* Original is too big to make thumb */ -#define MEDIA_THUMB_ERROR_MM_UTIL -3 /* Error in mm-util lib */ -#define MEDIA_THUMB_ERROR_UNSUPPORTED -4 /* Unsupported type */ -#define MEDIA_THUMB_ERROR_NETWORK -5 /* Error in socket */ -#define MEDIA_THUMB_ERROR_DB -6 /* Timeout */ -#define MEDIA_THUMB_ERROR_TIMEOUT -7 /* Timeout */ -#define MEDIA_THUMB_ERROR_HASHCODE -8 /* Failed to generate hash code */ -#define MEDIA_THUMB_ERROR_DUPLICATED_REQUEST -9 /* Duplicated request of same path */ - -/** - @} -*/ - -/** - @} -*/ - -#endif /*_MEDIA_THUMB_ERROR_H_*/ diff --git a/include/media-thumb-types.h b/include/media-thumb-types.h index 3387a6c..56e36ea 100755 --- a/include/media-thumb-types.h +++ b/include/media-thumb-types.h @@ -18,8 +18,7 @@ * limitations under the License. * */ - - +#include "media-util.h" #ifndef _MEDIA_THUMB_TYPES_H_ #define _MEDIA_THUMB_TYPES_H_ diff --git a/include/media-thumbnail-private.h b/include/media-thumbnail-private.h index e606141..a7d1daf 100755 --- a/include/media-thumbnail-private.h +++ b/include/media-thumbnail-private.h @@ -23,8 +23,6 @@ #ifndef _MEDIA_THUMBNAIL_PRIVATE_H_ #define _MEDIA_THUMBNAIL_PRIVATE_H_ -#include "media-thumb-error.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/include/media-thumbnail.h b/include/media-thumbnail.h index 1101258..f3b6148 100755 --- a/include/media-thumbnail.h +++ b/include/media-thumbnail.h @@ -26,7 +26,6 @@ #include #include "media-thumb-types.h" -#include "media-thumb-error.h" #ifdef __cplusplus extern "C" { -- cgit v1.2.3