Skip to content

Commit

Permalink
bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@pchilds
pchilds committed Aug 22, 2012
1 parent db759b9 commit ab2b3f3
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions configure.ac
View file
Expand Up @@ -10,15 +10,15 @@ LT_PREREQ([2.2])
LT_INIT([win32-dll])
AC_SUBST([PLOT_API_VERSION], [2.0])
AC_SUBST([PLOT_GTK_MAJOR], [2])
AC_SUBST([PLOT_GTK_VERSION], [gtk+-2.0 >= 2.14])
AC_SUBST([PLOT_GTK_VERSION], [gtk+-2.0 >= 2.22])
AC_SUBST([PLOT_SDIR], [gtk2plot])
lt_enable_auto_import=
case "$host_os" in
mingw*)
lt_enable_auto_import="-Wl,--enable-auto-import"
esac
AC_SUBST([lt_enable_auto_import])
PKG_CHECK_MODULES([PLOT], [gtk+-2.0 >= 2.14])
PKG_CHECK_MODULES([PLOT], [gtk+-2.0 >= 2.22])
AC_CONFIG_FILES([Makefile gtk2plot/Makefile \
gtkplot-2.0.pc:gtkplot.pc.in \
COPYING:COPYING-2.0.in \
Expand Down
10 changes: 5 additions & 5 deletions gtk2plot/Makefile.am
View file
Expand Up @@ -4,11 +4,11 @@ MAINTAINERCLEANFILES=Makefile.in
gtkplot_libincludedir=$(libdir)/gtkplot-2.0/include
nodist_gtkplot_libinclude_HEADERS=../gtkplotconfig.h

lib_LTLIBRARIES=libgtkplot-@PLOT_API_VERSION@.la
libgtkplot_@PLOT_API_VERSION@_la_SOURCES= \
lib_LTLIBRARIES=libgtkplot-2.0.la
libgtkplot_2.0_la_SOURCES= \
gtkplotlinear.c \
gtkplotpolar.c
libgtkplot_@PLOT_API_VERSION@_la_LDFLAGS= \
libgtkplot_2.0_la_LDFLAGS= \
@lt_enable_auto_import@ \
-no-undefined \
-version-info 0:0:0 \
Expand All @@ -20,6 +20,6 @@ gtkplotinclude_HEADERS= \

bin_PROGRAMS=TestPlotLinear TestPlotPolar
TestPlotLinear_SOURCES=testplotlinear.c
TestPlotLinear_LDADD=$(PLOT_LIBS) libgtkplot-@PLOT_API_VERSION@.la
TestPlotLinear_LDADD=$(PLOT_LIBS) libgtkplot-2.0.la
TestPlotPolar_SOURCES=testplotpolar.c
TestPlotPolar_LDADD=$(PLOT_LIBS) libgtkplot-@PLOT_API_VERSION@.la
TestPlotPolar_LDADD=$(PLOT_LIBS) libgtkplot-2.0.la
4 changes: 2 additions & 2 deletions gtk2plot/gtkplotlinear.c
View file
Expand Up @@ -4194,7 +4194,7 @@ void gtk_plot_linear_set_data(GtkPlotLinear *plot, GArray *xd, GArray *yd, GArra
if (plot->ydata) g_array_free((plot->ydata), FALSE);
if (plot->ind) g_array_free((plot->ind), FALSE);
if (plot->sizes) g_array_free((plot->sizes), FALSE);
{(plot->xdata)=g_object_ref_sink(xd); (plot->ydata)=g_object_ref_sink(yd); (plot->ind)=g_object_ref_sink(nd); (plot->sizes)=g_object_ref_sink(sz);}
{(plot->xdata)=g_array_ref(xd); (plot->ydata)=g_array_ref(yd); (plot->ind)=g_array_ref(nd); (plot->sizes)=g_array_ref(sz);}
}

void gtk_plot_linear_set_colour(GtkPlotLinear *plot, GArray *rd, GArray *gr, GArray *bl, GArray *al)
Expand All @@ -4203,7 +4203,7 @@ void gtk_plot_linear_set_colour(GtkPlotLinear *plot, GArray *rd, GArray *gr, GAr
if (plot->gr) g_array_free((plot->gr), FALSE);
if (plot->bl) g_array_free((plot->bl), FALSE);
if (plot->al) g_array_free((plot->al), FALSE);
{(plot->rd)=g_object_ref_sink(rd); (plot->gr)=g_object_ref_sink(gr); (plot->bl)=g_object_ref_sink(bl); (plot->al)=g_object_ref_sink(al);}
{(plot->rd)=g_array_ref(rd); (plot->gr)=g_array_ref(gr); (plot->bl)=g_array_ref(bl); (plot->al)=g_array_ref(al);}
}

static void gtk_plot_linear_finalise(GtkPlotLinear *plot)
Expand Down
4 changes: 2 additions & 2 deletions gtk2plot/gtkplotpolar.c
View file
Expand Up @@ -5552,7 +5552,7 @@ void gtk_plot_polar_set_data(GtkPlotPolar *plot, GArray *rd, GArray *td, GArray
if (plot->thdata) g_array_free((plot->thdata), FALSE);
if (plot->ind) g_array_free((plot->ind), FALSE);
if (plot->sizes) g_array_free((plot->sizes), FALSE);
{(plot->rdata)=g_object_ref_sink(rd); (plot->thdata)=g_object_ref_sink(td); (plot->ind)=g_object_ref_sink(nd); (plot->sizes)=g_object_ref_sink(sz);}
{(plot->rdata)=g_array_ref(rd); (plot->thdata)=g_array_ref(td); (plot->ind)=g_array_ref(nd); (plot->sizes)=g_array_ref(sz);}
}

void gtk_plot_polar_set_colour(GtkPlotPolar *plot, GArray *rd, GArray *gr, GArray *bl, GArray *al)
Expand All @@ -5561,7 +5561,7 @@ void gtk_plot_polar_set_colour(GtkPlotPolar *plot, GArray *rd, GArray *gr, GArra
if (plot->gr) g_array_free((plot->gr), FALSE);
if (plot->bl) g_array_free((plot->bl), FALSE);
if (plot->al) g_array_free((plot->al), FALSE);
{(plot->rd)=g_object_ref_sink(rd); (plot->gr)=g_object_ref_sink(gr); (plot->bl)=g_object_ref_sink(bl); (plot->al)=g_object_ref_sink(al);}
{(plot->rd)=g_array_ref(rd); (plot->gr)=g_array_ref(gr); (plot->bl)=g_array_ref(bl); (plot->al)=g_array_ref(al);}
}

static void gtk_plot_polar_finalise(GtkPlotPolar *plot)
Expand Down
4 changes: 2 additions & 2 deletions gtk3plot/gtkplotlinear.c
View file
Expand Up @@ -4174,13 +4174,13 @@ void gtk_plot_linear_set_data(GtkPlotLinear *plot, GArray *xd, GArray *yd, GArra
if (plot->ydata) g_array_free((plot->ydata), FALSE);
if (plot->ind) g_array_free((plot->ind), FALSE);
if (plot->sizes) g_array_free((plot->sizes), FALSE);
{(plot->xdata)=g_object_ref_sink(xd); (plot->ydata)=g_object_ref_sink(yd); (plot->ind)=g_object_ref_sink(nd); (plot->sizes)=g_object_ref_sink(sz);}
{(plot->xdata)=g_array_ref(xd); (plot->ydata)=g_array_ref(yd); (plot->ind)=g_array_ref(nd); (plot->sizes)=g_array_ref(sz);}
}

void gtk_plot_linear_set_colour(GtkPlotLinear *plot, GArray *cl)
{
if (plot->cl) g_array_free((plot->cl), FALSE);
(plot->cl)=g_object_ref_sink(cl);
(plot->cl)=g_array_ref(cl);
}

static void gtk_plot_linear_finalise(GtkPlotLinear *plot)
Expand Down
4 changes: 2 additions & 2 deletions gtk3plot/gtkplotpolar.c
View file
Expand Up @@ -5527,13 +5527,13 @@ void gtk_plot_polar_set_data(GtkPlotPolar *plot, GArray *rd, GArray *td, GArray
if (plot->thdata) g_array_free((plot->thdata), FALSE);
if (plot->ind) g_array_free((plot->ind), FALSE);
if (plot->sizes) g_array_free((plot->sizes), FALSE);
{(plot->rdata)=g_object_ref_sink(rd); (plot->thdata)=g_object_ref_sink(td); (plot->ind)=g_object_ref_sink(nd); (plot->sizes)=g_object_ref_sink(sz);}
{(plot->rdata)=g_array_ref(rd); (plot->thdata)=g_array_ref(td); (plot->ind)=g_array_ref(nd); (plot->sizes)=g_array_ref(sz);}
}

void gtk_plot_polar_set_colour(GtkPlotPolar *plot, GArray *cl)
{
if (plot->cl) g_array_free((plot->cl), FALSE);
(plot->cl)=g_object_ref_sink(cl);
(plot->cl)=g_array_ref(cl);
}

static void gtk_plot_polar_finalise(GtkPlotPolar *plot)
Expand Down
12 changes: 6 additions & 6 deletions reversion.sh
View file
Expand Up @@ -12,7 +12,7 @@ then
gmn=0
else
gmx=2
gmn=14
gmn=22
fi
gar=$2
lcr=$3
Expand Down Expand Up @@ -63,11 +63,11 @@ echo ""
echo "gtkplot_libincludedir=\$(libdir)/gtkplot-${gmx}.${gar}/include"
echo "nodist_gtkplot_libinclude_HEADERS=../gtkplotconfig.h"
echo ""
echo "lib_LTLIBRARIES=libgtkplot-@PLOT_API_VERSION@.la"
echo "libgtkplot_@PLOT_API_VERSION@_la_SOURCES= \\"
echo "lib_LTLIBRARIES=libgtkplot-${gmx}.${gar}.la"
echo "libgtkplot_${gmx}.${gar}_la_SOURCES= \\"
echo " gtkplotlinear.c \\"
echo " gtkplotpolar.c"
echo "libgtkplot_@PLOT_API_VERSION@_la_LDFLAGS= \\"
echo "libgtkplot_${gmx}.${gar}_la_LDFLAGS= \\"
echo " @lt_enable_auto_import@ \\"
echo " -no-undefined \\"
echo " -version-info ${lcr}:${lrv}:${lag} \\"
Expand All @@ -79,7 +79,7 @@ echo " gtkplotpolar.h"
echo ""
echo "bin_PROGRAMS=TestPlotLinear TestPlotPolar"
echo "TestPlotLinear_SOURCES=testplotlinear.c"
echo "TestPlotLinear_LDADD=\$(PLOT_LIBS) libgtkplot-@PLOT_API_VERSION@.la"
echo "TestPlotLinear_LDADD=\$(PLOT_LIBS) libgtkplot-${gmx}.${gar}.la"
echo "TestPlotPolar_SOURCES=testplotpolar.c"
echo "TestPlotPolar_LDADD=\$(PLOT_LIBS) libgtkplot-@PLOT_API_VERSION@.la"
echo "TestPlotPolar_LDADD=\$(PLOT_LIBS) libgtkplot-${gmx}.${gar}.la"
} >gtk${gmx}plot/Makefile.am

0 comments on commit ab2b3f3

Please sign in to comment.