From a8ecb8801f4330c2d2da88b992e2039e020d4fa4 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Sat, 19 May 2012 14:05:10 +0200 Subject: fdo#47035: Fix saving of jpeg files on Mac/PPC jpeg_compress_struct gets padded with the same effect as the jpeg_decompress_struct, so needs some reordering as well to make Mac/PPC happy (a27a399) --- jpeg/struct_alignment.patch | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) (limited to 'jpeg') diff --git a/jpeg/struct_alignment.patch b/jpeg/struct_alignment.patch index 2eb41bf1ff17..09966c3392d2 100644 --- a/jpeg/struct_alignment.patch +++ b/jpeg/struct_alignment.patch @@ -1,8 +1,38 @@ -without this patch, the jpeg_decompress_struct will be padded, this in turn +without this patch, the jpeg_decompress_struct & jpec_compress_struct will be padded, this in turn results in a mismatch when the jpeg filter in svtools is built, where no padding is assumed. Only affects Mac/PPC apparenlty, see fdo#47035 --- misc/jpeg-8c/jpeglib.h 2010-11-17 22:01:56.000000000 +0100 -+++ misc/build/jpeg-8c/jpeglib.h 2012-05-19 03:38:44.000000000 +0200 ++++ misc/build/jpeg-8c/jpeglib.h 2012-05-19 13:58:31.000000000 +0200 +@@ -288,9 +288,9 @@ + JDIMENSION image_width; /* input image width */ + JDIMENSION image_height; /* input image height */ + int input_components; /* # of color components in input image */ +- J_COLOR_SPACE in_color_space; /* colorspace of input image */ + + double input_gamma; /* image gamma of input image */ ++ J_COLOR_SPACE in_color_space; /* colorspace of input image */ + + /* Compression parameters --- these fields must be set before calling + * jpeg_start_compress(). We recommend calling jpeg_set_defaults() to +@@ -359,16 +359,16 @@ + /* Parameters controlling emission of special markers. */ + + boolean write_JFIF_header; /* should a JFIF marker be written? */ ++ boolean write_Adobe_marker; /* should an Adobe marker be written? */ + UINT8 JFIF_major_version; /* What to write for the JFIF version number */ + UINT8 JFIF_minor_version; + /* These three values are not used by the JPEG code, merely copied */ + /* into the JFIF APP0 marker. density_unit can be 0 for unknown, */ + /* 1 for dots/inch, or 2 for dots/cm. Note that the pixel aspect */ + /* ratio is defined by X_density/Y_density even when density_unit=0. */ +- UINT8 density_unit; /* JFIF code for pixel size units */ + UINT16 X_density; /* Horizontal pixel density */ + UINT16 Y_density; /* Vertical pixel density */ +- boolean write_Adobe_marker; /* should an Adobe marker be written? */ ++ UINT8 density_unit; /* JFIF code for pixel size units */ + + /* State variable: index of next scanline to be written to + * jpeg_write_scanlines(). Application may use this to control its @@ -583,11 +583,11 @@ /* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */ UINT8 JFIF_major_version; /* JFIF version number */ -- cgit 4009559785b54'>refslogtreecommitdiffstats
BranchCommit messageAuthorAge
distro/suse/suse-3.6Merge tag 'libreoffice-3.6.5.2' into suse-3.6Petr Mladek11 years
distro/suse/suse-3.6.3Branch suse-3.6.3Petr Mladek12 years
distro/ubuntu/oneiric-3.4another fix for --as-neededBjoern Michaelsen13 years
feature/cmclayoutdrop unused methodsCaolán McNamara12 years
feature/submodulesignore the right build-dir... now one level upNorbert Thiebaud12 years
libreoffice-3-5merge in various filter work from coreCaolán McNamara12 years
libreoffice-3-5-0Branch libreoffice-3-5-0Petr Mladek12 years
libreoffice-3-5-1Branch libreoffice-3-5-1Petr Mladek12 years
libreoffice-3-5-2Branch libreoffice-3-5-2Petr Mladek12 years
libreoffice-3-5-3Branch libreoffice-3-5-3Petr Mladek12 years
libreoffice-3-5-4Branch libreoffice-3-5-4Petr Mladek12 years
libreoffice-3-5-5Branch libreoffice-3-5-5Petr Mladek12 years
libreoffice-3-5-6Branch libreoffice-3-5-6Petr Mladek12 years
libreoffice-3-5-7Branch libreoffice-3-5-7Fridrich Štrba12 years
libreoffice-3-6merge in various filter work from coreCaolán McNamara12 years
libreoffice-3-6-0Branch libreoffice-3-6-0Fridrich Štrba12 years
libreoffice-3-6-1merge in various filter work from coreCaolán McNamara12 years
libreoffice-3-6-2Branch libreoffice-3-6-2Petr Mladek12 years
libreoffice-3-6-3Branch libreoffice-3-6-3Fridrich Štrba12 years
libreoffice-3-6-4Branch libreoffice-3-6-4Petr Mladek12 years
libreoffice-3-6-5Branch libreoffice-3-6-5Fridrich Štrba11 years
libreoffice-3-6-6Branch libreoffice-3-6-6Petr Mladek11 years
libreoffice-3-6-7Version 3.6.7.1, tag libreoffice-3.6.7.1Christian Lohmaier11 years
libreoffice-3.5.3.1Version 3.5.3.1, tag libreoffice-3.5.3.1 (3.5.3-rc1)Petr Mladek12 years
libreoffice-3.5.5.1Version 3.5.5.1, tag libreoffice-3.5.5.1 (3.5.5-rc1)Petr Mladek12 years
libreoffice-3.5.6.1Version 3.5.6.1, tag libreoffice-3.5.6.1 (3.5.6-rc1)Petr Mladek12 years
libreoffice-3.5.99.1Version 3.5.99.1, tag libreoffice-3.5.99.1 (3.6.0-beta1)Petr Mladek12 years
masterfdo#46808, use service constructor for i18n::CharacterClassificationStephan Bergmann12 years
 
