[Tux4kids-commits] r152 - tuxmath/trunk tuxmath/trunk/nsis
tuxmath/trunk/src tuxtype/trunk tuxtype/trunk/tuxtype
David Bruce
dbruce-guest at alioth.debian.org
Thu Apr 12 10:42:59 UTC 2007
Author: dbruce-guest
Date: 2007-04-12 10:42:58 +0000 (Thu, 12 Apr 2007)
New Revision: 152
Modified:
tuxmath/trunk/configure
tuxmath/trunk/nsis/tuxmath.nsi
tuxmath/trunk/nsis/tuxmath_with_conf.nsi
tuxmath/trunk/src/alphabet.c
tuxtype/trunk/configure
tuxtype/trunk/tuxtype/alphabet.c
tuxtype/trunk/tuxtype/laser.c
Log:
bugfix in black_outline() in both tuxmath and tuxtype
Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure 2007-04-11 16:40:37 UTC (rev 151)
+++ tuxmath/trunk/configure 2007-04-12 10:42:58 UTC (rev 152)
@@ -2227,7 +2227,7 @@
# Define the identity of the package.
PACKAGE=tuxmath
- VERSION=1.5
+ VERSION=1.5.1
cat >>confdefs.h <<_ACEOF
Modified: tuxmath/trunk/nsis/tuxmath.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath.nsi 2007-04-11 16:40:37 UTC (rev 151)
+++ tuxmath/trunk/nsis/tuxmath.nsi 2007-04-12 10:42:58 UTC (rev 152)
@@ -2,7 +2,7 @@
# with a few tiny modifications by Phil Harper(philh at theopencd.org)
# modified for tuxmath by Yves Combe (yves at ycombe.net)
-!define PKG_VERSION "1.5"
+!define PKG_VERSION "1.5.1"
!define PKG_PREFIX "tuxmath"
!define APP_PREFIX "TuxMath"
Modified: tuxmath/trunk/nsis/tuxmath_with_conf.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath_with_conf.nsi 2007-04-11 16:40:37 UTC (rev 151)
+++ tuxmath/trunk/nsis/tuxmath_with_conf.nsi 2007-04-12 10:42:58 UTC (rev 152)
@@ -2,7 +2,7 @@
# with a few tiny modifications by Phil Harper(philh at theopencd.org)
# modified for tuxmath by Yves Combe (yves at ycombe.net)
-!define PKG_VERSION "1.5"
+!define PKG_VERSION "1.5.1"
!define PKG_PREFIX "tuxmath"
!define APP_PREFIX "TuxMath"
Modified: tuxmath/trunk/src/alphabet.c
===================================================================
--- tuxmath/trunk/src/alphabet.c 2007-04-11 16:40:37 UTC (rev 151)
+++ tuxmath/trunk/src/alphabet.c 2007-04-12 10:42:58 UTC (rev 152)
@@ -146,6 +146,12 @@
black_letters = TTF_RenderUTF8_Blended(font, t, black);
+ if (!black_letters)
+ {
+ fprintf (stderr, "Warning - black_outline() could not create image for %s\n", t);
+ return NULL;
+ }
+
bg = SDL_CreateRGBSurface(SDL_SWSURFACE,
(black_letters->w) + 5,
(black_letters->h) + 5,
Modified: tuxtype/trunk/configure
===================================================================
--- tuxtype/trunk/configure 2007-04-11 16:40:37 UTC (rev 151)
+++ tuxtype/trunk/configure 2007-04-12 10:42:58 UTC (rev 152)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for tuxtype 1.5.6.
+# Generated by GNU Autoconf 2.61 for tuxtype 1.5.7.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@
# Identity of this package.
PACKAGE_NAME='tuxtype'
PACKAGE_TARNAME='tuxtype'
-PACKAGE_VERSION='1.5.6'
-PACKAGE_STRING='tuxtype 1.5.6'
+PACKAGE_VERSION='1.5.7'
+PACKAGE_STRING='tuxtype 1.5.7'
PACKAGE_BUGREPORT=''
ac_unique_file="tuxtype/funcs.h"
@@ -1230,7 +1230,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures tuxtype 1.5.6 to adapt to many kinds of systems.
+\`configure' configures tuxtype 1.5.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1301,7 +1301,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tuxtype 1.5.6:";;
+ short | recursive ) echo "Configuration of tuxtype 1.5.7:";;
esac
cat <<\_ACEOF
@@ -1394,7 +1394,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tuxtype configure 1.5.6
+tuxtype configure 1.5.7
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1408,7 +1408,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by tuxtype $as_me 1.5.6, which was
+It was created by tuxtype $as_me 1.5.7, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2226,7 +2226,7 @@
# Define the identity of the package.
PACKAGE=tuxtype
- VERSION=1.5.6
+ VERSION=1.5.7
cat >>confdefs.h <<_ACEOF
@@ -5781,7 +5781,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by tuxtype $as_me 1.5.6, which was
+This file was extended by tuxtype $as_me 1.5.7, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5834,7 +5834,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-tuxtype config.status 1.5.6
+tuxtype config.status 1.5.7
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Modified: tuxtype/trunk/tuxtype/alphabet.c
===================================================================
--- tuxtype/trunk/tuxtype/alphabet.c 2007-04-11 16:40:37 UTC (rev 151)
+++ tuxtype/trunk/tuxtype/alphabet.c 2007-04-12 10:42:58 UTC (rev 152)
@@ -128,9 +128,14 @@
return NULL;
}
-
black_letters = TTF_RenderUTF8_Blended(font, t, black);
+ if (!black_letters)
+ {
+ fprintf (stderr, "Warning - black_outline() could not create image for %s\n", t);
+ return NULL;
+ }
+
bg = SDL_CreateRGBSurface(SDL_SWSURFACE,
(black_letters->w) + 5,
(black_letters->h) + 5,
Modified: tuxtype/trunk/tuxtype/laser.c
===================================================================
--- tuxtype/trunk/tuxtype/laser.c 2007-04-11 16:40:37 UTC (rev 151)
+++ tuxtype/trunk/tuxtype/laser.c 2007-04-12 10:42:58 UTC (rev 152)
@@ -54,13 +54,11 @@
/* --- Load all media --- */
void laser_load_data(void) {
int i;
-
font = LoadFont( ttf_font, 32);
/* Load images: */
for (i = 0; i < NUM_IMAGES; i++)
images[i] = LoadImage(image_filenames[i], IMG_ALPHA);
-
shield = LoadSprite( "cities/shield", IMG_ALPHA );
if (sys_sound) {
@@ -74,9 +72,14 @@
pause_load_media();
for (i=1; i<255; i++) {
- unsigned char t[2]=" ";
- t[0]=i;
- letters[i] = black_outline( t, font, &white );
+ unsigned char t[2] = " ";
+ t[0] = i;
+ letters[i] = black_outline(t, font, &white);
+ if (!letters[i])
+ {
+ fprintf(stderr, "For i = %d, could not render "
+ "corresponding char = %s\n", i, t);
+ }
}
}
More information about the Tux4kids-commits
mailing list