diff options
| author | jk7744.park <jk7744.park@samsung.com> | 2016-02-24 18:29:50 +0900 |
|---|---|---|
| committer | jk7744.park <jk7744.park@samsung.com> | 2016-02-24 18:29:50 +0900 |
| commit | 49753d3fdcbcbe83120c1be42b669a9ef0b18018 (patch) | |
| tree | cf694faf76b77e5cb8b791d2e0de3930b48bcc2d | |
| parent | c2208a1561c762051e749869ff8fb419c21e6b07 (diff) | |
| download | mediavision-tizen_2.4.tar.gz mediavision-tizen_2.4.tar.bz2 mediavision-tizen_2.4.zip | |
Tizen 2.4.0 rev3 SDK Public Releasetizen_2.4
| -rw-r--r-- | mv_common/src/EngineConfig.cpp | 55 | ||||
| -rw-r--r-- | packaging/capi-media-vision.spec | 2 |
2 files changed, 25 insertions, 32 deletions
diff --git a/mv_common/src/EngineConfig.cpp b/mv_common/src/EngineConfig.cpp index 97c8f76..98f5b3f 100644 --- a/mv_common/src/EngineConfig.cpp +++ b/mv_common/src/EngineConfig.cpp @@ -318,38 +318,31 @@ int EngineConfig::cacheDictionaries(bool isLazyCache, std::string configFilePath const char *typeStr = (char*)json_object_get_string_member(attr_obj, "type"); - if(NULL != nameStr && NULL != typeStr) + if (0 == strcmp("double", typeStr)) { - if (0 == strcmp("double", typeStr)) - { - DefDblDict[std::string(nameStr)] = - (double)json_object_get_double_member(attr_obj, "value"); - } - else if (0 == strcmp("integer", typeStr)) - { - DefIntDict[std::string(nameStr)] = - (int)json_object_get_int_member(attr_obj, "value"); - } - else if (0 == strcmp("boolean", typeStr)) - { - DefBoolDict[std::string(nameStr)] = - json_object_get_boolean_member(attr_obj, "value") ? true : false; - } - else if (0 == strcmp("string", typeStr)) - { - const char *valueStr = (char*)json_object_get_string_member(attr_obj, "value"); - - if(NULL != valueStr) - { - DefStrDict[std::string(nameStr)] = valueStr; - } - } - else - { - LOGW("Attribute %i:%s wasn't parsed from json file. " - "Type isn't supported.", attrInd, nameStr); - continue; - } + DefDblDict[std::string(nameStr)] = + (double)json_object_get_double_member(attr_obj, "value"); + } + else if (0 == strcmp("integer", typeStr)) + { + DefIntDict[std::string(nameStr)] = + (int)json_object_get_int_member(attr_obj, "value"); + } + else if (0 == strcmp("boolean", typeStr)) + { + DefBoolDict[std::string(nameStr)] = + json_object_get_boolean_member(attr_obj, "value") ? true : false; + } + else if (0 == strcmp("string", typeStr)) + { + DefStrDict[std::string(nameStr)] = + (char*)json_object_get_string_member(attr_obj, "value"); + } + else + { + LOGW("Attribute %i:%s wasn't parsed from json file. " + "Type isn't supported.", attrInd, nameStr); + continue; } } diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec index e0d83f3..98faa79 100644 --- a/packaging/capi-media-vision.spec +++ b/packaging/capi-media-vision.spec @@ -1,6 +1,6 @@ Name: capi-media-vision Summary: Media Vision library for Tizen Native API -Version: 0.1.15 +Version: 0.1.14 Release: 0 Group: Multimedia/Framework License: Apache-2.0 |