TagDownloadAuthorAge
suse-3.6-appup-4binfilter-suse-3.6-appup-4.tar.gz  binfilter-suse-3.6-appup-4.zip  Andras Timar10 years
suse-3.6-appup-3binfilter-suse-3.6-appup-3.tar.gz  binfilter-suse-3.6-appup-3.zip  Andras Timar10 years
suse-3.6-5binfilter-suse-3.6-5.tar.gz  binfilter-suse-3.6-5.zip  Andras Timar10 years
suse-3.6-9binfilter-suse-3.6-9.tar.gz  binfilter-suse-3.6-9.zip  Andras Timar10 years
suse-3.6-8binfilter-suse-3.6-8.tar.gz  binfilter-suse-3.6-8.zip  Andras Timar10 years
suse-3.6-7binfilter-suse-3.6-7.tar.gz  binfilter-suse-3.6-7.zip  Andras Timar10 years
suse-3.6-6binfilter-suse-3.6-6.tar.gz  binfilter-suse-3.6-6.zip  Andras Timar10 years
suse-3.6-32binfilter-suse-3.6-32.tar.gz  binfilter-suse-3.6-32.zip  Andras Timar11 years
libreoffice-3.6.7.2binfilter-libreoffice-3.6.7.2.tar.gz  binfilter-libreoffice-3.6.7.2.zip  Christian Lohmaier11 years
suse-3.6-31binfilter-suse-3.6-31.tar.gz  binfilter-suse-3.6-31.zip  Andras Timar11 years
suse-3.6-30binfilter-suse-3.6-30.tar.gz  binfilter-suse-3.6-30.zip  Andras Timar11 years
libreoffice-3.6.7.1binfilter-libreoffice-3.6.7.1.tar.gz  binfilter-libreoffice-3.6.7.1.zip  Christian Lohmaier11 years
suse-3.6-29binfilter-suse-3.6-29.tar.gz  binfilter-suse-3.6-29.zip  Andras Timar11 years
suse-3.6-28binfilter-suse-3.6-28.tar.gz  binfilter-suse-3.6-28.zip  Andras Timar11 years
suse-3.6-27binfilter-suse-3.6-27.tar.gz  binfilter-suse-3.6-27.zip  Andras Timar11 years
suse-3.6-26binfilter-suse-3.6-26.tar.gz  binfilter-suse-3.6-26.zip  Andras Timar11 years
suse-3.6-25binfilter-suse-3.6-25.tar.gz  binfilter-suse-3.6-25.zip  Andras Timar11 years
suse-3.6-24binfilter-suse-3.6-24.tar.gz  binfilter-suse-3.6-24.zip  Andras Timar11 years
suse-3.6-23binfilter-suse-3.6-23.tar.gz  binfilter-suse-3.6-23.zip  Andras Timar11 years
suse-3.6-22binfilter-suse-3.6-22.tar.gz  binfilter-suse-3.6-22.zip  Andras Timar11 years
suse-3.6-21binfilter-suse-3.6-21.tar.gz  binfilter-suse-3.6-21.zip  Andras Timar11 years
suse-3.6-20binfilter-suse-3.6-20.tar.gz  binfilter-suse-3.6-20.zip  Andras Timar11 years
suse-3.6-19binfilter-suse-3.6-19.tar.gz  binfilter-suse-3.6-19.zip  Andras Timar11 years
suse-3.6-18binfilter-suse-3.6-18.tar.gz  binfilter-suse-3.6-18.zip  Andras Timar11 years
suse-3.6-17binfilter-suse-3.6-17.tar.gz  binfilter-suse-3.6-17.zip  Andras Timar11 years
libreoffice-3.6.6.2binfilter-libreoffice-3.6.6.2.tar.gz  binfilter-libreoffice-3.6.6.2.zip  Petr Mladek11 years
libreoffice-3.6.6.1binfilter-libreoffice-3.6.6.1.tar.gz  binfilter-libreoffice-3.6.6.1.zip  Petr Mladek11 years
suse-3.6-16binfilter-suse-3.6-16.tar.gz  binfilter-suse-3.6-16.zip  Andras Timar11 years
suse-3.6-15binfilter-suse-3.6-15.tar.gz  binfilter-suse-3.6-15.zip  Petr Mladek11 years
suse-3.6-14binfilter-suse-3.6-14.tar.gz  binfilter-suse-3.6-14.zip  Andras Timar11 years
suse-3.6-13binfilter-suse-3.6-13.tar.gz  binfilter-suse-3.6-13.zip  Andras Timar11 years
suse-3.6-12binfilter-suse-3.6-12.tar.gz  binfilter-suse-3.6-12.zip  Andras Timar11 years
suse-3.6-11binfilter-suse-3.6-11.tar.gz  binfilter-suse-3.6-11.zip  Andras Timar11 years
suse-3.6-10binfilter-suse-3.6-10.tar.gz  binfilter-suse-3.6-10.zip  Andras Timar11 years
libreoffice-3.6.5.2binfilter-libreoffice-3.6.5.2.tar.gz  binfilter-libreoffice-3.6.5.2.zip  Fridrich Štrba11 years
libreoffice-3.6.5.1binfilter-libreoffice-3.6.5.1.tar.gz  binfilter-libreoffice-3.6.5.1.zip  Fridrich Štrba11 years
suse-3.6-4binfilter-suse-3.6-4.tar.gz  binfilter-suse-3.6-4.zip  Petr Mladek12 years
libreoffice-3.6.4.3binfilter-libreoffice-3.6.4.3.tar.gz  binfilter-libreoffice-3.6.4.3.zip  Fridrich Štrba12 years
libreoffice-3.6.4.2binfilter-libreoffice-3.6.4.2.tar.gz  binfilter-libreoffice-3.6.4.2.zip  Petr Mladek12 years
suse-3.6-3binfilter-suse-3.6-3.tar.gz  binfilter-suse-3.6-3.zip  Petr Mladek12 years
libreoffice-3.6.4.1binfilter-libreoffice-3.6.4.1.tar.gz  binfilter-libreoffice-3.6.4.1.zip  Petr Mladek12 years
suse-3.6-2binfilter-suse-3.6-2.tar.gz  binfilter-suse-3.6-2.zip  Petr Mladek12 years
libreoffice-3.6.3.2binfilter-libreoffice-3.6.3.2.tar.gz  binfilter-libreoffice-3.6.3.2.zip  Petr Mladek12 years
suse-3.6-0binfilter-suse-3.6-0.tar.gz  binfilter-suse-3.6-0.zip  Andras Timar12 years
libreoffice-3.6.3.1binfilter-libreoffice-3.6.3.1.tar.gz  binfilter-libreoffice-3.6.3.1.zip  Fridrich Štrba12 years
libreoffice-3.5.7.2binfilter-libreoffice-3.5.7.2.tar.gz  binfilter-libreoffice-3.5.7.2.zip  Fridrich Štrba12 years
libreoffice-3.6.2.2binfilter-libreoffice-3.6.2.2.tar.gz  binfilter-libreoffice-3.6.2.2.zip  Fridrich Štrba12 years
libreoffice-3.5.7.1binfilter-libreoffice-3.5.7.1.tar.gz  binfilter-libreoffice-3.5.7.1.zip  Fridrich Štrba12 years
libreoffice-3.6.2.1binfilter-libreoffice-3.6.2.1.tar.gz  binfilter-libreoffice-3.6.2.1.zip  Petr Mladek12 years
libreoffice-3.6.1.2binfilter-libreoffice-3.6.1.2.tar.gz  binfilter-libreoffice-3.6.1.2.zip  Petr Mladek12 years
libreoffice-3.6.1.1binfilter-libreoffice-3.6.1.1.tar.gz  binfilter-libreoffice-3.6.1.1.zip  Petr Mladek12 years
libreoffice-3.5.6.2binfilter-libreoffice-3.5.6.2.tar.gz  binfilter-libreoffice-3.5.6.2.zip  Petr Mladek12 years
libreoffice-3.5.6.1binfilter-libreoffice-3.5.6.1.tar.gz  binfilter-libreoffice-3.5.6.1.zip  Petr Mladek12 years
libreoffice-3.6.0.4binfilter-libreoffice-3.6.0.4.tar.gz  binfilter-libreoffice-3.6.0.4.zip  Petr Mladek12 years
libreoffice-3.6.0.3binfilter-libreoffice-3.6.0.3.tar.gz  binfilter-libreoffice-3.6.0.3.zip  Petr Mladek12 years
libreoffice-3.6.0.2binfilter-libreoffice-3.6.0.2.tar.gz  binfilter-libreoffice-3.6.0.2.zip  Fridrich Štrba12 years
libreoffice-3.6.0.1binfilter-libreoffice-3.6.0.1.tar.gz  binfilter-libreoffice-3.6.0.1.zip  Petr Mladek12 years
libreoffice-3.6.0.0.beta3binfilter-libreoffice-3.6.0.0.beta3.tar.gz  binfilter-libreoffice-3.6.0.0.beta3.zip  Petr Mladek12 years
libreoffice-3.5.5.3binfilter-libreoffice-3.5.5.3.tar.gz  binfilter-libreoffice-3.5.5.3.zip  Petr Mladek12 years
libreoffice-3.5.5.2binfilter-libreoffice-3.5.5.2.tar.gz  binfilter-libreoffice-3.5.5.2.zip  Petr Mladek12 years
libreoffice-3.6.0.0.beta2binfilter-libreoffice-3.6.0.0.beta2.tar.gz  binfilter-libreoffice-3.6.0.0.beta2.zip  Petr Mladek12 years
libreoffice-3.5.5.1binfilter-libreoffice-3.5.5.1.tar.gz  binfilter-libreoffice-3.5.5.1.zip  Petr Mladek12 years
libreoffice-3.5.99.1binfilter-libreoffice-3.5.99.1.tar.gz  binfilter-libreoffice-3.5.99.1.zip  Petr Mladek12 years
libreoffice-3-6-branch-pointbinfilter-libreoffice-3-6-branch-point.tar.gz  binfilter-libreoffice-3-6-branch-point.zip  Petr Mladek12 years
libreoffice-3.5.98.1binfilter-libreoffice-3.5.98.1.tar.gz  binfilter-libreoffice-3.5.98.1.zip  Petr Mladek12 years
libreoffice-3.5.4.2binfilter-libreoffice-3.5.4.2.tar.gz  binfilter-libreoffice-3.5.4.2.zip  Petr Mladek12 years
libreoffice-3.5.4.1binfilter-libreoffice-3.5.4.1.tar.gz  binfilter-libreoffice-3.5.4.1.zip  Petr Mladek12 years
libreoffice-3.5.3.2binfilter-libreoffice-3.5.3.2.tar.gz  binfilter-libreoffice-3.5.3.2.zip  Petr Mladek12 years
libreoffice-3.5.3.1binfilter-libreoffice-3.5.3.1.tar.gz  binfilter-libreoffice-3.5.3.1.zip  Petr Mladek12 years
libreoffice-3.5.2.2binfilter-libreoffice-3.5.2.2.tar.gz  binfilter-libreoffice-3.5.2.2.zip  Petr Mladek12 years
libreoffice-3.5.2.1binfilter-libreoffice-3.5.2.1.tar.gz  binfilter-libreoffice-3.5.2.1.zip  Petr Mladek12 years
libreoffice-3.5.1.2binfilter-libreoffice-3.5.1.2.tar.gz  binfilter-libreoffice-3.5.1.2.zip  Petr Mladek12 years
libreoffice-3.5.1.1binfilter-libreoffice-3.5.1.1.tar.gz  binfilter-libreoffice-3.5.1.1.zip  Petr Mladek12 years
libreoffice-3.5.0.3binfilter-libreoffice-3.5.0.3.tar.gz  binfilter-libreoffice-3.5.0.3.zip  Petr Mladek12 years
libreoffice-3.5.0.2binfilter-libreoffice-3.5.0.2.tar.gz  binfilter-libreoffice-3.5.0.2.zip  Petr Mladek12 years
libreoffice-3.5.0.1binfilter-libreoffice-3.5.0.1.tar.gz  binfilter-libreoffice-3.5.0.1.zip  Fridrich Štrba12 years
libreoffice-3.4.99.3binfilter-libreoffice-3.4.99.3.tar.gz  binfilter-libreoffice-3.4.99.3.zip  Petr Mladek12 years
libreoffice-3.4.99.0binfilter-libreoffice-3.4.99.0.tar.gz  binfilter-libreoffice-3.4.99.0.zip  Petr Mladek13 years
libreoffice-3.4.99.2binfilter-libreoffice-3.4.99.2.tar.gz  binfilter-libreoffice-3.4.99.2.zip  Petr Mladek13 years
libreoffice-3.4.99.1binfilter-libreoffice-3.4.99.1.tar.gz  binfilter-libreoffice-3.4.99.1.zip  Petr Mladek13 years
libreoffice-3-5-branch-pointbinfilter-libreoffice-3-5-branch-point.tar.gz  binfilter-libreoffice-3-5-branch-point.zip  Petr Mladek13 years
libreoffice-3.5.0.0binfilter-libreoffice-3.5.0.0.tar.gz  binfilter-libreoffice-3.5.0.0.zip  Petr Mladek13 years
MELD_LIBREOFFICE_REPOSbinfilter-MELD_LIBREOFFICE_REPOS.tar.gz  binfilter-MELD_LIBREOFFICE_REPOS.zip  Norbert Thiebaud13 years
binfilter_libreoffice-3.3.4.1binfilter_libreoffice-3.3.4.1.tar.gz  binfilter_libreoffice-3.3.4.1.zip  Petr Mladek13 years
binfilter_libreoffice-3.4.2.3binfilter_libreoffice-3.4.2.3.tar.gz  binfilter_libreoffice-3.4.2.3.zip  Petr Mladek13 years
binfilter_feature/gnumake4_writerfilter_headbinfilter_feature/gnumake4_writerfilter_head.tar.gz