diff options
| author | 2010-01-24 23:24:10 -0800 | |
|---|---|---|
| committer | 2010-01-24 23:24:10 -0800 | |
| commit | 111d0367d75e0bba6558e4464a7662dc95825ba4 (patch) | |
| tree | bed32393c104a296796ae56c4d822953d14f9eeb | |
| parent | ff65c8c559941cac3f64ddaf350db318f3e993bb (diff) | |
| parent | acf77033bbd4682566bcd3c535f4f1e94d23f962 (diff) | |
Merge "Change key to KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES for consistency."
| -rw-r--r-- | include/ui/CameraParameters.h | 7 | ||||
| -rw-r--r-- | libs/ui/CameraParameters.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/ui/CameraParameters.h b/include/ui/CameraParameters.h index 9e4e14066788..a5ea133be324 100644 --- a/include/ui/CameraParameters.h +++ b/include/ui/CameraParameters.h @@ -109,9 +109,10 @@ public: // The height (in pixels) of EXIF thumbnail in Jpeg picture. // Example value: "384". Read/write. static const char KEY_JPEG_THUMBNAIL_HEIGHT[]; - // Supported EXIF thumbnail sizes (width x height). - // Example value: "512x384,320x240". Read only. - static const char KEY_SUPPORTED_THUMBNAIL_SIZES[]; + // Supported EXIF thumbnail sizes (width x height). 0x0 means not thumbnail + // in EXIF. + // Example value: "512x384,320x240,0x0". Read only. + static const char KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES[]; // The quality of the EXIF thumbnail in Jpeg picture. The range is 1 to 100, // with 100 being the best. // Example value: "90". Read/write. diff --git a/libs/ui/CameraParameters.cpp b/libs/ui/CameraParameters.cpp index 8f1749d9e2f2..2e0409bc688c 100644 --- a/libs/ui/CameraParameters.cpp +++ b/libs/ui/CameraParameters.cpp @@ -36,7 +36,7 @@ const char CameraParameters::KEY_PICTURE_FORMAT[] = "picture-format"; const char CameraParameters::KEY_SUPPORTED_PICTURE_FORMATS[] = "picture-format-values"; const char CameraParameters::KEY_JPEG_THUMBNAIL_WIDTH[] = "jpeg-thumbnail-width"; const char CameraParameters::KEY_JPEG_THUMBNAIL_HEIGHT[] = "jpeg-thumbnail-height"; -const char CameraParameters::KEY_SUPPORTED_THUMBNAIL_SIZES[] = "jpeg-thumbnail-size-values"; +const char CameraParameters::KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES[] = "jpeg-thumbnail-size-values"; const char CameraParameters::KEY_JPEG_THUMBNAIL_QUALITY[] = "jpeg-thumbnail-quality"; const char CameraParameters::KEY_JPEG_QUALITY[] = "jpeg-quality"; const char CameraParameters::KEY_ROTATION[] = "rotation"; |