From 4588bfa1dd71e486b9571d5fca6e4f54db9f6aa6 Mon Sep 17 00:00:00 2001 From: "jiyong.min" Date: Wed, 10 Apr 2019 10:58:32 +0900 Subject: [PATCH] Remove unneccessary header and enumerable - mm_util_gif_private.h has been removed. - mm_util_gif_disposal has been replaced to defined value of giflib. Change-Id: I79ab50593681010900bbb66b21c9fa3981990601 --- gif/include/mm_util_gif.h | 10 -------- gif/include/mm_util_gif_private.h | 49 --------------------------------------- gif/mm_util_gif.c | 17 ++++++++++++-- 3 files changed, 15 insertions(+), 61 deletions(-) delete mode 100755 gif/include/mm_util_gif_private.h diff --git a/gif/include/mm_util_gif.h b/gif/include/mm_util_gif.h index 48c0d21..bb20185 100644 --- a/gif/include/mm_util_gif.h +++ b/gif/include/mm_util_gif.h @@ -37,16 +37,6 @@ extern "C" { This part describes the APIs with repect to multimedia image library. */ -/** - * Disposal mode for gif encoding - */ -typedef enum { - MM_UTIL_GIF_DISPOSAL_UNSPECIFIED = 0, /**< No disposal specified. */ - MM_UTIL_GIF_DISPOSAL_DO_NOT = 1, /**< Leave image in place. */ - MM_UTIL_GIF_DISPOSAL_BACKGROUND = 2, /**< Set area too background color. */ - MM_UTIL_GIF_DISPOSAL_PREVIOUS = 3, /**< Restore to previous content. */ -} mm_util_gif_disposal; - typedef void* mm_gif_file_h; int mm_util_decode_from_gif_file(const char *file_path, mm_util_image_h *decoded); diff --git a/gif/include/mm_util_gif_private.h b/gif/include/mm_util_gif_private.h deleted file mode 100755 index fe487f2..0000000 --- a/gif/include/mm_util_gif_private.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * libmm-utility - * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: Vineeth T M - * - * 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 __MM_UTIL_GIF_PRIVATE_H__ -#define __MM_UTIL_GIF_PRIVATE_H__ - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - void *buf; - size_t buf_size; - size_t pos; -} gif_io_buf_s; - -typedef struct { - GifFileType *GifFile; /**< GifFile opened */ - char *filename; - void **enc_buffer; /**< Encoded output data attached to callback */ - size_t *enc_buffer_size; - gif_io_buf_s io_buf; -} gif_file_s; - -#ifdef __cplusplus -} -#endif -#endif /*__MM_UTIL_GIF_PRIVATE_H__*/ diff --git a/gif/mm_util_gif.c b/gif/mm_util_gif.c index 8ae750d..310ff5d 100644 --- a/gif/mm_util_gif.c +++ b/gif/mm_util_gif.c @@ -24,7 +24,6 @@ #include #include "mm_util_gif.h" -#include "mm_util_gif_private.h" #include "mm_util_private.h" #include @@ -35,6 +34,20 @@ #define GRAPHIC_EXT_BLOCK_SIZE 4 +typedef struct { + void *buf; + size_t buf_size; + size_t pos; +} gif_io_buf_s; + +typedef struct { + GifFileType *GifFile; /**< GifFile opened */ + char *filename; + void **enc_buffer; /**< Encoded output data attached to callback */ + size_t *enc_buffer_size; + gif_io_buf_s io_buf; +} gif_file_s; + static int __convert_gif_to_rgba(void **data, ColorMapObject *color_map, GifRowType *screen_buffer, unsigned int width, unsigned int height) { unsigned long i, j; @@ -521,7 +534,7 @@ int _gif_image_write_ext_block(gif_file_s *gif_file, unsigned int delay_time) mm_util_retvm_if(ret != MM_UTIL_ERROR_NONE, ret, "_gif_image_alloc_ext_block failed"); /* use fixed graphics control */ - graphic_control_block.DisposalMode = MM_UTIL_GIF_DISPOSAL_UNSPECIFIED; + graphic_control_block.DisposalMode = DISPOSAL_UNSPECIFIED; graphic_control_block.UserInputFlag = FALSE; graphic_control_block.TransparentColor = NO_TRANSPARENT_COLOR; graphic_control_block.DelayTime = delay_time; -- 2.7.4