save to jpg

Change-Id: I2cd3469f4592d1e66780ffdb426bb855c3d40d6e

diff --git a/common/include/ivug-util.h b/common/include/ivug-util.h
index fa0f99f..a8deb38 100755 (executable)
--- a/common/include/ivug-util.h
+++ b/common/include/ivug-util.h
@@ -69,7 +69,7 @@ int ivug_atoi(const char *number);
 
 double ivug_atod(const char *number);
 
-char * ivug_generate_file_name(const char *filepath);
+char * ivug_generate_file_name(const char *filepath, const char *extension);\r
 
 /*
        Removes leading and trailing whitespace from string

diff --git a/common/src/ivug-util.c b/common/src/ivug-util.c
index abc5702..17a4bd2 100755 (executable)
--- a/common/src/ivug-util.c
+++ b/common/src/ivug-util.c
@@ -295,39 +295,53 @@ double ivug_atod(const char *number)
        return val;
 }
 
-char * ivug_generate_file_name(const char *filepath)
-{
-       IV_ASSERT(filepath != NULL);
-
-       MSG_SETAS_HIGH("filepath %s", filepath);
-
-       char tempname[IVUG_MAX_FILE_PATH_LEN+1] = {0,};
-       char *ext = ivug_fileinfo_get_file_extension(filepath);
-       char *filename = ecore_file_strip_ext(ecore_file_file_get(filepath));
-       char *dir = ecore_file_dir_get(filepath);
-
-       int i = 0;
-
-       for(i=1; i<IVUG_MAX_FILE_PATH_LEN; i++)
-       {
-               snprintf(tempname, sizeof(tempname), "%s/%s_%d.%s", dir, filename, i, ext);
-               if(ecore_file_exists(tempname) == EINA_FALSE)
-                       break;
-       }
-       if(ext)
-       {
-               free(ext);
-       }
-       if(i == IVUG_MAX_FILE_PATH_LEN)
-       {
-               MSG_UTIL_ERROR("Cannot make file");
-               return NULL;
-       }
-
-       MSG_UTIL_HIGH( "tempname: %s", tempname);
-
-       return strdup(tempname);
-}
+char * ivug_generate_file_name(const char *filepath, const char *extension)\r
+{\r
+       IV_ASSERT(filepath != NULL);\r
+\r
+       MSG_SETAS_HIGH("filepath %s", filepath);\r
+\r
+       char tempname[IVUG_MAX_FILE_PATH_LEN+1] = {0,};\r
+       char *ext = NULL;\r
+       char *filename = ecore_file_strip_ext(ecore_file_file_get(filepath));\r
+       char *dir = ecore_file_dir_get(filepath);\r
+\r
+       if(extension)\r
+       {\r
+               ext = strdup(extension);\r
+       }\r
+       else\r
+       {\r
+               ext = ivug_fileinfo_get_file_extension(filepath);\r
+       }\r
+\r
+       int i = 0;\r
+\r
+       for(i=1; i<IVUG_MAX_FILE_PATH_LEN; i++)\r
+       {\r
+               snprintf(tempname, sizeof(tempname), "%s/%s_%d.%s", dir, filename, i, ext);\r
+               if(ecore_file_exists(tempname) == EINA_FALSE)\r
+                       break;\r
+       }\r
+\r
+       if(filename)\r
+       {\r
+               free(filename);\r
+       }\r
+       if(ext)\r
+       {\r
+               free(ext);\r
+       }\r
+       if(i == IVUG_MAX_FILE_PATH_LEN)\r
+       {\r
+               MSG_UTIL_ERROR("Cannot make file");\r
+               return NULL;\r
+       }\r
+\r
+       MSG_UTIL_HIGH( "tempname: %s", tempname);\r
+\r
+       return strdup(tempname);\r
+}\r
 
 char * ivug_strip_string(char* name)
 {

diff --git a/main/src/view/ivug-crop-view.cpp b/main/src/view/ivug-crop-view.cpp
index bc52fa8..7a20369 100755 (executable)
--- a/main/src/view/ivug-crop-view.cpp
+++ b/main/src/view/ivug-crop-view.cpp
@@ -232,7 +232,7 @@ static void  _on_btn_save(void *data, Evas_Object *obj, void *event_info)
        int rx, ry, rw, rh;
        Evas_Object *ret_image = NULL;
 
-       char* save_file = ivug_generate_file_name(pCropView->file_path);
+       char* save_file = ivug_generate_file_name(pCropView->file_path, "jpg");\r
        if(save_file == NULL)
        {
                MSG_SETAS_ERROR("Cannot generate file name");