# HG changeset patch
# User alex
# Date 1163534002 0
# Node ID c4f87cfd5b20bfc2d96ae20f6686dab1c4b26cb7
# Parent  58412faefb46a6bc313e4631f49d1330346f1ce5
changed rgba32_to routines to support both alpha and non-alpha formats (see r7066 too)

diff -r 58412faefb46 -r c4f87cfd5b20 imgconvert.c
--- a/imgconvert.c	Tue Nov 14 19:48:11 2006 +0000
+++ b/imgconvert.c	Tue Nov 14 19:53:22 2006 +0000
@@ -2060,6 +2060,12 @@
         [PIX_FMT_RGB24] = {
             .convert = rgba32_to_rgb24
         },
+        [PIX_FMT_BGR24] = {
+            .convert = rgba32_to_bgr24
+        },
+        [PIX_FMT_RGB565] = {
+            .convert = rgba32_to_rgb565
+        },
         [PIX_FMT_RGB555] = {
             .convert = rgba32_to_rgb555
         },
@@ -2074,6 +2080,9 @@
         },
     },
     [PIX_FMT_BGR24] = {
+        [PIX_FMT_RGBA32] = {
+            .convert = bgr24_to_rgba32
+        },
         [PIX_FMT_RGB24] = {
             .convert = bgr24_to_rgb24
         },
@@ -2099,6 +2108,9 @@
         },
     },
     [PIX_FMT_RGB565] = {
+        [PIX_FMT_RGBA32] = {
+            .convert = rgb565_to_rgba32
+        },
         [PIX_FMT_RGB24] = {
             .convert = rgb565_to_rgb24
         },