inlined rotate_pointers, made it specific to gulongs (made more sense to

2003-08-31  Manish Singh  <yosh@gimp.org>

        * app/paint/gimppaintcore.c: inlined rotate_pointers, made it specific
        to gulongs (made more sense to me than adding casts)
This commit is contained in:
Manish Singh 2003-09-01 00:50:35 +00:00 committed by Manish Singh
parent f09f3657d4
commit 1a2a0b5b45
3 changed files with 27 additions and 25 deletions

View File

@ -1,3 +1,8 @@
2003-08-31 Manish Singh <yosh@gimp.org>
* app/paint/gimppaintcore.c: inlined rotate_pointers, made it specific
to gulongs (made more sense to me than adding casts)
2003-09-01 Simon Budig <simon@gimp.org> 2003-09-01 Simon Budig <simon@gimp.org>
* app/vectors/gimpcoordmath.[ch]: Introduced function to compare * app/vectors/gimpcoordmath.[ch]: Introduced function to compare

View File

@ -73,8 +73,6 @@ static void gimp_paint_core_calc_brush_size (GimpPaintCore *core,
gdouble scale, gdouble scale,
gint *width, gint *width,
gint *height); gint *height);
static void rotate_pointers (gpointer *p,
guint32 n);
static MaskBuf * gimp_paint_core_subsample_mask (GimpPaintCore *core, static MaskBuf * gimp_paint_core_subsample_mask (GimpPaintCore *core,
MaskBuf *mask, MaskBuf *mask,
gdouble x, gdouble x,
@ -1086,12 +1084,12 @@ gimp_paint_core_calc_brush_size (GimpPaintCore *core,
} }
} }
static void static inline void
rotate_pointers (gpointer *p, rotate_pointers (gulong **p,
guint32 n) guint32 n)
{ {
guint32 i; guint32 i;
gpointer tmp; gulong *tmp;
tmp = p[0]; tmp = p[0];
for (i = 0; i < n-1; i++) for (i = 0; i < n-1; i++)

View File

@ -75,7 +75,7 @@ INSTOBJEXT = @INSTOBJEXT@
.po.pox: .po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot $(MAKE) $(GETTEXT_PACKAGE).pot
$(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*pox
.po.mo: .po.mo:
$(MSGFMT) -o $@ $< $(MSGFMT) -o $@ $<
@ -168,7 +168,9 @@ uninstall:
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
done done
rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in if test "$(PACKAGE)" = "glib"; then \
rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
fi
check: all check: all
@ -177,6 +179,7 @@ dvi info tags TAGS ID:
mostlyclean: mostlyclean:
rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
rm -fr *.o rm -fr *.o
rm -f .intltool-merge-cache
clean: mostlyclean clean: mostlyclean
@ -198,35 +201,31 @@ dist distdir: update-po $(DISTFILES)
update-po: Makefile update-po: Makefile
$(MAKE) $(GETTEXT_PACKAGE).pot $(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \
cd $(srcdir); \ cd $(srcdir); \
catalogs='$(CATALOGS)'; \ catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \ for cat in $$catalogs; do \
cat=`basename $$cat`; \ cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
cp $$lang.po $$lang.old.po; \
echo "$$lang:"; \ echo "$$lang:"; \
if $(MSGMERGE) $$lang; then \ if $$tmpdir/$(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -o $$tmpdir/$$lang.new.po $$lang; then \
rm -f $$lang.old.po; \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
rm -f $$tmpdir/$$lang.new.po; \
else \
if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
:; \
else \
echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
rm -f $$tmpdir/$$lang.new.po; \
exit 1; \
fi; \
fi; \
else \ else \
echo "msgmerge for $$cat failed!"; \ echo "msgmerge for $$cat failed!"; \
rm -f $$lang.po; \ rm -f $$tmpdir/$$lang.new.po; \
mv $$lang.old.po $$lang.po; \
fi; \ fi; \
done done
.po: Makefile
$(MAKE) $(PACKAGE).pot;
PATH=`pwd`/../src:$$PATH; \
echo; printf "$*: "; \
if $(MSGMERGE) $*; then \
rm -f $*.old.po; \
else \
echo "msgmerge for * failed!"; \
mv $*.old.po $*.po; \
fi; \
msgfmt --statistics $*.po; echo;
# POTFILES is created from POTFILES.in by stripping comments, empty lines # POTFILES is created from POTFILES.in by stripping comments, empty lines
# and Intltool tags (enclosed in square brackets), and appending a full # and Intltool tags (enclosed in square brackets), and appending a full
# relative path to them # relative path to them