diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:07:20 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:07:20 +0200 |
commit | 18b27513f13bda279f2fe4cb93f0df56b1928864 (patch) | |
tree | 1b8597320c9b2e8389cce9016e45631a23d648c8 /sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx | |
parent | c8e1c7822ef95330737b5f820b66e20e1d5dc23c (diff) |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit 14dabe1c7117cf14295b3435228b6f24f0143f0d (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:25 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit f0ba077fb96691d302489a28c1cb67c9bf150f39
Author: Fridrich Štrba <fridrich.strba@bluewin.ch>
Date: Tue Sep 14 17:27:42 2010 +0200
moving languagetool to the right repository
.../languagetool/JLanguageTool-1.0.0.patch | 137 ++++++++++++++++++++
languagetool/languagetool/makefile.mk | 67 ++++++++++
languagetool/languagetool/prj/build.lst | 3 +
languagetool/languagetool/prj/d.lst | 1 +
4 files changed, 208 insertions(+), 0 deletions(-)
commit f62b698d7387ddd78bf205bc44af3fb3adbed295
Author: Kalman Szalai - KAMI <kamihir@freemail.hu>
Date: Tue Sep 14 16:57:26 2010 +0200
extensions_deliver.diff: Deliver extensions to the solver
sdext/prj/d.lst | 3 +++
swext/prj/d.lst | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
commit 7553ed5a48ee9d1eff4dce30509ce0d682687b20
Author: Fridrich Štrba <fridrich.strba@bluewin.ch>
Date: Tue Sep 14 10:50:46 2010 +0200
win32-pdfimport-use-temporary-file.diff: avoid locking issues on win32
sdext/source/pdfimport/pdfiadaptor.cxx | 2 +-
sdext/source/pdfimport/wrapper/wrapper.cxx | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
commit 8483892bd836c37b4e4a171745e37ceae88d0a16
Merge: 6a13c46 89ba628
Author: Jan Holesovsky <kendy@suse.cz>
Date: Tue Sep 7 09:33:01 2010 +0200
Merge commit 'ooo/OOO330_m6'
commit 89ba628baeac602f71f4b096e08d50b16c715c47 (tag: refs/tags/ooo/OOO330_m7, tag: refs/tags/ooo/OOO330_m6, tag: refs/tags/ooo/OOO330_m5)
Merge: 4571732 ed49424
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Aug 18 16:59:10 2010 +0200
CWS-TOOLING: integrate CWS txtl10n
commit ed494241621de2f1c37b632d2d970f259df8deef
Merge: f1aba18 4571732
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue Jul 27 16:50:00 2010 +0200
merged OOO330 m2
commit f1aba18563ab79ae2c3ca594d43130adf70f72c1
Author: Ivo Hinkelmann <ihi@openoffice.org>
Date: Fri Jul 23 13:02:53 2010 +0200
txtl10n: removal of verbose switch
swext/mediawiki/help/makefile.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Notes
split repo tag: extensions_OOO_BUILD_3_2_98_1
Diffstat (limited to 'sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx')
-rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx index 5fcf8125e7dd..451dcf8047ab 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx @@ -15,12 +15,12 @@ * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program; if not, write to the Free * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, @@ -40,12 +40,12 @@ namespace pdfi { static sal_uInt32 crc_table[ 256 ]; static bool bCRCTableInit; - + static void initCRCTable(); static void appendFileHeader( OutputBuffer& o_rOutputBuf ); static size_t startChunk( const char* pChunkName, OutputBuffer& o_rOut ); static void endChunk( size_t nStart, OutputBuffer& o_rOut ); - + static void set( sal_uInt32 i_nValue, OutputBuffer& o_rOutputBuf, size_t i_nIndex ); static void append( sal_uInt32 i_nValue, OutputBuffer& o_rOutputBuf ) { @@ -53,18 +53,18 @@ namespace pdfi o_rOutputBuf.insert( o_rOutputBuf.end(), 4, (Output_t)0 ); set( i_nValue, o_rOutputBuf, nCur ); } - + static void appendIHDR( OutputBuffer& o_rOutputBuf, int width, int height, int depth, int colortype ); static void appendIEND( OutputBuffer& o_rOutputBuf ); - + public: static void updateCRC( sal_uInt32& io_rCRC, const sal_uInt8* i_pBuf, size_t i_nLen ); static sal_uInt32 getCRC( const sal_uInt8* i_pBuf, size_t i_nLen ); - + // deflates the passed buff i_pBuf and appends it to the output vector // returns the number of bytes added to the output static sal_uInt32 deflateBuffer( const Output_t* i_pBuf, size_t i_nLen, OutputBuffer& o_rOut ); - + static void createPng( OutputBuffer& o_rOutputBuf, Stream* str, int width, |