Merge "fix for N_SE-54633: Display error occur while play recorded 1 second audio...

diff --git a/project/data/config.ini b/project/data/config.ini
index fb2406d..18dab17 100644 (file)
--- a/project/data/config.ini
+++ b/project/data/config.ini
@@ -12,7 +12,7 @@ Image::2. Image Converter=1
 Image::3. Gif Viewer=1
 Image::4. Flip & Rotate=1
 Image::5. Image Resize=1
-Image::6. Color Convert=1
+Image::6. Color Converter=1
 Recorder::1. Camera Capture=1
 Recorder::2. Video Recorder=1
 Recorder::3. Audio Recorder=1

diff --git a/project/src/Image/ImageColorConvertForm.cpp b/project/src/Image/ImageColorConvertForm.cpp
index bb28181..d7fc18d 100644 (file)
--- a/project/src/Image/ImageColorConvertForm.cpp
+++ b/project/src/Image/ImageColorConvertForm.cpp
@@ -105,7 +105,7 @@ ImageColorConvertForm::OnInitializing(void)
 {
        result r = E_SUCCESS;
 
-       SetHeaderText(L"Color converter");
+       SetHeaderText(L"Color Converter");
        SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this);
 
        AddFooterItem(pixelFormatMap[(__pixFmtIndex + 1)%3].key, ID_FORMAT);

diff --git a/project/src/MainForm.cpp b/project/src/MainForm.cpp
index f43996b..c24bd56 100644 (file)
--- a/project/src/MainForm.cpp
+++ b/project/src/MainForm.cpp
@@ -116,7 +116,7 @@ void MainForm::RegisterAllForms(void)
        new UnitTestInfo(L"Image", L"3. Gif Viewer", GIF_DECODER_SCENE_ID, 0);
        new UnitTestInfo(L"Image", L"4. Flip & Rotate", IMAGE_FLIP_ROTATE_SCENE_ID, 0);
        new UnitTestInfo(L"Image", L"5. Image Resize", IMAGE_RESIZE_SCENE_ID, 0);
-       new UnitTestInfo(L"Image", L"6. Color Convert", IMAGE_COLOR_CONVERTER_SCENE_ID, 0);
+       new UnitTestInfo(L"Image", L"6. Color Converter", IMAGE_COLOR_CONVERTER_SCENE_ID, 0);
 
        //Audio
        new UnitTestInfo(L"Audio", L"1. TonePlayer", TONE_PLAYER_SCENE_ID, 0);