[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[435] mplayerxp

[<nic...@us...>]

Revision: 435
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=435&view=rev
Author:   nickols_k
Date:     2012-11-22 17:26:39 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
minor fixes

Modified Paths:
--------------
    mplayerxp/configure
    mplayerxp/libmpdemux/demux_bmp.cpp

Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure	2012-11-22 16:49:18 UTC (rev 434)
+++ mplayerxp/configure	2012-11-22 17:26:39 UTC (rev 435)
@@ -199,7 +199,6 @@
     else
       test "${optval}" = "no" && action=disable
     fi
-    echo "$action ${thing}"
     $action ${thing}
     ;;
 
@@ -642,8 +641,8 @@
 enabled dga2	&& enable dga
 disabled dga2	&& require2 dga "X11/Xlib.h X11/extensions/xf86dga.h" XF86DGASetViewPort -lXxf86dga
 print_config HAVE_ mp_config.h mp_config.mak dga
-enabled dga	&& vomodules="dga $vomodules" || novomodules="dga $novomodules"
 fi
+enabled dga	&& vomodules="dga $vomodules" || novomodules="dga $novomodules"
 
 enabled fbdev	&& require2 fbdev "sys/ioctl.h linux/fb.h" ioctl
 print_config HAVE_ mp_config.h mp_config.mak fbdev
@@ -679,7 +678,7 @@
 # VIDEO + AUDIO #
 #################
 
-check_pkg sdl sdl
+enabled sdl && check_pkg sdl sdl
 enabled sdl && require2 sdl SDL/SDL.h SDL_CreateYUVOverlay
 print_config HAVE_ mp_config.h mp_config.mak sdl
 if enabled sdl; then

Modified: mplayerxp/libmpdemux/demux_bmp.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_bmp.cpp	2012-11-22 16:49:18 UTC (rev 434)
+++ mplayerxp/libmpdemux/demux_bmp.cpp	2012-11-22 17:26:39 UTC (rev 435)
@@ -17,12 +17,14 @@
 
 #include "libvo/img_format.h"
 #include "osdep/fastmemcpy.h"
+#include "osdep/mplib.h"
 #include "demux_msg.h"
 
+using namespace mpxp;
+
 #ifdef HAVE_SDL_IMAGE
 #include <SDL/SDL_image.h>
 
-using namespace mpxp;
 
 static int demux_rw_seek(struct SDL_RWops *context, int offset, int whence)
 {
@@ -205,12 +207,12 @@
 } bmp_image_t;
 
 // Check if a file is a BMP file depending on whether starts with 'BM'
-static int bmp_probe(demuxer_t *demuxer)
+static MPXP_Rc bmp_probe(demuxer_t *demuxer)
 {
   if (stream_read_word(demuxer->stream) == (('B' << 8) | 'M'))
-    return 1;
+    return MPXP_Ok;
   else
-    return 0;
+    return MPXP_False;
 }
 
 // return value:
@@ -218,7 +220,7 @@
 //     1 = successfully read a packet
 static int bmp_demux(demuxer_t *demuxer,demux_stream_t *__ds)
 {
-  bmp_image_t *bmp_image = (bmp_image_t *)demuxer->priv;
+  bmp_image_t *bmp_image = reinterpret_cast<bmp_image_t*>(demuxer->priv);
 
   stream_reset(demuxer->stream);
   stream_seek(demuxer->stream, bmp_image->image_offset);
@@ -271,7 +273,7 @@
     sh_video->bih->biClrUsed * 4);
 
   // load the data
-  bmp_image = (bmp_image_t *)mp_malloc(sizeof(bmp_image_t));
+  bmp_image = new(zeromem) bmp_image_t;
   bmp_image->image_size = filesize - data_offset;
   bmp_image->image_offset = data_offset;
 
@@ -291,7 +293,7 @@
 }
 
 static void bmp_close(demuxer_t* demuxer) {
-  bmp_image_t *bmp_image = demuxer->priv;
+  bmp_image_t *bmp_image = reinterpret_cast<bmp_image_t*>(demuxer->priv);
 
   if(!bmp_image)
     return;

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