equal
deleted
inserted
replaced
497 imgSceneAuto.insert(CxeSettingIds::SHARPNESS, SharpnessNormal); |
497 imgSceneAuto.insert(CxeSettingIds::SHARPNESS, SharpnessNormal); |
498 imgSceneAuto.insert(CxeSettingIds::LIGHT_SENSITIVITY, LightSensitivityAutomatic); |
498 imgSceneAuto.insert(CxeSettingIds::LIGHT_SENSITIVITY, LightSensitivityAutomatic); |
499 imgSceneAuto.insert(CxeSettingIds::EV_COMPENSATION_VALUE, 0); |
499 imgSceneAuto.insert(CxeSettingIds::EV_COMPENSATION_VALUE, 0); |
500 imgSceneAuto.insert(CxeSettingIds::BRIGHTNESS, 0); |
500 imgSceneAuto.insert(CxeSettingIds::BRIGHTNESS, 0); |
501 imgSceneAuto.insert(CxeSettingIds::FLASH_MODE, FlashAuto); |
501 imgSceneAuto.insert(CxeSettingIds::FLASH_MODE, FlashAuto); |
|
502 imgSceneAuto.insert(CxeSettingIds::FACE_TRACKING, 1); |
502 |
503 |
503 mImageSceneModes.insert(CxeSettingIds::IMAGE_SCENE_AUTO, imgSceneAuto); |
504 mImageSceneModes.insert(CxeSettingIds::IMAGE_SCENE_AUTO, imgSceneAuto); |
504 |
505 |
505 |
506 |
506 CxeScene imgSceneSports; |
507 CxeScene imgSceneSports; |
514 imgSceneSports.insert(CxeSettingIds::SHARPNESS, SharpnessNormal); |
515 imgSceneSports.insert(CxeSettingIds::SHARPNESS, SharpnessNormal); |
515 imgSceneSports.insert(CxeSettingIds::LIGHT_SENSITIVITY, LightSensitivityAutomatic); |
516 imgSceneSports.insert(CxeSettingIds::LIGHT_SENSITIVITY, LightSensitivityAutomatic); |
516 imgSceneSports.insert(CxeSettingIds::EV_COMPENSATION_VALUE, 0); |
517 imgSceneSports.insert(CxeSettingIds::EV_COMPENSATION_VALUE, 0); |
517 imgSceneSports.insert(CxeSettingIds::BRIGHTNESS, 0); |
518 imgSceneSports.insert(CxeSettingIds::BRIGHTNESS, 0); |
518 imgSceneSports.insert(CxeSettingIds::FLASH_MODE, FlashOff); |
519 imgSceneSports.insert(CxeSettingIds::FLASH_MODE, FlashOff); |
|
520 imgSceneSports.insert(CxeSettingIds::FACE_TRACKING, 0); |
519 |
521 |
520 mImageSceneModes.insert(CxeSettingIds::IMAGE_SCENE_SPORTS, imgSceneSports); |
522 mImageSceneModes.insert(CxeSettingIds::IMAGE_SCENE_SPORTS, imgSceneSports); |
521 |
523 |
522 |
524 |
523 CxeScene imgSceneCloseUp; |
525 CxeScene imgSceneCloseUp; |
531 imgSceneCloseUp.insert(CxeSettingIds::SHARPNESS, SharpnessNormal); |
533 imgSceneCloseUp.insert(CxeSettingIds::SHARPNESS, SharpnessNormal); |
532 imgSceneCloseUp.insert(CxeSettingIds::LIGHT_SENSITIVITY, LightSensitivityAutomatic); |
534 imgSceneCloseUp.insert(CxeSettingIds::LIGHT_SENSITIVITY, LightSensitivityAutomatic); |
533 imgSceneCloseUp.insert(CxeSettingIds::EV_COMPENSATION_VALUE, 0); |
535 imgSceneCloseUp.insert(CxeSettingIds::EV_COMPENSATION_VALUE, 0); |
534 imgSceneCloseUp.insert(CxeSettingIds::BRIGHTNESS, 0); |
536 imgSceneCloseUp.insert(CxeSettingIds::BRIGHTNESS, 0); |
535 imgSceneCloseUp.insert(CxeSettingIds::FLASH_MODE, FlashAuto); |
537 imgSceneCloseUp.insert(CxeSettingIds::FLASH_MODE, FlashAuto); |
|
538 imgSceneCloseUp.insert(CxeSettingIds::FACE_TRACKING, 0); |
536 |
539 |
537 mImageSceneModes.insert(CxeSettingIds::IMAGE_SCENE_MACRO, imgSceneCloseUp); |
540 mImageSceneModes.insert(CxeSettingIds::IMAGE_SCENE_MACRO, imgSceneCloseUp); |
538 |
541 |
539 CxeScene imgPortraitscene; |
542 CxeScene imgPortraitscene; |
540 |
543 |
547 imgPortraitscene.insert(CxeSettingIds::SHARPNESS, SharpnessSoft); |
550 imgPortraitscene.insert(CxeSettingIds::SHARPNESS, SharpnessSoft); |
548 imgPortraitscene.insert(CxeSettingIds::LIGHT_SENSITIVITY, LightSensitivityAutomatic); |
551 imgPortraitscene.insert(CxeSettingIds::LIGHT_SENSITIVITY, LightSensitivityAutomatic); |
549 imgPortraitscene.insert(CxeSettingIds::EV_COMPENSATION_VALUE, 0); |
552 imgPortraitscene.insert(CxeSettingIds::EV_COMPENSATION_VALUE, 0); |
550 imgPortraitscene.insert(CxeSettingIds::BRIGHTNESS, 0); |
553 imgPortraitscene.insert(CxeSettingIds::BRIGHTNESS, 0); |
551 imgPortraitscene.insert(CxeSettingIds::FLASH_MODE, FlashAntiRedEye); |
554 imgPortraitscene.insert(CxeSettingIds::FLASH_MODE, FlashAntiRedEye); |
|
555 imgPortraitscene.insert(CxeSettingIds::FACE_TRACKING, 1); |
552 |
556 |
553 mImageSceneModes.insert(CxeSettingIds::IMAGE_SCENE_PORTRAIT, imgPortraitscene); |
557 mImageSceneModes.insert(CxeSettingIds::IMAGE_SCENE_PORTRAIT, imgPortraitscene); |
554 |
558 |
555 CxeScene imglandscapescene; |
559 CxeScene imglandscapescene; |
556 |
560 |
563 imglandscapescene.insert(CxeSettingIds::SHARPNESS, SharpnessHard); |
567 imglandscapescene.insert(CxeSettingIds::SHARPNESS, SharpnessHard); |
564 imglandscapescene.insert(CxeSettingIds::LIGHT_SENSITIVITY, LightSensitivityAutomatic); |
568 imglandscapescene.insert(CxeSettingIds::LIGHT_SENSITIVITY, LightSensitivityAutomatic); |
565 imglandscapescene.insert(CxeSettingIds::EV_COMPENSATION_VALUE, 0); |
569 imglandscapescene.insert(CxeSettingIds::EV_COMPENSATION_VALUE, 0); |
566 imglandscapescene.insert(CxeSettingIds::BRIGHTNESS, 0); |
570 imglandscapescene.insert(CxeSettingIds::BRIGHTNESS, 0); |
567 imglandscapescene.insert(CxeSettingIds::FLASH_MODE, FlashOff); |
571 imglandscapescene.insert(CxeSettingIds::FLASH_MODE, FlashOff); |
|
572 imglandscapescene.insert(CxeSettingIds::FACE_TRACKING, 0); |
568 |
573 |
569 mImageSceneModes.insert(CxeSettingIds::IMAGE_SCENE_SCENERY, imglandscapescene); |
574 mImageSceneModes.insert(CxeSettingIds::IMAGE_SCENE_SCENERY, imglandscapescene); |
570 |
575 |
571 |
576 |
572 CxeScene imgNightscene; |
577 CxeScene imgNightscene; |
580 imgNightscene.insert(CxeSettingIds::SHARPNESS, SharpnessNormal); |
585 imgNightscene.insert(CxeSettingIds::SHARPNESS, SharpnessNormal); |
581 imgNightscene.insert(CxeSettingIds::LIGHT_SENSITIVITY, LightSensitivityAutomatic); |
586 imgNightscene.insert(CxeSettingIds::LIGHT_SENSITIVITY, LightSensitivityAutomatic); |
582 imgNightscene.insert(CxeSettingIds::EV_COMPENSATION_VALUE, 0); |
587 imgNightscene.insert(CxeSettingIds::EV_COMPENSATION_VALUE, 0); |
583 imgNightscene.insert(CxeSettingIds::BRIGHTNESS, 0); |
588 imgNightscene.insert(CxeSettingIds::BRIGHTNESS, 0); |
584 imgNightscene.insert(CxeSettingIds::FLASH_MODE, FlashOff); |
589 imgNightscene.insert(CxeSettingIds::FLASH_MODE, FlashOff); |
|
590 imgNightscene.insert(CxeSettingIds::FACE_TRACKING, 1); |
585 |
591 |
586 mImageSceneModes.insert(CxeSettingIds::IMAGE_SCENE_NIGHT, imgNightscene); |
592 mImageSceneModes.insert(CxeSettingIds::IMAGE_SCENE_NIGHT, imgNightscene); |
587 |
593 |
588 CxeScene imgNightpotraitscene; |
594 CxeScene imgNightpotraitscene; |
589 |
595 |
596 imgNightpotraitscene.insert(CxeSettingIds::SHARPNESS, SharpnessNormal); |
602 imgNightpotraitscene.insert(CxeSettingIds::SHARPNESS, SharpnessNormal); |
597 imgNightpotraitscene.insert(CxeSettingIds::LIGHT_SENSITIVITY, LightSensitivityAutomatic); |
603 imgNightpotraitscene.insert(CxeSettingIds::LIGHT_SENSITIVITY, LightSensitivityAutomatic); |
598 imgNightpotraitscene.insert(CxeSettingIds::EV_COMPENSATION_VALUE, 0); |
604 imgNightpotraitscene.insert(CxeSettingIds::EV_COMPENSATION_VALUE, 0); |
599 imgNightpotraitscene.insert(CxeSettingIds::BRIGHTNESS, 0); |
605 imgNightpotraitscene.insert(CxeSettingIds::BRIGHTNESS, 0); |
600 imgNightpotraitscene.insert(CxeSettingIds::FLASH_MODE, FlashAntiRedEye); |
606 imgNightpotraitscene.insert(CxeSettingIds::FLASH_MODE, FlashAntiRedEye); |
|
607 imgNightpotraitscene.insert(CxeSettingIds::FACE_TRACKING, 1); |
601 |
608 |
602 mImageSceneModes.insert(CxeSettingIds::IMAGE_SCENE_NIGHTPORTRAIT, imgNightpotraitscene); |
609 mImageSceneModes.insert(CxeSettingIds::IMAGE_SCENE_NIGHTPORTRAIT, imgNightpotraitscene); |
603 |
610 |
604 CX_DEBUG_EXIT_FUNCTION(); |
611 CX_DEBUG_EXIT_FUNCTION(); |
605 } |
612 } |