diff options
Diffstat (limited to 'camera/CameraHalUtilClasses.cpp')
| -rw-r--r-- | camera/CameraHalUtilClasses.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/camera/CameraHalUtilClasses.cpp b/camera/CameraHalUtilClasses.cpp index 7b380f9..53c9a55 100644 --- a/camera/CameraHalUtilClasses.cpp +++ b/camera/CameraHalUtilClasses.cpp @@ -23,7 +23,8 @@ #include "CameraHal.h" -namespace android { +namespace Ti { +namespace Camera { /*--------------------FrameProvider Class STARTS here-----------------------------*/ @@ -196,7 +197,7 @@ status_t CameraArea::checkArea(ssize_t top, status_t CameraArea::parseAreas(const char *area, size_t areaLength, - Vector< sp<CameraArea> > &areas) + android::Vector<android::sp<CameraArea> > &areas) { status_t ret = NO_ERROR; char *ctx; @@ -208,7 +209,7 @@ status_t CameraArea::parseAreas(const char *area, const char sep = ','; ssize_t top, left, bottom, right, weight; char *tmpBuffer = NULL; - sp<CameraArea> currentArea; + android::sp<CameraArea> currentArea; LOG_FUNCTION_NAME @@ -331,8 +332,8 @@ status_t CameraArea::parseAreas(const char *area, return ret; } -bool CameraArea::areAreasDifferent(Vector< sp<CameraArea> > &area1, - Vector< sp<CameraArea> > &area2) { +bool CameraArea::areAreasDifferent(android::Vector< android::sp<CameraArea> > &area1, + android::Vector< android::sp<CameraArea> > &area2) { if (area1.size() != area2.size()) { return true; } @@ -347,7 +348,7 @@ bool CameraArea::areAreasDifferent(Vector< sp<CameraArea> > &area1, return false; } -bool CameraArea::compare(const sp<CameraArea> &area) { +bool CameraArea::compare(const android::sp<CameraArea> &area) { return ((mTop == area->mTop) && (mLeft == area->mLeft) && (mBottom == area->mBottom) && (mRight == area->mRight) && (mWeight == area->mWeight)); @@ -356,4 +357,5 @@ bool CameraArea::compare(const sp<CameraArea> &area) { /*--------------------CameraArea Class ENDS here-----------------------------*/ -}; +} // namespace Camera +} // namespace Ti |