SF.net SVN: alleg:[13767] allegro/branches/4.9

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

Revision: 13767
          http://alleg.svn.sourceforge.net/alleg/?rev=13767&view=rev
Author:   tjaden
Date:     2010-09-26 11:42:40 +0000 (Sun, 26 Sep 2010)

Log Message:
-----------
Delete unused function _al_pixel_format_fits.

Modified Paths:
--------------
    allegro/branches/4.9/include/allegro5/internal/aintern_bitmap.h
    allegro/branches/4.9/src/pixels.c

Modified: allegro/branches/4.9/include/allegro5/internal/aintern_bitmap.h
===================================================================
--- allegro/branches/4.9/include/allegro5/internal/aintern_bitmap.h	2010-09-26 11:42:05 UTC (rev 13766)
+++ allegro/branches/4.9/include/allegro5/internal/aintern_bitmap.h	2010-09-26 11:42:40 UTC (rev 13767)
@@ -113,7 +113,6 @@
 void _al_convert_to_display_bitmap(ALLEGRO_BITMAP *bitmap);
 bool _al_format_has_alpha(int format);
 bool _al_pixel_format_is_real(int format);
-bool _al_pixel_format_fits(int format1, int format2);
 int _al_get_real_pixel_format(ALLEGRO_DISPLAY *display, int format);
 
 /* Memory bitmap blitting */

Modified: allegro/branches/4.9/src/pixels.c
===================================================================
--- allegro/branches/4.9/src/pixels.c	2010-09-26 11:42:05 UTC (rev 13766)
+++ allegro/branches/4.9/src/pixels.c	2010-09-26 11:42:40 UTC (rev 13767)
@@ -214,35 +214,6 @@
    return format_is_real[format];
 }
 
-/* Returns true if real format1 fits into format2. */
-bool _al_pixel_format_fits(int format1, int format2)
-{
-   ASSERT(format1 >= 0);
-   ASSERT(format1 < ALLEGRO_NUM_PIXEL_FORMATS);
-   ASSERT(format_is_real[format1]);
-   ASSERT(format2 >= 0);
-   ASSERT(format2 < ALLEGRO_NUM_PIXEL_FORMATS);
-
-   if (format1 == format2)
-      return true;
-
-   if (format2 == ALLEGRO_PIXEL_FORMAT_ANY)
-      return true;
-
-   if (format_alpha_table[format1] && format2 == ALLEGRO_PIXEL_FORMAT_ANY_WITH_ALPHA)
-      return true;
-
-   if (!format_alpha_table[format1] && format2 == ALLEGRO_PIXEL_FORMAT_ANY_NO_ALPHA)
-      return true;
-
-   if (pixel_sizes[format1] == pixel_sizes[format2]
-   && format_alpha_table[format1] == format_alpha_table[format2]
-   && !format_is_real[format2])
-      return true;
-
-   return false;
-}
-
 /* We use al_get_display_format() as a hint for the preferred RGB ordering when
  * nothing else is specified.
  */


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