* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include "vlc_image.h"
#include "file_bitmap.hpp"
video_format_t fmt_in = {0}, fmt_out = {0};
picture_t *pPic;
- fmt_out.i_chroma = VLC_FOURCC('R','V','3','2');
+ fmt_out.i_chroma = VLC_FOURCC('R','G','B','A');
pPic = image_ReadUrl( pImageHandler, fileName.c_str(), &fmt_in, &fmt_out );
if( !pPic ) return;
{
for( int x = 0; x < m_width; x++ )
{
- uint32_t b = *(pSrc++);
- uint32_t g = *(pSrc++);
- uint32_t r = *(pSrc++);
- uint8_t a = *(pSrc++);
- *(pData++) = (b * a) >> 8;
- *(pData++) = (g * a) >> 8;
- *(pData++) = (r * a) >> 8;
+ uint32_t r = *pSrc++;
+ uint32_t g = *pSrc++;
+ uint32_t b = *pSrc++;
+ uint8_t a = *pSrc++;
+
+ *(pData++) = b * a / 255;
+ *(pData++) = g * a / 255;
+ *(pData++) = r * a / 255;
// Transparent pixel ?
if( aColor == (r<<16 | g<<8 | b) )
pSrc += pPic->p->i_pitch - m_width * 4;
}
- pPic->pf_release( pPic );
+ picture_Release( pPic );
return;
}