From 4c453816be10594fb18b88b70aef28209f5334a5 Mon Sep 17 00:00:00 2001 From: Gongwook Lee Date: Wed, 10 Apr 2013 20:18:17 +0900 Subject: [PATCH] Update doxygen and license info Change-Id: Ie54ecc6b567948c5161b9ea281c2b50b985be4f9 Signed-off-by: Gongwook Lee --- LICENSE.APLv2 | 202 ++++++++++++++++++++++++++++++++ LICENSE.Flora | 206 +++++++++++++++++++++++++++++++++ NOTICE | 9 +- inc/FUixVision.h | 2 +- inc/FUixVisionFaceComponentsPosition.h | 2 +- inc/FUixVisionFaceDetector.h | 15 +-- inc/FUixVisionFaceRecognizer.h | 15 +-- inc/FUixVisionFaceTypes.h | 24 ++-- packaging/osp-face.spec | 4 +- src/caBasicDef.h | 17 +++ src/caBasicDef_ENUM.h | 17 +++ src/caFaceAPP_interface.h | 17 +++ 12 files changed, 498 insertions(+), 32 deletions(-) create mode 100644 LICENSE.APLv2 create mode 100644 LICENSE.Flora mode change 100755 => 100644 NOTICE mode change 100755 => 100644 inc/FUixVision.h mode change 100755 => 100644 inc/FUixVisionFaceComponentsPosition.h mode change 100755 => 100644 inc/FUixVisionFaceTypes.h diff --git a/LICENSE.APLv2 b/LICENSE.APLv2 new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE.APLv2 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/LICENSE.Flora b/LICENSE.Flora new file mode 100644 index 0000000..9c95663 --- /dev/null +++ b/LICENSE.Flora @@ -0,0 +1,206 @@ +Flora License + +Version 1.0, May, 2012 + +http://floralicense.org/license/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, +and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by +the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and +all other entities that control, are controlled by, or are +under common control with that entity. For the purposes of +this definition, "control" means (i) the power, direct or indirect, +to cause the direction or management of such entity, +whether by contract or otherwise, or (ii) ownership of fifty percent (50%) +or more of the outstanding shares, or (iii) beneficial ownership of +such entity. + +"You" (or "Your") shall mean an individual or Legal Entity +exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation source, +and configuration files. + +"Object" form shall mean any form resulting from mechanical +transformation or translation of a Source form, including but +not limited to compiled object code, generated documentation, +and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, +made available under the License, as indicated by a copyright notice +that is included in or attached to the work (an example is provided +in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, +that is based on (or derived from) the Work and for which the editorial +revisions, annotations, elaborations, or other modifications represent, +as a whole, an original work of authorship. For the purposes of this License, +Derivative Works shall not include works that remain separable from, +or merely link (or bind by name) to the interfaces of, the Work and +Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original +version of the Work and any modifications or additions to that Work or +Derivative Works thereof, that is intentionally submitted to Licensor +for inclusion in the Work by the copyright owner or by an individual or +Legal Entity authorized to submit on behalf of the copyright owner. +For the purposes of this definition, "submitted" means any form of +electronic, verbal, or written communication sent to the Licensor or +its representatives, including but not limited to communication on +electronic mailing lists, source code control systems, and issue +tracking systems that are managed by, or on behalf of, the Licensor +for the purpose of discussing and improving the Work, but excluding +communication that is conspicuously marked or otherwise designated +in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity +on behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work. + +"Tizen Certified Platform" shall mean a software platform that complies +with the standards set forth in the Compatibility Definition Document +and passes the Compatibility Test Suite as defined from time to time +by the Tizen Technical Steering Group and certified by the Tizen +Association or its designated agent. + +2. Grant of Copyright License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the +Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except as stated in this section) patent license to make, have made, +use, offer to sell, sell, import, and otherwise transfer the Work +solely as incorporated into a Tizen Certified Platform, where such +license applies only to those patent claims licensable by such +Contributor that are necessarily infringed by their Contribution(s) +alone or by combination of their Contribution(s) with the Work solely +as incorporated into a Tizen Certified Platform to which such +Contribution(s) was submitted. If You institute patent litigation +against any entity (including a cross-claim or counterclaim +in a lawsuit) alleging that the Work or a Contribution incorporated +within the Work constitutes direct or contributory patent infringement, +then any patent licenses granted to You under this License for that +Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the +Work or Derivative Works thereof pursuant to the copyright license +above, in any medium, with or without modifications, and in Source or +Object form, provided that You meet the following conditions: + + 1. You must give any other recipients of the Work or Derivative Works + a copy of this License; and + 2. You must cause any modified files to carry prominent notices stating + that You changed the files; and + 3. You must retain, in the Source form of any Derivative Works that + You distribute, all copyright, patent, trademark, and attribution + notices from the Source form of the Work, excluding those notices + that do not pertain to any part of the Derivative Works; and + 4. If the Work includes a "NOTICE" text file as part of its distribution, + then any Derivative Works that You distribute must include a readable + copy of the attribution notices contained within such NOTICE file, + excluding those notices that do not pertain to any part of + the Derivative Works, in at least one of the following places: + within a NOTICE text file distributed as part of the Derivative Works; + within the Source form or documentation, if provided along with the + Derivative Works; or, within a display generated by the Derivative Works, + if and wherever such third-party notices normally appear. + The contents of the NOTICE file are for informational purposes only + and do not modify the License. + +You may add Your own attribution notices within Derivative Works +that You distribute, alongside or as an addendum to the NOTICE text +from the Work, provided that such additional attribution notices +cannot be construed as modifying the License. You may add Your own +copyright statement to Your modifications and may provide additional or +different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works +as a whole, provided Your use, reproduction, and distribution of +the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, +any Contribution intentionally submitted for inclusion in the Work +by You to the Licensor shall be under the terms and conditions of +this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify +the terms of any separate license agreement you may have executed +with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade +names, trademarks, service marks, or product names of the Licensor, +except as required for reasonable and customary use in describing the +origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or +agreed to in writing, Licensor provides the Work (and each +Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied, including, without limitation, any warranties or conditions +of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A +PARTICULAR PURPOSE. You are solely responsible for determining the +appropriateness of using or redistributing the Work and assume any +risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, +whether in tort (including negligence), contract, or otherwise, +unless required by applicable law (such as deliberate and grossly +negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a +result of this License or out of the use or inability to use the +Work (including but not limited to damages for loss of goodwill, +work stoppage, computer failure or malfunction, or any and all +other commercial damages or losses), even if such Contributor +has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing +the Work or Derivative Works thereof, You may choose to offer, +and charge a fee for, acceptance of support, warranty, indemnity, +or other liability obligations and/or rights consistent with this +License. However, in accepting such obligations, You may act only +on Your own behalf and on Your sole responsibility, not on behalf +of any other Contributor, and only if You agree to indemnify, +defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason +of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Flora License to your work + +To apply the Flora License to your work, attach the following +boilerplate notice, with the fields enclosed by brackets "[]" +replaced with your own identifying information. (Don't include +the brackets!) The text should be enclosed in the appropriate +comment syntax for the file format. We also recommend that a +file or class name and description of purpose be included on the +same "printed page" as the copyright notice for easier +identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Flora License, Version 1.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://floralicense.org/license/ + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/NOTICE b/NOTICE old mode 100755 new mode 100644 index 8c778e0..f51fb7c --- a/NOTICE +++ b/NOTICE @@ -1,3 +1,8 @@ -Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. All rights reserved. +Copyright (c) Samsung Electronics Co., Ltd. All rights reserved. Except as noted, this software is licensed under Apache License, Version 2. -Please, see the LICENSE file for Apache License terms and conditions. +Please, see the LICENSE.APLv2 file for Apache License terms and conditions. + +Several source codes may have its original copyright owner and/or +be licensed under other than Apache License, Version 2, say, Flora License, Version 1. +Please, see copyright and license comments section in the header of each file, +and the LICENSE.Flora for Flora License terms and conditions. \ No newline at end of file diff --git a/inc/FUixVision.h b/inc/FUixVision.h old mode 100755 new mode 100644 index 8845030..3d751a0 --- a/inc/FUixVision.h +++ b/inc/FUixVision.h @@ -19,7 +19,7 @@ * @file FUixVision.h * @brief This is the header file for the %Vision namespace. * - * This header file contains the declarations and descriptions of the %Tizen::Uix::Vision namespace. + * This header file contains the declarations and descriptions of the %Vision namespace. */ #ifndef _FUIX_VISION_H_ diff --git a/inc/FUixVisionFaceComponentsPosition.h b/inc/FUixVisionFaceComponentsPosition.h old mode 100755 new mode 100644 index e39aa93..9f19084 --- a/inc/FUixVisionFaceComponentsPosition.h +++ b/inc/FUixVisionFaceComponentsPosition.h @@ -102,7 +102,7 @@ public: * @since 2.0 * * @return The position of the face - */ + */ Tizen::Graphics::Rectangle GetFacePosition(void) const; /** diff --git a/inc/FUixVisionFaceDetector.h b/inc/FUixVisionFaceDetector.h index d98c317..530308b 100644 --- a/inc/FUixVisionFaceDetector.h +++ b/inc/FUixVisionFaceDetector.h @@ -161,9 +161,9 @@ public: * @feature %http://tizen.org/feature/vision.face_recognition * @return An error code * @exception E_SUCCESS The method is successful. - * @exception E_UNSUPPORTED_OPERATION The target device does not support face detection feature @b Since: @b 2.1. - * For more information, see Application Filtering. - * @remarks Before calling this method, check whether the feature is supported by %Tizen::System::SystemInfo::GetValue() methods. + * @exception E_UNSUPPORTED_OPERATION The target device does not support the face detection feature. @b Since: @b 2.1 + * For more information, see Application Filtering. + * @remarks Before calling this method, check whether the feature is supported by the %Tizen::System::SystemInfo::GetValue() methods. */ @@ -273,8 +273,9 @@ public: * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_MEMORY The memory is insufficient. * @exception E_FAILURE A system error has occurred. - * @remarks The specific error code can be accessed using the GetLastResult() method. - * @remarks BitmapPixelFormat::BITMAP_PIXEL_FORMAT_R8G8B8A8 is not applicable for this method. + * @remarks + * - The specific error code can be accessed using the GetLastResult() method. + * - BitmapPixelFormat::BITMAP_PIXEL_FORMAT_R8G8B8A8 is not applicable for this method. * @endif */ Tizen::Base::Collection::IList* DetectFacesFromStillImageN(const Tizen::Graphics::Bitmap& bitmap); @@ -372,7 +373,7 @@ public: /** * Gets the position difference of the face. @n - * This can be used for tracking the face from a sequential video data. + * The %GetFaceMovement() method can be used for tracking the face from a sequential video data. * * @since 2.0 * @@ -390,7 +391,7 @@ public: * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG A specified input parameter is invalid. * @exception E_OPERATION_FAILED The method has failed to get the position difference of the specified region, but there is no error reported. @n - * In this case, @c xDiff and @c yDiff will be returned with @c 0. @n + * In this case, @c xDiff and @c yDiff are returned with @c 0. @n * It can happen when the detected faces are too small or two video data are different even if they contain the same face. * This is the result of a normal operation. * @remarks The specific error code can be accessed using the GetLastResult() method. diff --git a/inc/FUixVisionFaceRecognizer.h b/inc/FUixVisionFaceRecognizer.h index 5419047..be01f7b 100644 --- a/inc/FUixVisionFaceRecognizer.h +++ b/inc/FUixVisionFaceRecognizer.h @@ -175,9 +175,9 @@ public: * @feature %http://tizen.org/feature/vision.face_recognition * @return An error code * @exception E_SUCCESS The method is successful. - * @exception E_UNSUPPORTED_OPERATION The target device does not support face detection feature @b Since: @b 2.1. - * For more information, see Application Filtering. - * @remarks Before calling this method, check whether the feature is supported by %Tizen::System::SystemInfo::GetValue() methods. + * @exception E_UNSUPPORTED_OPERATION The target device does not support the face detection feature. @b Since: @b 2.1 + * For more information, see Application Filtering. + * @remarks Before calling this method, check whether the feature is supported by the %Tizen::System::SystemInfo::GetValue() methods. */ result Construct(void); @@ -289,8 +289,9 @@ public: * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_MEMORY The memory is insufficient. * @exception E_FAILURE A system error has occurred. - * @remarks The specific error code can be accessed using the GetLastResult() method. - * @remarks BitmapPixelFormat::BITMAP_PIXEL_FORMAT_R8G8B8A8 is not applicable for this method. + * @remarks + * - The specific error code can be accessed using the GetLastResult() method. + * - BitmapPixelFormat::BITMAP_PIXEL_FORMAT_R8G8B8A8 is not applicable for this method. * @endif */ Tizen::Base::Collection::IList* ExtractFaceInfoFromStillImageN(const Tizen::Graphics::Bitmap& bitmap); @@ -395,7 +396,7 @@ public: * The position of the eyes must be greater than or equal to @c 0. * The position of the eyes must be within @c preprocessedFaceBuffer. @n * If there are wrong values in the specified facial information, the result cannot be guaranteed even if it returns @c E_SUCCESS. @n - * Therefore, be sure not to change the value of facial information after getting it from FaceDetector::ExtractFaceComponentsN(). + * Therefore, be sure not to change the value of facial information after getting it from FaceDetector::ExtractFaceComponentsN(). * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG A specified input parameter is invalid. * @exception E_OUT_OF_MEMORY The memory is insufficient. @@ -421,7 +422,7 @@ public: * The position of the eyes must be greater than or equal to @c 0. * The position of the eyes must be within @c preprocessedFaceBuffer. @n * If there are wrong values in the specified facial information, the result cannot be guaranteed even if it returns @c E_SUCCESS. @n - * Therefore, be sure not to change the value of facial information after getting it from FaceDetector::ExtractFaceComponentsN(). + * Therefore, be sure not to change the value of facial information after getting it from FaceDetector::ExtractFaceComponentsN(). * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG A specified input parameter is invalid. * @exception E_OUT_OF_MEMORY The memory is insufficient. diff --git a/inc/FUixVisionFaceTypes.h b/inc/FUixVisionFaceTypes.h old mode 100755 new mode 100644 index 077a5e1..3ad2e9f --- a/inc/FUixVisionFaceTypes.h +++ b/inc/FUixVisionFaceTypes.h @@ -17,9 +17,9 @@ /** * @file FUixVisionFaceTypes.h - * @brief This is the header file for the declarations of the Tizen::Uix::Vision namespace. + * @brief This is the header file for the declarations of the Vision namespace. * - * This header file contains the declarations of the Tizen::Uix::Vision namespace. + * This header file contains the declarations of the Vision namespace. */ #ifndef _FUIX_VISION_FACE_TYPES_H_ @@ -42,13 +42,13 @@ enum FaceDetectorConfigProperty { /** * The maximum number of faces to detect from a video stream. @n - * This will be used when FaceDetector::DetectFacesFromVideoStreamN() is called. + * This is used when FaceDetector::DetectFacesFromVideoStreamN() is called. */ FACEDETECTOR_MAXNUMBER_VIDEO, /** * The maximum number of faces to detect from a still image. @n - * This will be used when FaceDetector::DetectFacesFromStillImageN(const Tizen::Base::ByteBuffer&, const Tizen::Graphics::Dimension&, Tizen::Graphics::BitmapPixelFormat) is called. + * This is used when FaceDetector::DetectFacesFromStillImageN(const Tizen::Base::ByteBuffer&, const Tizen::Graphics::Dimension&, Tizen::Graphics::BitmapPixelFormat) is called. */ FACEDETECTOR_MAXNUMBER_IMAGE, @@ -60,7 +60,7 @@ enum FaceDetectorConfigProperty * The value @c 3 is used when FaceDetector::DetectFacesFromVideoStreamN() is called unless it has been changed earlier * using the FaceDetector::SetProperty() method. @n * - * This will be used when %FaceDetector::DetectFacesFromVideoStreamN() is called. + * This is used when %FaceDetector::DetectFacesFromVideoStreamN() is called. */ FACEDETECTOR_SCALE_VIDEO, @@ -72,7 +72,7 @@ enum FaceDetectorConfigProperty * The value @c 1 is used when FaceDetector::DetectFacesFromStillImageN(const Tizen::Base::ByteBuffer&, const Tizen::Graphics::Dimension&, Tizen::Graphics::BitmapPixelFormat) is called unless it has been changed * earlier using the FaceDetector::SetProperty() method. @n * - * This will be used when %FaceDetector::DetectFacesFromStillImageN(const %Tizen::Base::ByteBuffer&, const %Tizen::Graphics::Dimension&, %Tizen::Graphics::BitmapPixelFormat) is called. + * This is used when %FaceDetector::DetectFacesFromStillImageN(const %Tizen::Base::ByteBuffer&, const %Tizen::Graphics::Dimension&, %Tizen::Graphics::BitmapPixelFormat) is called. */ FACEDETECTOR_SCALE_IMAGE, @@ -80,7 +80,7 @@ enum FaceDetectorConfigProperty * The maximum number of faces to detect. @n * The value @c 1 is used when FaceDetector::DetectFacesN() is called unless it has been changed earlier * using the FaceDetector::SetProperty() method. @n - * This will be used when %FaceDetector::DetectFacesN() is called. + * This is used when %FaceDetector::DetectFacesN() is called. */ FACEDETECTOR_MAXNUMBER_FACES, @@ -91,7 +91,7 @@ enum FaceDetectorConfigProperty * The value @c 3 is used when FaceDetector::DetectFacesN() is called unless it has been changed earlier using * the FaceDetector::SetProperty() method. @n * - * This will be used when %FaceDetector::DetectFacesN() is called. + * This is used when %FaceDetector::DetectFacesN() is called. */ FACEDETECTOR_SCALE_FACTOR, }; @@ -110,13 +110,13 @@ enum FaceRecognizerConfigProperty { /** * The maximum number of faces to extract face information from a video stream. @n - * This will be used when FaceRecognizer::ExtractFaceInfoFromVideoStreamN() is called. + * This is used when FaceRecognizer::ExtractFaceInfoFromVideoStreamN() is called. */ FACERECOGNIZER_MAXNUMBER_VIDEO, /** * The maximum number of faces to extract face information from a still image. @n - * This will be used when FaceRecognizer::ExtractFaceInfoFromStillImageN(const Tizen::Base::ByteBuffer&, const Tizen::Graphics::Dimension&, Tizen::Graphics::BitmapPixelFormat) is called. + * This is used when FaceRecognizer::ExtractFaceInfoFromStillImageN(const Tizen::Base::ByteBuffer&, const Tizen::Graphics::Dimension&, Tizen::Graphics::BitmapPixelFormat) is called. */ FACERECOGNIZER_MAXNUMBER_IMAGE, @@ -128,7 +128,7 @@ enum FaceRecognizerConfigProperty * The value @c 3 is used when FaceRecognizer::ExtractFaceInfoFromVideoStreamN() is called unless it has been changed * earlier using the FaceDetector::SetProperty() method. @n * - * This will be used when %FaceRecognizer::ExtractFaceInfoFromVideoStreamN() is called. + * This is used when %FaceRecognizer::ExtractFaceInfoFromVideoStreamN() is called. */ FACERECOGNIZER_SCALE_VIDEO, @@ -141,7 +141,7 @@ enum FaceRecognizerConfigProperty * The value @c 1 is used when FaceRecognizer::ExtractFaceInfoFromStillImageN(const Tizen::Base::ByteBuffer&, const Tizen::Graphics::Dimension&, Tizen::Graphics::BitmapPixelFormat) is called unless it has been changed * earlier using the FaceDetector::SetProperty() method. @n * - * This will be used when %FaceRecognizer::ExtractFaceInfoFromStillImageN(const %Tizen::Base::ByteBuffer&, const %Tizen::Graphics::Dimension&, %Tizen::Graphics::BitmapPixelFormat) is called. + * This is used when %FaceRecognizer::ExtractFaceInfoFromStillImageN(const %Tizen::Base::ByteBuffer&, const %Tizen::Graphics::Dimension&, %Tizen::Graphics::BitmapPixelFormat) is called. */ FACERECOGNIZER_SCALE_IMAGE, }; diff --git a/packaging/osp-face.spec b/packaging/osp-face.spec index 5412111..6a6a80f 100644 --- a/packaging/osp-face.spec +++ b/packaging/osp-face.spec @@ -59,8 +59,8 @@ make %{?jobs:-j%jobs} %install rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/license -cp %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/usr/share/license/%{name} - +cp %{_builddir}/%{name}-%{version}/LICENSE.Flora %{buildroot}/usr/share/license/%{name} +cat %{_builddir}/%{name}-%{version}/LICENSE.APLv2 >> %{buildroot}/usr/share/license/%{name} %make_install %post -p /sbin/ldconfig diff --git a/src/caBasicDef.h b/src/caBasicDef.h index 1b342ae..fc834cf 100644 --- a/src/caBasicDef.h +++ b/src/caBasicDef.h @@ -1,3 +1,20 @@ +// +// Open Service Platform +// Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.0 (the License); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://floralicense.org/license/ +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an AS IS BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + #ifndef _CA_BASIC_INFO_DEF_H_ #define _CA_BASIC_INFO_DEF_H_ diff --git a/src/caBasicDef_ENUM.h b/src/caBasicDef_ENUM.h index a9f1701..27a1184 100644 --- a/src/caBasicDef_ENUM.h +++ b/src/caBasicDef_ENUM.h @@ -1,3 +1,20 @@ +// +// Open Service Platform +// Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.0 (the License); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://floralicense.org/license/ +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an AS IS BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + #ifndef _CA_BASIC_INFO_DEF_ENUM_H_ #define _CA_BASIC_INFO_DEF_ENUM_H_ diff --git a/src/caFaceAPP_interface.h b/src/caFaceAPP_interface.h index 99fd4a5..9382de3 100644 --- a/src/caFaceAPP_interface.h +++ b/src/caFaceAPP_interface.h @@ -1,3 +1,20 @@ +// +// Open Service Platform +// Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.0 (the License); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://floralicense.org/license/ +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an AS IS BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + #ifndef _CA_FACE_APP_INTERFACE_H_ #define _CA_FACE_APP_INTERFACE_H_ -- 2.7.4