commit mgp for openSUSE:Factory
Hello community,
here is the log from the commit of package mgp for openSUSE:Factory checked in
at 2018-02-21 14:13:35
Comparing /work/SRC/openSUSE:Factory/mgp (Old)
and /work/SRC/openSUSE:Factory/.mgp.new (New)
Package is "mgp"
Wed Feb 21 14:13:35 2018 rev:28 rq:578564 version:1.13a
Changes:
--- /work/SRC/openSUSE:Factory/mgp/mgp.changes 2018-02-09 15:46:35.485447984
+0100
+++ /work/SRC/openSUSE:Factory/.mgp.new/mgp.changes 2018-02-21
14:13:36.841559957 +0100
@@ -1,0 +2,10 @@
+Tue Feb 20 17:51:46 UTC 2018 - crrodrig...@opensuse.org
+
+- Fix BuildRequires:
+ * remove xorg-x11-devel
+ * remove libpng, libmng, gilib, all unused when imlib2
+is enabled
+ * remove freetype2-devel, unused, app only supports
+freetype1 which is no longer available, FT2 support
+is provided via xft library.
+---
Other differences:
--
++ mgp.spec ++
--- /var/tmp/diff_new_pack.VIf4xs/_old 2018-02-21 14:13:38.049516455 +0100
+++ /var/tmp/diff_new_pack.VIf4xs/_new 2018-02-21 14:13:38.053516311 +0100
@@ -44,14 +44,14 @@
BuildRequires: bison
BuildRequires: emacs-nox
BuildRequires: flex
-BuildRequires: freetype2-devel
-BuildRequires: giflib-devel
+BuildRequires: imake
BuildRequires: imlib2-devel
-BuildRequires: libmng-devel
-BuildRequires: libpng-devel
BuildRequires: pkgconfig
BuildRequires: sharutils
-BuildRequires: xorg-x11-devel
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xft)
+BuildRequires: pkgconfig(xmu)
Requires: perl
Requires: sharutils
Recommends: imlib2
@@ -90,14 +90,11 @@
%build
autoreconf -fiv
# FIXME: you should use the %%configure macro
-%configure \
- --enable-gif \
+%configure --disable-gif \
--enable-imlib \
--enable-locale \
--disable-vflib \
- --enable-freetype-charset16 \
- --enable-freetype \
- --with-freetype-lib=%{_libdir}
+ --disable-freetype
xmkmf -a
make Makefiles
make CCOPTIONS="%{optflags}"
commit mgp for openSUSE:Factory
Hello community, here is the log from the commit of package mgp for openSUSE:Factory checked in at 2018-02-09 15:46:33 Comparing /work/SRC/openSUSE:Factory/mgp (Old) and /work/SRC/openSUSE:Factory/.mgp.new (New) Package is "mgp" Fri Feb 9 15:46:33 2018 rev:27 rq:573908 version:1.13a Changes: --- /work/SRC/openSUSE:Factory/mgp/mgp.changes 2017-11-15 16:59:59.219228019 +0100 +++ /work/SRC/openSUSE:Factory/.mgp.new/mgp.changes 2018-02-09 15:46:35.485447984 +0100 @@ -1,0 +2,5 @@ +Wed Feb 7 21:09:39 UTC 2018 - meiss...@suse.com + +- the "requires freetype" no longer seems necessary. + +--- Other differences: -- ++ mgp.spec ++ --- /var/tmp/diff_new_pack.YHgKIR/_old 2018-02-09 15:46:36.325417821 +0100 +++ /var/tmp/diff_new_pack.YHgKIR/_new 2018-02-09 15:46:36.329417678 +0100 @@ -1,7 +1,7 @@ # # spec file for package mgp # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,7 +44,6 @@ BuildRequires: bison BuildRequires: emacs-nox BuildRequires: flex -BuildRequires: freetype BuildRequires: freetype2-devel BuildRequires: giflib-devel BuildRequires: imlib2-devel @@ -53,7 +52,6 @@ BuildRequires: pkgconfig BuildRequires: sharutils BuildRequires: xorg-x11-devel -Requires: freetype Requires: perl Requires: sharutils Recommends: imlib2
commit mgp for openSUSE:Factory
Hello community,
here is the log from the commit of package mgp for openSUSE:Factory checked in
at 2017-11-15 16:59:54
Comparing /work/SRC/openSUSE:Factory/mgp (Old)
and /work/SRC/openSUSE:Factory/.mgp.new (New)
Package is "mgp"
Wed Nov 15 16:59:54 2017 rev:26 rq:541795 version:1.13a
Changes:
--- /work/SRC/openSUSE:Factory/mgp/mgp.changes 2016-06-25 02:22:36.0
+0200
+++ /work/SRC/openSUSE:Factory/.mgp.new/mgp.changes 2017-11-15
16:59:59.219228019 +0100
@@ -1,0 +2,11 @@
+Tue Nov 14 12:27:03 UTC 2017 - mplus...@suse.com
+
+- Cleanup with spec-cleaner
+
+---
+Mon Nov 13 15:05:42 UTC 2017 - dims...@opensuse.org
+
+- Rename README.SuSE to README.SUSE, adhering to the correct
+ spelling.
+
+---
Old:
README.SuSE
New:
README.SUSE
Other differences:
--
++ mgp.spec ++
--- /var/tmp/diff_new_pack.hqtgBz/_old 2017-11-15 17:00:00.063197117 +0100
+++ /var/tmp/diff_new_pack.hqtgBz/_new 2017-11-15 17:00:00.067196971 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mgp
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,24 +17,6 @@
Name: mgp
-BuildRequires: automake
-BuildRequires: bison
-BuildRequires: emacs-nox
-BuildRequires: flex
-BuildRequires: freetype
-BuildRequires: freetype2-devel
-BuildRequires: giflib-devel
-BuildRequires: imlib2-devel
-BuildRequires: libmng-devel
-BuildRequires: libpng-devel
-BuildRequires: pkgconfig
-BuildRequires: sharutils
-BuildRequires: xorg-x11-devel
-Provides: magicpoint
-Requires: freetype
-Requires: perl
-Requires: sharutils
-Recommends: imlib2
Version:1.13a
Release:0
Summary:MagicPoint, an X Window System Presentation Tool
@@ -42,7 +24,7 @@
Group: Productivity/Publishing/Presentation
Url:http://member.wide.ad.jp/wg/mgp/
Source: magicpoint-%{version}.tar.bz2
-Source1:README.SuSE
+Source1:README.SUSE
Patch1: magicpoint-ia64.diff
Patch2: magicpoint-imlib2.patch
Patch3: magicpoint-%{version}-tffonts.diff
@@ -58,7 +40,24 @@
Patch15:mgp-imlib2-segfault-fix.diff
Patch16:mgp-alpha-channel.diff
Patch17:mpg-netpbm-jpeg-fix.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: automake
+BuildRequires: bison
+BuildRequires: emacs-nox
+BuildRequires: flex
+BuildRequires: freetype
+BuildRequires: freetype2-devel
+BuildRequires: giflib-devel
+BuildRequires: imlib2-devel
+BuildRequires: libmng-devel
+BuildRequires: libpng-devel
+BuildRequires: pkgconfig
+BuildRequires: sharutils
+BuildRequires: xorg-x11-devel
+Requires: freetype
+Requires: perl
+Requires: sharutils
+Recommends: imlib2
+Provides: magicpoint
%description
MagicPoint is an X Window System presentation tool. It is designed to
@@ -70,7 +69,7 @@
into other file formats.
%prep
-%setup -n magicpoint-%{version}
+%setup -q -n magicpoint-%{version}
#%patch
%patch1
%patch2 -p1
@@ -91,44 +90,42 @@
rm -rf sample/CVS
%build
-%{?suse_update_config:%{suse_update_config -f}}
-autoreconf --force --install
-CFLAGS=$RPM_OPT_FLAGS _lib=%{_lib} \
-./configure \
---prefix=/usr --mandir=%{_mandir} --enable-gif --enable-imlib \
---enable-locale --disable-vflib --enable-freetype-charset16 \
---enable-freetype --with-freetype-lib=/usr/%_lib
+autoreconf -fiv
+# FIXME: you should use the %%configure macro
+%configure \
+ --enable-gif \
+ --enable-imlib \
+ --enable-locale \
+ --disable-vflib \
+ --enable-freetype-charset16 \
+ --enable-freetype \
+ --with-freetype-lib=%{_libdir}
xmkmf -a
make Makefiles
-make CCOPTIONS="$RPM_OPT_FLAGS"
+make CCOPTIONS="%{optflags}"
emacs --batch --no-site -f batch-byte-compile contrib/mgp-mode20.el
%install
-make DESTDIR=$RPM_BUILD_ROOT install
-make DESTDIR=$RPM_BUILD_ROOT install.man
-install -d $RPM_BUILD_ROOT/usr/bin
-install -c contrib/mgp2html.pl $RPM_BUILD_ROOT/usr/bin/mgp2html
-install -c contrib/mgp2latex.pl $RPM_BUILD_ROOT/usr/bin/mgp2latex
-install -d $RPM_BUILD_ROOT/usr/share/emacs/site-lisp
-install -p -m644 contrib/mgp-mode20.el{,c}
$RPM_BUILD_ROOT/usr/share/emacs/site-lisp
+%make_install install.man
+install -d %{buildroot}%{_bindir}
+install -c contrib/mgp2html.pl %{buildroot}%{_bindir}/mgp2html
+install -c contrib/mgp2latex.pl %{buildroot}%{_bindir}/mgp2latex
+install -d
commit mgp for openSUSE:Factory
Hello community,
here is the log from the commit of package mgp for openSUSE:Factory checked in
at 2016-06-25 02:22:20
Comparing /work/SRC/openSUSE:Factory/mgp (Old)
and /work/SRC/openSUSE:Factory/.mgp.new (New)
Package is "mgp"
Changes:
--- /work/SRC/openSUSE:Factory/mgp/mgp.changes 2016-05-25 21:28:22.0
+0200
+++ /work/SRC/openSUSE:Factory/.mgp.new/mgp.changes 2016-06-25
02:22:36.0 +0200
@@ -1,0 +2,6 @@
+Tue Jun 21 09:57:14 CEST 2016 - ti...@suse.de
+
+- Fix obsoleted jpeg conversion programs to the netpbm ones:
+ mpg-netpbm-jpeg-fix.diff
+
+---
New:
mpg-netpbm-jpeg-fix.diff
Other differences:
--
++ mgp.spec ++
--- /var/tmp/diff_new_pack.Sqp91S/_old 2016-06-25 02:22:38.0 +0200
+++ /var/tmp/diff_new_pack.Sqp91S/_new 2016-06-25 02:22:38.0 +0200
@@ -57,6 +57,7 @@
Patch14:mgp-bilinear-zoom.diff
Patch15:mgp-imlib2-segfault-fix.diff
Patch16:mgp-alpha-channel.diff
+Patch17:mpg-netpbm-jpeg-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -85,6 +86,7 @@
%patch14 -p1
%patch15 -p1
%patch16 -p1
+%patch17 -p1
cp %{SOURCE1} .
rm -rf sample/CVS
++ mpg-netpbm-jpeg-fix.diff ++
---
mgp.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/mgp.c
+++ b/mgp.c
@@ -510,7 +510,7 @@ genhtml(start_page)
FILE *txt;
int page;
char *childdebug;
- char *convdb[][3] = {{ "jpg", "cjpeg", "djpeg" },
+ char *convdb[][3] = {{ "jpg", "pnmtojpeg", "jpegtopnm" },
{ "png", "pnmtopng", "pngtopnm" },
{ { 0 }, { 0 }, { 0 } }};
int inum = 0;
commit mgp for openSUSE:Factory
Hello community,
here is the log from the commit of package mgp for openSUSE:Factory checked in
at 2016-05-25 21:28:14
Comparing /work/SRC/openSUSE:Factory/mgp (Old)
and /work/SRC/openSUSE:Factory/.mgp.new (New)
Package is "mgp"
Changes:
--- /work/SRC/openSUSE:Factory/mgp/mgp.changes 2016-05-23 16:39:06.0
+0200
+++ /work/SRC/openSUSE:Factory/.mgp.new/mgp.changes 2016-05-25
21:28:22.0 +0200
@@ -1,0 +2,7 @@
+Mon May 23 16:06:14 CEST 2016 - ti...@suse.de
+
+- Fix the incomplete previous patch for the alpha channel
+ (boo#980768):
+ mgp-alpha-channel.diff
+
+---
Other differences:
--
++ mgp-alpha-channel.diff ++
--- /var/tmp/diff_new_pack.huyWWm/_old 2016-05-25 21:28:23.0 +0200
+++ /var/tmp/diff_new_pack.huyWWm/_new 2016-05-25 21:28:23.0 +0200
@@ -1,13 +1,27 @@
---
- draw.c| 41 --
+ draw.c| 35 +-
image/image.h |1
image/new.c |4 ++
image/zoom.c | 78
--
- 4 files changed, 113 insertions(+), 11 deletions(-)
+ 4 files changed, 109 insertions(+), 9 deletions(-)
--- a/draw.c
+++ b/draw.c
-@@ -1980,6 +1980,7 @@ obj_image_trans(image, x, y)
+@@ -1966,6 +1966,13 @@ obj_image_color(image, bimage, d, inithi
+ return i;
+ }
+
++static Pixel impose_pixel(Pixel fore, Pixel back, byte a)
++{
++ return RGB_TO_TRUE(TRUE_RED(fore) * a + TRUE_RED(back) * (255 - a),
++ TRUE_GREEN(fore) * a + TRUE_GREEN(back) * (255 - a),
++ TRUE_BLUE(fore) * a + TRUE_BLUE(back) * (255 - a));
++}
++
+ static Image *
+ obj_image_trans(image, x, y)
+ Image *image;
+@@ -1980,6 +1987,7 @@ obj_image_trans(image, x, y)
int trans;
u_int bw, bh, bx, by;
int inithist;
@@ -15,35 +29,27 @@
if (!COMPLEX_BGIMAGE) {
if (back_color[caching] != xcol.pixel) {
-@@ -1995,10 +1996,25 @@ obj_image_trans(image, x, y)
- image->rgb.blue[image->trans] = xcol.blue;
- break;
- case ITRUE:
-- d = image->trans;
-- n = RGB_TO_TRUE(xcol.red, xcol.green, xcol.blue);
+@@ -1999,6 +2007,19 @@ obj_image_trans(image, x, y)
+ n = RGB_TO_TRUE(xcol.red, xcol.green, xcol.blue);
pl = image->pixlen;
p = image->data;
+ if (image->alpha) {
+ alpha = image->alpha;
+ for (j = 0; j < image->height; j++) {
+ for (i = 0; i < image->width; i++, p +=
pl) {
-+ byte a = *alpha++ - 255;
-+ if (!a)
++ byte a = *alpha++;
++ if (a == 255)
+ continue;
-+ n = RGB_TO_TRUE(xcol.red * a /
255,
-+ xcol.green * a
/ 255,
-+ xcol.blue * a /
255);
-+ valToMem(n, p, pl);
++ d = impose_pixel(memToVal(p,
pl), n, a);
++ valToMem(d, p, pl);
+ }
+ }
+ break;
+ }
-+ d = image->trans;
-+ n = RGB_TO_TRUE(xcol.red, xcol.green, xcol.blue);
for (j = 0; j < image->height; j++) {
for (i = 0; i < image->width; i++, p += pl) {
if (memToVal(p, pl) == d)
-@@ -2024,6 +2040,8 @@ obj_image_trans(image, x, y)
+@@ -2024,6 +2045,8 @@ obj_image_trans(image, x, y)
}
pl = image->pixlen;
p = image->data + image->width * j * pl;
@@ -52,31 +58,24 @@
bpl = bgpixmap[bgindex].image->pixlen;
pd = -1;
n = 0; /* for lint */
-@@ -2040,6 +2058,23 @@ obj_image_trans(image, x, y)
+@@ -2040,6 +2063,16 @@ obj_image_trans(image, x, y)
b = bgpixmap[bgindex].image->data +
bgpixmap[bgindex].image->width * by *
bpl;
}
+ if (alpha) {
+ byte a = *alpha++;
-+
commit mgp for openSUSE:Factory
Hello community,
here is the log from the commit of package mgp for openSUSE:Factory checked in
at 2016-05-23 16:39:04
Comparing /work/SRC/openSUSE:Factory/mgp (Old)
and /work/SRC/openSUSE:Factory/.mgp.new (New)
Package is "mgp"
Changes:
--- /work/SRC/openSUSE:Factory/mgp/mgp.changes 2012-11-14 09:14:39.0
+0100
+++ /work/SRC/openSUSE:Factory/.mgp.new/mgp.changes 2016-05-23
16:39:06.0 +0200
@@ -1,0 +2,9 @@
+Thu May 19 19:45:51 CEST 2016 - ti...@suse.de
+
+- Implement the alpha channel support for fix the rendering bug
+ of images with transparent color (boo#980768):
+ mgp-alpha-channel.diff
+ Refresh mgp-bilinear-zoom.diff for a workaround of transparent
+ bug, too
+
+---
New:
mgp-alpha-channel.diff
Other differences:
--
++ mgp.spec ++
--- /var/tmp/diff_new_pack.98Dzc8/_old 2016-05-23 16:39:07.0 +0200
+++ /var/tmp/diff_new_pack.98Dzc8/_new 2016-05-23 16:39:07.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mgp
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -56,6 +56,7 @@
Patch13:magicpoint-%{version}-warnings.patch
Patch14:mgp-bilinear-zoom.diff
Patch15:mgp-imlib2-segfault-fix.diff
+Patch16:mgp-alpha-channel.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -83,6 +84,7 @@
%patch13
%patch14 -p1
%patch15 -p1
+%patch16 -p1
cp %{SOURCE1} .
rm -rf sample/CVS
++ mgp-alpha-channel.diff ++
---
draw.c| 41 --
image/image.h |1
image/new.c |4 ++
image/zoom.c | 78 --
4 files changed, 113 insertions(+), 11 deletions(-)
--- a/draw.c
+++ b/draw.c
@@ -1980,6 +1980,7 @@ obj_image_trans(image, x, y)
int trans;
u_int bw, bh, bx, by;
int inithist;
+ byte *alpha = NULL;
if (!COMPLEX_BGIMAGE) {
if (back_color[caching] != xcol.pixel) {
@@ -1995,10 +1996,25 @@ obj_image_trans(image, x, y)
image->rgb.blue[image->trans] = xcol.blue;
break;
case ITRUE:
- d = image->trans;
- n = RGB_TO_TRUE(xcol.red, xcol.green, xcol.blue);
pl = image->pixlen;
p = image->data;
+ if (image->alpha) {
+ alpha = image->alpha;
+ for (j = 0; j < image->height; j++) {
+ for (i = 0; i < image->width; i++, p +=
pl) {
+ byte a = *alpha++ - 255;
+ if (!a)
+ continue;
+ n = RGB_TO_TRUE(xcol.red * a /
255,
+ xcol.green * a
/ 255,
+ xcol.blue * a /
255);
+ valToMem(n, p, pl);
+ }
+ }
+ break;
+ }
+ d = image->trans;
+ n = RGB_TO_TRUE(xcol.red, xcol.green, xcol.blue);
for (j = 0; j < image->height; j++) {
for (i = 0; i < image->width; i++, p += pl) {
if (memToVal(p, pl) == d)
@@ -2024,6 +2040,8 @@ obj_image_trans(image, x, y)
}
pl = image->pixlen;
p = image->data + image->width * j * pl;
+ if (image->type == ITRUE && image->alpha)
+ alpha = image->alpha + image->width * j;
bpl = bgpixmap[bgindex].image->pixlen;
pd = -1;
n = 0; /* for lint */
@@ -2040,6 +2058,23 @@ obj_image_trans(image, x, y)
b = bgpixmap[bgindex].image->data +
bgpixmap[bgindex].image->width * by *
bpl;
}
+ if (alpha) {
+ byte a = *alpha++;
+ int n, v;
+ if (a == 255)
+ continue;
+ n = memToVal(p, pl);
+
commit mgp for openSUSE:Factory
Hello community,
here is the log from the commit of package mgp for openSUSE:Factory checked in
at 2012-11-14 09:14:38
Comparing /work/SRC/openSUSE:Factory/mgp (Old)
and /work/SRC/openSUSE:Factory/.mgp.new (New)
Package is mgp, Maintainer is nadvor...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mgp/mgp.changes 2011-12-08 11:53:10.0
+0100
+++ /work/SRC/openSUSE:Factory/.mgp.new/mgp.changes 2012-11-14
09:14:39.0 +0100
@@ -1,0 +2,12 @@
+Wed Aug 22 17:48:46 CEST 2012 - ti...@suse.de
+
+- Add recommends imlib2 to be installed automatically
+
+---
+Thu Aug 16 16:53:19 CEST 2012 - ti...@suse.de
+
+- Add bilinear image resampling (bnc#789418)
+- Fix BadDrawable error with zoomonclk (bnc#789416)
+- Fix the potential buffer overflow in imlib handling code
+
+---
New:
mgp-bilinear-zoom.diff
mgp-imlib2-segfault-fix.diff
Other differences:
--
++ mgp.spec ++
--- /var/tmp/diff_new_pack.K2yOqy/_old 2012-11-14 09:14:40.0 +0100
+++ /var/tmp/diff_new_pack.K2yOqy/_new 2012-11-14 09:14:40.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mgp
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: mgp
BuildRequires: automake
BuildRequires: bison
@@ -29,13 +30,16 @@
BuildRequires: pkgconfig
BuildRequires: sharutils
BuildRequires: xorg-x11-devel
-License:BSD-3-Clause
-Group: Productivity/Publishing/Presentation
Provides: magicpoint
-Requires: perl freetype sharutils
+Requires: freetype
+Requires: perl
+Requires: sharutils
+Recommends: imlib2
Version:1.13a
Release:0
Summary:MagicPoint, an X Window System Presentation Tool
+License:BSD-3-Clause
+Group: Productivity/Publishing/Presentation
Url:http://member.wide.ad.jp/wg/mgp/
Source: magicpoint-%{version}.tar.bz2
Source1:README.SuSE
@@ -50,6 +54,8 @@
Patch10:magicpoint-%{version}-xft-rendering-fix.diff
Patch11:magicpoint-%{version}-lib64.diff
Patch13:magicpoint-%{version}-warnings.patch
+Patch14:mgp-bilinear-zoom.diff
+Patch15:mgp-imlib2-segfault-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -75,6 +81,8 @@
#patch10
%patch11
%patch13
+%patch14 -p1
+%patch15 -p1
cp %{SOURCE1} .
rm -rf sample/CVS
++ mgp-bilinear-zoom.diff ++
---
image/zoom.c | 159 ++-
mgp.c|9 ++-
mgp.man |2
3 files changed, 168 insertions(+), 2 deletions(-)
--- a/image/zoom.c
+++ b/image/zoom.c
@@ -11,6 +11,8 @@
#include copyright.h
#include image.h
+int smooth_scaling = 1;
+
static unsigned int *buildIndex(width, zoom, rwidth)
unsigned int width;
float zoom;
@@ -36,6 +38,144 @@ static unsigned int *buildIndex(width, z
return(index);
}
+static Pixel rgb8_to_true(r, g, b)
+ byte r;
+ byte g;
+ byte b;
+{
+ return (Pixel)r 16 | (Pixel)g 8 | (Pixel)b;
+}
+
+/* simple bilinear resampling */
+static void resize_image(oimage, image)
+ Image *oimage;
+ Image *image;
+{
+ double cx, cy, xoff, yoff;
+ double xstep, ystep;
+ int maxx, maxy;
+ int x1, x2, y1, y2;
+ int i, j;
+ byte *line1, *line2;
+ byte *destptr;
+ unsigned int srclinelen;
+ unsigned int pixlen;
+ Pixel v[4];
+ unsigned int r, g, b;
+
+ maxx = oimage-width - 1;
+ maxy = oimage-height - 1;
+ pixlen= oimage-pixlen;
+ srclinelen= oimage-width * pixlen;
+ destptr = image-data;
+ cy = 0;
+ xstep = (double)oimage-width / (double)image-width;
+ ystep = (double)oimage-height / (double)image-height;
+ for (j = image-height; j 0; j--) {
+y1 = cy;
+if (y1 = maxy) {
+ y1 = y2 = maxy;
+ yoff = 0;
+} else {
+ y2 = y1 + 1;
+ yoff = cy - y1;
+}
+line1 = oimage-data + srclinelen * y1;
+line2 = oimage-data + srclinelen * y2;
+cx = 0;
+for (i = image-width; i 0; i--) {
+ x1 = cx;
+ if (x1 = maxx) {
+ x1 = x2 = maxx;
+ xoff = 0;
+ } else {
+ x2 = x1 + 1;
+ xoff = cx - x1;
+ }
+ v[0] = memToVal(line1 + pixlen * x1, pixlen);
+ v[1] = memToVal(line1 + pixlen * x2, pixlen);
+ v[2] = memToVal(line2 + pixlen *
commit mgp for openSUSE:Factory
Hello community,
here is the log from the commit of package mgp for openSUSE:Factory checked in
at 2011-12-08 11:51:09
Comparing /work/SRC/openSUSE:Factory/mgp (Old)
and /work/SRC/openSUSE:Factory/.mgp.new (New)
Package is mgp, Maintainer is nadvor...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mgp/mgp.changes 2011-09-23 02:13:01.0
+0200
+++ /work/SRC/openSUSE:Factory/.mgp.new/mgp.changes 2011-12-08
11:53:10.0 +0100
@@ -1,0 +2,5 @@
+Thu Dec 1 16:47:08 UTC 2011 - co...@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
+---
Other differences:
--
++ mgp.spec ++
--- /var/tmp/diff_new_pack.gwhkXO/_old 2011-12-08 11:53:13.0 +0100
+++ /var/tmp/diff_new_pack.gwhkXO/_new 2011-12-08 11:53:13.0 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package mgp (Version 1.13a)
+# spec file for package mgp
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,18 +15,26 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
-
Name: mgp
-BuildRequires: bison emacs-nox flex freetype freetype2-devel giflib-devel
imlib2-devel libmng-devel libpng-devel pkgconfig sharutils xorg-x11-devel
-License:BSD3c
+BuildRequires: automake
+BuildRequires: bison
+BuildRequires: emacs-nox
+BuildRequires: flex
+BuildRequires: freetype
+BuildRequires: freetype2-devel
+BuildRequires: giflib-devel
+BuildRequires: imlib2-devel
+BuildRequires: libmng-devel
+BuildRequires: libpng-devel
+BuildRequires: pkgconfig
+BuildRequires: sharutils
+BuildRequires: xorg-x11-devel
+License:BSD-3-Clause
Group: Productivity/Publishing/Presentation
Provides: magicpoint
Requires: perl freetype sharutils
-AutoReqProv:on
Version:1.13a
-Release:97
+Release:0
Summary:MagicPoint, an X Window System Presentation Tool
Url:http://member.wide.ad.jp/wg/mgp/
Source: magicpoint-%{version}.tar.bz2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
