From e86a8cd0b8692adcfab71cedd5d9d90fd6a4d0e8 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Mon, 13 Nov 2017 14:51:17 -0800 Subject: NDK docs: Fix paths to frameworks/av include directories These have moved during earlier cleanup, and the Doxyfile wasn't updated to match. Test: Doc generation with 'make html' includes media and camera docs Change-Id: I7eb7e4fb28fb649915a13af486d9bc7710970f2e --- docs/Doxyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/Doxyfile b/docs/Doxyfile index bb0ca3251f..0ec45514f7 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -677,7 +677,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = ../include/android ../../av/include/ndk ../../av/include/camera/ndk +INPUT = ../include/android ../../av/media/ndk/include ../../av/camera/ndk/include # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -- cgit v1.2.3-59-g8ed1b From 81dd15ed7c6907189815fdf2e46615475fd1c628 Mon Sep 17 00:00:00 2001 From: Quddus Chong Date: Fri, 2 Feb 2018 10:36:23 -0800 Subject: docs: Remove __attribute__ expressions from Doxygen output. Test: manually generated reference docs and verified. Bug: 72524992 Change-Id: If795a402e44f827b291f719a4754c5c014bcc35e --- docs/Doxyfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/Doxyfile b/docs/Doxyfile index 0ec45514f7..efa639d2e7 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -1580,20 +1580,20 @@ PERLMOD_MAKEVAR_PREFIX = # evaluate all C-preprocessor directives found in the sources and include # files. -ENABLE_PREPROCESSING = NO +ENABLE_PREPROCESSING = YES # If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro # names in the source code. If set to NO (the default) only conditional # compilation will be performed. Macro expansion can be done in a controlled # way by setting EXPAND_ONLY_PREDEF to YES. -MACRO_EXPANSION = NO +MACRO_EXPANSION = YES # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES # then the macro expansion is limited to the macros specified with the # PREDEFINED and EXPAND_AS_DEFINED tags. -EXPAND_ONLY_PREDEF = NO +EXPAND_ONLY_PREDEF = YES # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files # pointed to by INCLUDE_PATH will be searched when a #include is found. @@ -1621,7 +1621,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = +PREDEFINED = __attribute__(x)= # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. -- cgit v1.2.3-59-g8ed1b From 97e3b872b007d643abf242cf223cb9b5c6ca168e Mon Sep 17 00:00:00 2001 From: Yin-Chia Yeh Date: Thu, 15 Mar 2018 11:27:04 -0700 Subject: Camera: update tonemap curve images Bug: 74942037 Merged-In: I2b4bffd685ddcb8899fb427b14c8a0ab937725c3 Change-Id: I2b4bffd685ddcb8899fb427b14c8a0ab937725c3 --- .../android.tonemap.curveRed/gamma_tonemap.png | Bin 31494 -> 21736 bytes .../android.tonemap.curveRed/inverse_tonemap.png | Bin 22690 -> 15510 bytes .../android.tonemap.curveRed/linear_tonemap.png | Bin 21822 -> 15016 bytes .../android.tonemap.curveRed/rec709_tonemap.png | Bin 32384 -> 22992 bytes .../android.tonemap.curveRed/srgb_tonemap.png | Bin 32315 -> 22087 bytes 5 files changed, 0 insertions(+), 0 deletions(-) (limited to 'docs') diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png index a02fd893b2..f739fa2bc2 100644 Binary files a/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png and b/docs/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png differ diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png index c309ac5ea8..4b45e3aa9c 100644 Binary files a/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png and b/docs/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png differ diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png index 414fad49a9..748d1a2962 100644 Binary files a/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png and b/docs/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png differ diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png index c147a8729f..6e436baa3b 100644 Binary files a/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png and b/docs/images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png differ diff --git a/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png b/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png index 4ce2125f3c..9776874bb0 100644 Binary files a/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png and b/docs/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png differ -- cgit v1.2.3-59-g8ed1b