Skip to content
Permalink
Browse files

Revert "Update broken patch"

This reverts commit 70197f6.
  • Loading branch information...
Fagulhas committed Jun 22, 2013
1 parent 70197f6 commit be9961b88707cb94f149934ebd73ed97acfae04c
Showing with 13 additions and 13 deletions.
  1. +13 −13 patches/frameworks_av/0001-cameraparameters.patch
@@ -1,38 +1,38 @@
From f1e95f086bc32e3af3c06635cf6a976162e4698b Mon Sep 17 00:00:00 2001
From 2162e16110d8a37b923995f3e95d6a3856e8bf4c Mon Sep 17 00:00:00 2001
From: Daz Jones <yuki@thebronasium.com>
Date: Mon, 18 Feb 2013 01:25:07 +0000
Subject: [PATCH] CameraParameters: add SCENE_MODE_OFF

Change-Id: Id0ace334fee45cbfbc1623cf4597b588918bac95
---
camera/CameraParameters.cpp | 1 +
include/camera/CameraParameters.h | 1 +
camera/CameraParameters.cpp | 1 +
include/camera/CameraParameters.h | 1 +
2 files changed, 2 insertions(+)

diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 5bdd961..d356bb9 100644
index 2a5795e..b1591f0 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -305,6 +305,7 @@ const char CameraParameters::SCENE_MODE_BARCODE[] = "barcode";
@@ -236,6 +236,7 @@ const char CameraParameters::SCENE_MODE_BARCODE[] = "barcode";
const char CameraParameters::SCENE_MODE_HDR[] = "hdr";
#ifdef QCOM_HARDWARE
const char CameraParameters::SCENE_MODE_AR[] = "AR";
+const char CameraParameters::SCENE_MODE_OFF[] = "off";

// Values for auto scene detection settings.
const char CameraParameters::SCENE_DETECT_OFF[] = "off";
#ifdef QCOM_SONY_HARDWARE
const char CameraParameters::EX_SCENE_MODE_DOCUMENT[] = "document";
#endif
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index 32b99da..508cef4 100644
index e282b28..aa9cef2 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -793,6 +793,7 @@ public:
@@ -735,6 +735,7 @@ public:
static const char SCENE_MODE_BACKLIGHT[];
static const char SCENE_MODE_FLOWERS[];
static const char SCENE_MODE_AR[];
+ static const char SCENE_MODE_OFF[];
#ifdef QCOM_SONY_HARDWARE
static const char EX_SCENE_MODE_DOCUMENT[];
#endif
// Applications are looking for a barcode. Camera driver will be optimized
// for barcode reading.
--
1.8.1.2
1.7.10.4

0 comments on commit be9961b

Please sign in to comment.
You can’t perform that action at this time.