merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:16:50 +0000 (01:16 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:16:50 +0000 (01:16 +0900)
commit97e487c5b9dc2c9716c8b7b60f3cb5a797a70a98
tree2b6dc2fbdfb85bf8f2d92e62ddaa7126c69387ee
parentee5a53284b22649d3a50b59b48d3643805f620d9
merge with master
17 files changed:
CMakeLists.txt
inc/FMediaImageTypes.h
packaging/osp-image-core.spec
src/FMedia_BmpDecoder.cpp [changed mode: 0644->0755]
src/FMedia_BmpEncoder.cpp [changed mode: 0644->0755]
src/FMedia_BmpEncoder.h [changed mode: 0644->0755]
src/FMedia_ColorConverter.cpp
src/FMedia_ExifUtil.cpp [new file with mode: 0644]
src/FMedia_Ffmpeg.cpp [new file with mode: 0755]
src/FMedia_ImageDecoder.cpp
src/FMedia_ImageUtil.cpp
src/FMedia_JpegTurboDecoder.cpp
src/inc/FMedia_ColorConverter.h
src/inc/FMedia_ExifUtil.h [new file with mode: 0644]
src/inc/FMedia_Ffmpeg.h
src/inc/FMedia_ImageDecoder.h
src/inc/FMedia_ImageUtil.h