Don't ignore target init() failures, causes mod_libavcodec to crash synfig

[synfig.git] / synfig-core / trunk / src / modules / mod_bmp / trgt_bmp.cpp

diff --git a/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp b/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp
index 1a45339..19d0dd2 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp
+++ b/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp
@@ -1,27 +1,28 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file trgt_bmp.cpp
 **     \brief Bitmap Target
 **
 **     $Id: trgt_bmp.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
 
 /* === H E A D E R S ======================================================= */
 
-#define SINFG_NO_ANGLE
+#define SYNFIG_NO_ANGLE
 
 #ifdef USING_PCH
 #      include "pch.h"
@@ -31,7 +32,7 @@
 #endif
 
 #include "trgt_bmp.h"
-#include <sinfg/general.h>
+#include <synfig/general.h>
 
 #include <cstdio>
 #include <algorithm>
@@ -40,17 +41,17 @@
 
 /* === U S I N G =========================================================== */
 
-using namespace sinfg;
+using namespace synfig;
 using namespace std;
 using namespace etl;
 
 /* === I N F O ============================================================= */
 
-SINFG_TARGET_INIT(bmp);
-SINFG_TARGET_SET_NAME(bmp,"bmp");
-SINFG_TARGET_SET_EXT(bmp,"bmp");
-SINFG_TARGET_SET_VERSION(bmp,"0.1");
-SINFG_TARGET_SET_CVS_ID(bmp,"$Id: trgt_bmp.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_TARGET_INIT(bmp);
+SYNFIG_TARGET_SET_NAME(bmp,"bmp");
+SYNFIG_TARGET_SET_EXT(bmp,"bmp");
+SYNFIG_TARGET_SET_VERSION(bmp,"0.1");
+SYNFIG_TARGET_SET_CVS_ID(bmp,"$Id: trgt_bmp.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
@@ -113,6 +114,8 @@ bmp::bmp(const char *Filename)
        multi_image=false;
        buffer=0;
        color_buffer=0;
+       set_remove_alpha();
+
 }
 
 bmp::~bmp()
@@ -129,8 +132,9 @@ bmp::set_rend_desc(RendDesc *given_desc)
 {
        pf=PF_BGR;
        
-       // Flip the image upside down,
+    // Flip the image upside down,
        // because bitmaps are upside down.
+    given_desc->set_flags(0);
        Point tl=given_desc->get_tl();
        Point br=given_desc->get_br();
        Point::value_type tmp;
@@ -139,7 +143,7 @@ bmp::set_rend_desc(RendDesc *given_desc)
        br[1]=tmp;
        given_desc->set_tl(tl);
        given_desc->set_br(br);
-       
+    
        desc=*given_desc;
        if(desc.get_frame_end()-desc.get_frame_start()>0)
        {
@@ -148,8 +152,8 @@ bmp::set_rend_desc(RendDesc *given_desc)
        }
        else
                multi_image=false;
-
-       return true;
+       
+    return true;
 }
 
 void
@@ -164,12 +168,11 @@ bmp::end_frame()
 }
 
 bool
-bmp::start_frame(sinfg::ProgressCallback *callback)
+bmp::start_frame(synfig::ProgressCallback *callback)
 {
        int w=desc.get_w(),h=desc.get_h();
        
        rowspan=4*((w*(channels(pf)*8)+31)/32);
-       
        if(multi_image)
        {
                String
@@ -190,7 +193,7 @@ bmp::start_frame(sinfg::ProgressCallback *callback)
        if(!file)
        {
                if(callback)callback->error(_("Unable to open file"));
-               else sinfg::error(_("Unable to open file"));
+               else synfig::error(_("Unable to open file"));
                return false;
        }
        
@@ -221,14 +224,14 @@ bmp::start_frame(sinfg::ProgressCallback *callback)
        if(!fwrite(&fileheader.bfSize,sizeof(BITMAPFILEHEADER)-4,1,file))
        {
                if(callback)callback->error(_("Unable to write file header to file"));
-               else sinfg::error(_("Unable to write file header to file"));
+               else synfig::error(_("Unable to write file header to file"));
                return false;
        }
 
        if(!fwrite(&infoheader,sizeof(BITMAPINFOHEADER),1,file))
        {
                if(callback)callback->error(_("Unable to write info header"));
-               else sinfg::error(_("Unable to write info header"));
+               else synfig::error(_("Unable to write info header"));
                return false;
        }