← Back to branch summary

~ubuntu-branches/ubuntu/quantal/libwpd/quantal

~ubuntu-branches/ubuntu/quantal/libwpd/quantal

« back to all changes in this revision

Viewing changes to src/lib/GSFStream.cpp

Committer: Bazaar Package Importer
Author(s): Jonathan Riddell
Date: 2007-11-21 17:45:38 UTC
mfrom: (1.1.10 upstream)
Revision ID: james.westby@ubuntu.com-20071121174538-ue68b9jzc5y8wq8e

Tags: 0.8.12-1ubuntu1

* Merge from debian unstable, remaining changes:
- Add debian/patches/gcc43.diff and build rules

files added:
debian/patches

debian/patches/gcc43.diff

src/lib/WP1FontIdGroup.cpp

src/lib/WP1FontIdGroup.h

src/lib/WP3IndentGroup.cpp

src/lib/WP3IndentGroup.h

src/lib/WP3TabGroup.cpp

src/lib/WP3TabGroup.h

src/lib/WP5IndentGroup.cpp

src/lib/WP5IndentGroup.h

src/lib/WP5TabGroup.cpp

src/lib/WP5TabGroup.h

files removed:
mkinstalldirs

files modified:
CHANGES

CREDITS

Makefile.am

Makefile.in

aclocal.m4

autogen.sh

autopackage/Makefile.in

build/Makefile.in

build/win32/Makefile.in

build/win32/compile-resource *

build/win32/libwpd.dsp

build/win32/libwpd.dsw

build/win32/lt-compile-resource *

config.guess

config.sub

configure

configure.in

debian/changelog

debian/control

debian/copyright

debian/rules

docs/Makefile.in

docs/doxygen/Makefile.in

libwpd-stream-0.8.pc.in

libwpd-zip.in

libwpd.spec

libwpd.spec.in

src/Makefile.in

src/conv/Makefile.in

src/conv/html/Makefile.am

src/conv/html/Makefile.in

src/conv/raw/Makefile.am

src/conv/raw/Makefile.in

src/conv/raw/wpd2raw.cpp

src/conv/text/Makefile.am

src/conv/text/Makefile.in

src/lib/GSFStream.cpp

src/lib/Makefile.am

src/lib/Makefile.in

src/lib/WP1ContentListener.cpp

src/lib/WP1ContentListener.h

src/lib/WP1FileStructure.h

src/lib/WP1FixedLengthGroup.cpp

src/lib/WP1Listener.h

src/lib/WP1StylesListener.h

src/lib/WP3ContentListener.cpp

src/lib/WP3ContentListener.h

src/lib/WP3FileStructure.h

src/lib/WP3FixedLengthGroup.cpp

src/lib/WP3Listener.h

src/lib/WP3SingleByteFunction.cpp

src/lib/WP3SingleByteFunction.h

src/lib/WP3StylesListener.h

src/lib/WP3TablesGroup.cpp

src/lib/WP5ContentListener.cpp

src/lib/WP5ContentListener.h

src/lib/WP5DefinitionGroup.cpp

src/lib/WP5FileStructure.h

src/lib/WP5FixedLengthGroup.cpp

src/lib/WP5Listener.h

src/lib/WP5PageFormatGroup.cpp

src/lib/WP5PageFormatGroup.h

src/lib/WP5StylesListener.cpp

src/lib/WP5StylesListener.h

src/lib/WP6ContentListener.cpp

src/lib/WP6EOLGroup.cpp

src/lib/WP6EOLGroup.h

src/lib/WP6FontDescriptorPacket.cpp

src/lib/WP6FontDescriptorPacket.h

src/lib/WP6StylesListener.cpp

src/lib/WPXContentListener.cpp

src/lib/WPXContentListener.h

src/lib/WPXHeader.cpp

src/lib/WPXMemoryStream.cpp

src/lib/WPXOLEStream.cpp

src/lib/WPXPageSpan.cpp

src/lib/WPXPageSpan.h

src/lib/WPXStreamImplementation.cpp

src/lib/WPXTable.h

src/lib/libwpd_internal.cpp

src/lib/libwpd_internal.h

src/lib/makefile.mk

src/test/Makefile.am

src/test/Makefile.in

src/test/test.cpp

Show diffs side-by-side

added added

removed removed

src/lib/GSFStream.cpp

52

52

53

53

const uint8_t * GSFInputStream::read(size_t numBytes, size_t &numBytesRead)

54

54

{

55

numBytesRead = 0;

56

57

if (0 == numBytes)

58

return 0;

59

55

60

const uint8_t *buf = gsf_input_read(m_input, numBytes, 0);

56

61

57

if (!buf)

58

numBytesRead = 0;

59

else

62

if (buf)

60

63

numBytesRead = numBytes;

61

64

62

65

return buf;

Older »