diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-05-17 01:09:04 -0700 |
|---|---|---|
| committer | Ruben Brunk <rubenbrunk@google.com> | 2014-05-17 08:10:19 +0000 |
| commit | 272b7f26c300d2029f278cf2af523cf94e513b89 (patch) | |
| tree | d0c676b5575138fa0c096c3fa3ba9897806dc5e8 /media/img_utils/include | |
| parent | 22fcacaf30e157037e6651241c7b3a45f075daa0 (diff) | |
| download | frameworks_av-272b7f26c300d2029f278cf2af523cf94e513b89.zip frameworks_av-272b7f26c300d2029f278cf2af523cf94e513b89.tar.gz frameworks_av-272b7f26c300d2029f278cf2af523cf94e513b89.tar.bz2 | |
Fix warnings, re-enable -Werror.
Change-Id: Ic6b1a10f46f980f9a9d8d130600419a792703c44
Diffstat (limited to 'media/img_utils/include')
| -rw-r--r-- | media/img_utils/include/img_utils/TiffEntryImpl.h | 4 | ||||
| -rw-r--r-- | media/img_utils/include/img_utils/TiffIfd.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/img_utils/include/img_utils/TiffEntryImpl.h b/media/img_utils/include/img_utils/TiffEntryImpl.h index 0e713dc..cbe0e9a 100644 --- a/media/img_utils/include/img_utils/TiffEntryImpl.h +++ b/media/img_utils/include/img_utils/TiffEntryImpl.h @@ -43,7 +43,7 @@ class TiffEntryImpl : public TiffEntry { uint16_t getTag() const; TagType getType() const; Endianness getEndianness() const; - uint32_t getSize() const; + size_t getSize() const; uint32_t getComparableValue() const; protected: @@ -97,7 +97,7 @@ const void* TiffEntryImpl<T>::getDataHelper() const { } template<typename T> -uint32_t TiffEntryImpl<T>::getSize() const { +size_t TiffEntryImpl<T>::getSize() const { uint32_t total = getActualSize(); WORD_ALIGN(total) return (total <= OFFSET_SIZE) ? 0 : total; diff --git a/media/img_utils/include/img_utils/TiffIfd.h b/media/img_utils/include/img_utils/TiffIfd.h index c35f858..9400456 100644 --- a/media/img_utils/include/img_utils/TiffIfd.h +++ b/media/img_utils/include/img_utils/TiffIfd.h @@ -82,7 +82,7 @@ class ANDROID_API TiffIfd : public TiffWritable { * and the corresponding values for each entry (recursively including * any sub-IFDs). */ - virtual uint32_t getSize() const; + virtual size_t getSize() const; /** * Get the id of this IFD. |