summaryrefslogtreecommitdiffstats
path: root/media/img_utils/include/img_utils/FileInput.h
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2014-05-28 18:42:37 -0700
committerRuben Brunk <rubenbrunk@google.com>2014-07-10 15:37:26 -0700
commit4510de26e5361f3a9f07057ec6f26483c888c1fa (patch)
tree5a474839318779c1e6eff96a4f98e3e1f74ef85a /media/img_utils/include/img_utils/FileInput.h
parent5c68f959eaa2e02fed5643c78e281fff42bcc0a2 (diff)
downloadframeworks_av-4510de26e5361f3a9f07057ec6f26483c888c1fa.zip
frameworks_av-4510de26e5361f3a9f07057ec6f26483c888c1fa.tar.gz
frameworks_av-4510de26e5361f3a9f07057ec6f26483c888c1fa.tar.bz2
DNG: Update TiffWriter to handle thumbnails and SubIfds.
- Fix SubIfd handling. - Add StripSources, convenience functions for writing image strips. - Update Input classes to use with JNI. - Add skip method. - Add tag definitions for GPS tags. - Add name string to tag definitions. Bug: 15112503 Change-Id: I9535b21261027f6c06a041c1621de8f865a0ad32
Diffstat (limited to 'media/img_utils/include/img_utils/FileInput.h')
-rw-r--r--media/img_utils/include/img_utils/FileInput.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/media/img_utils/include/img_utils/FileInput.h b/media/img_utils/include/img_utils/FileInput.h
index d3c5ec1..4d4f22b 100644
--- a/media/img_utils/include/img_utils/FileInput.h
+++ b/media/img_utils/include/img_utils/FileInput.h
@@ -52,10 +52,10 @@ class ANDROID_API FileInput : public Input {
* of bytes given in the count argument will be read. Bytes will be written
* into the given buffer starting at the index given in the offset argument.
*
- * Returns the number of bytes read. If an error has occurred, the value pointed
- * to by the given status_t pointer will be set to a negative error code.
+ * Returns the number of bytes read, or NOT_ENOUGH_DATA if at the end of the file. If an
+ * error has occurred, this will return a negative error code other than NOT_ENOUGH_DATA.
*/
- virtual size_t read(uint8_t* buf, size_t offset, size_t count, status_t* err);
+ virtual ssize_t read(uint8_t* buf, size_t offset, size_t count);
/**
* Close the file descriptor to the path given in the constructor.