summaryrefslogtreecommitdiff
path: root/hwpfilter/source/hwpfile.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-01-25 14:08:19 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-01-26 09:54:30 +0100
commit90948976a557c49ec5e971b8ba6d8e62c58b6c7e (patch)
tree9f06cdeccd3c57051fec79e6171d535099440dff /hwpfilter/source/hwpfile.cxx
parent853e3fb639a540b2a452ee7116ae61e7b581f8fd (diff)
drop the slow path
Change-Id: Ibf9721d852c1b57593e34272214d9f11c0188016 Reviewed-on: https://gerrit.libreoffice.org/48611 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'hwpfilter/source/hwpfile.cxx')
-rw-r--r--hwpfilter/source/hwpfile.cxx12
1 files changed, 7 insertions, 5 deletions
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index f10334707130..f7b78fdf704c 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -122,6 +122,13 @@ int HWPFile::SetState(int errcode)
return error_code;
}
+bool HWPFile::Read1b(unsigned char &out)
+{
+ if (!hiodev || !hiodev->read1b(out))
+ return false;
+ return true;
+}
+
bool HWPFile::Read1b(char &out)
{
unsigned char tmp8;
@@ -150,11 +157,6 @@ bool HWPFile::Read4b(int &out)
return true;
}
-size_t HWPFile::Read1b(void *ptr, size_t nmemb)
-{
- return hiodev ? hiodev->read1b(ptr, nmemb) : 0;
-}
-
size_t HWPFile::Read2b(void *ptr, size_t nmemb)
{
return hiodev ? hiodev->read2b(ptr, nmemb) : 0;