SF.net SVN: alleg:[15380] allegro/branches/5.0/src/bitmap.c

[<tj...@us...>]

Revision: 15380
          http://alleg.svn.sourceforge.net/alleg/?rev=15380&view=rev
Author:   tjaden
Date:     2012-02-23 13:24:14 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
Assert non-null source bitmap for al_draw_bitmap and friends.

cherry-pick https://alleg.svn.sourceforge.net/svnroot/alleg/allegro/branches/5.1@15289

From: Peter Wang <tj...@ex...>

Modified Paths:
--------------
    allegro/branches/5.0/src/bitmap.c

Modified: allegro/branches/5.0/src/bitmap.c
===================================================================
--- allegro/branches/5.0/src/bitmap.c	2012-02-23 13:23:47 UTC (rev 15379)
+++ allegro/branches/5.0/src/bitmap.c	2012-02-23 13:24:14 UTC (rev 15380)
@@ -235,6 +235,7 @@
    ALLEGRO_BITMAP *parent = bitmap;
    float const orig_sw = sw;
    float const orig_sh = sh;
+   ASSERT(bitmap);
 
    al_copy_transform(&backup, al_get_current_transform());
    al_identity_transform(&t);
@@ -301,6 +302,7 @@
 void al_draw_tinted_bitmap(ALLEGRO_BITMAP *bitmap, ALLEGRO_COLOR tint,
    float dx, float dy, int flags)
 {
+   ASSERT(bitmap);
    al_draw_tinted_bitmap_region(bitmap, tint, 0, 0,
       bitmap->w, bitmap->h, dx, dy, flags);
 }
@@ -379,7 +381,7 @@
    float cx, float cy, float dx, float dy, float xscale, float yscale,
    float angle, int flags)
 {
-    _draw_tinted_rotated_scaled_bitmap_region(bitmap, tint,
+   _draw_tinted_rotated_scaled_bitmap_region(bitmap, tint,
       cx, cy, angle,
       xscale, yscale,
       0, 0, bitmap->w, bitmap->h, dx, dy, flags);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.