[Libreoffice-commits] core.git: 14 commits - svx/inc svx/sdi sw/sdi sw/source vcl/inc vcl/Library_vcl.mk vcl/Package_inc.mk vcl/source

[David Tardon]

Hi,

On Sun, Apr 21, 2013 at 12:58:45PM -0700, Tomaž Vajngerl wrote:
> diff --git a/vcl/source/filter/jpeg/jinclude.h b/vcl/source/filter/jpeg/jinclude.h
> new file mode 100644
> index 0000000..121fbec
> --- /dev/null
> +++ b/vcl/source/filter/jpeg/jinclude.h
> @@ -0,0 +1,91 @@
> +/*
> + * jinclude.h
> + *
> + * Copyright (C) 1991-1994, Thomas G. Lane.
> + * This file is part of the Independent JPEG Group's software.
> + * For conditions of distribution and use, see the accompanying README file.
> ...

> diff --git a/vcl/source/filter/jpeg/jpegcomp.h b/vcl/source/filter/jpeg/jpegcomp.h
> new file mode 100644
> index 0000000..ed9eeab
> --- /dev/null
> +++ b/vcl/source/filter/jpeg/jpegcomp.h
> @@ -0,0 +1,30 @@
> +/*
> + * jpegcomp.h
> + *
> + * Copyright (C) 2010, D. R. Commander
> + * For conditions of distribution and use, see the accompanying README file.
> ...

> diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c
> new file mode 100644
> index 0000000..24b7667
> --- /dev/null
> +++ b/vcl/source/filter/jpeg/transupp.c
> @@ -0,0 +1,1628 @@
> +/*
> + * transupp.c
> + *
> + * This file was part of the Independent JPEG Group's software:
> + * Copyright (C) 1997-2011, Thomas G. Lane, Guido Vollbeding.
> + * Modifications:
> + * Copyright (C) 2010, D. R. Commander.
> + * For conditions of distribution and use, see the accompanying README file.
> ...

Is it all right, license-wise, to put source files from the jpeg library
directly into our source tree?

D.