Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-core / tags / stable / src / modules / mod_ppm / trgt_ppm.cpp

diff --git a/synfig-core/tags/stable/src/modules/mod_ppm/trgt_ppm.cpp b/synfig-core/tags/stable/src/modules/mod_ppm/trgt_ppm.cpp
index 1477aa8..8fc4810 100644 (file)
--- a/synfig-core/tags/stable/src/modules/mod_ppm/trgt_ppm.cpp
+++ b/synfig-core/tags/stable/src/modules/mod_ppm/trgt_ppm.cpp
@@ -1,18 +1,23 @@
-/*! ========================================================================
-** Sinfg
-** ppm Target Module
-** $Id: trgt_ppm.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!    \file trgt_ppm.cpp
+**     \brief ppm Target Module
 **
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     $Id$
 **
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+**     \legal
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 Chris Moore
 **
-** 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 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.
+**
+**     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
 **
 ** === N O T E S ===========================================================
 **
@@ -20,7 +25,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SINFG_TARGET
+#define SYNFIG_TARGET
 
 #ifdef USING_PCH
 #      include "pch.h"
@@ -30,7 +35,6 @@
 #endif
 
 #include "trgt_ppm.h"
-#include <sinfg/sinfg.h>
 #include <ETL/stringf>
 #include <cstdio>
 #include <algorithm>
@@ -39,17 +43,17 @@
 
 /* === M A C R O S ========================================================= */
 
-using namespace sinfg;
+using namespace synfig;
 using namespace std;
 using namespace etl;
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_TARGET_INIT(ppm);
-SINFG_TARGET_SET_NAME(ppm,"ppm");
-SINFG_TARGET_SET_EXT(ppm,"ppm");
-SINFG_TARGET_SET_VERSION(ppm,"0.1");
-SINFG_TARGET_SET_CVS_ID(ppm,"$Id: trgt_ppm.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
+SYNFIG_TARGET_INIT(ppm);
+SYNFIG_TARGET_SET_NAME(ppm,"ppm");
+SYNFIG_TARGET_SET_EXT(ppm,"ppm");
+SYNFIG_TARGET_SET_VERSION(ppm,"0.1");
+SYNFIG_TARGET_SET_CVS_ID(ppm,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
@@ -88,10 +92,10 @@ ppm::end_frame()
 }
 
 bool
-ppm::start_frame(sinfg::ProgressCallback *callback)
+ppm::start_frame(synfig::ProgressCallback *callback)
 {
        int w=desc.get_w(),h=desc.get_h();
-       
+
        if(filename=="-")
        {
                if(callback)callback->task(strprintf("(stdout) %d",imagecount).c_str());
@@ -99,39 +103,36 @@ ppm::start_frame(sinfg::ProgressCallback *callback)
        }
        else if(multi_image)
        {
-               String
-                       newfilename(filename),
-                       ext(find(filename.begin(),filename.end(),'.'),filename.end());
-               newfilename.erase(find(newfilename.begin(),newfilename.end(),'.'),newfilename.end());
-               
-               newfilename+=etl::strprintf("%04d",imagecount)+ext;
-               file=SmartFILE(fopen(newfilename.c_str(),"wb"));
+               String newfilename(filename_sans_extension(filename) +
+                                                  etl::strprintf(".%04d",imagecount) +
+                                                  filename_extension(filename));
+               file=SmartFILE(fopen(newfilename.c_str(),POPEN_BINARY_WRITE_TYPE));
                if(callback)callback->task(newfilename);
        }
        else
        {
-               file=SmartFILE(fopen(filename.c_str(),"wb"));
+               file=SmartFILE(fopen(filename.c_str(),POPEN_BINARY_WRITE_TYPE));
                if(callback)callback->task(filename);
        }
-       
+
        if(!file)
                return false;
-       
+
        fprintf(file.get(), "P6\n");
        fprintf(file.get(), "%d %d\n", w, h);
-       fprintf(file.get(), "%d\n", 255);       
-       
+       fprintf(file.get(), "%d\n", 255);
+
        delete [] buffer;
        buffer=new unsigned char[3*w];
 
        delete [] color_buffer;
        color_buffer=new Color[desc.get_w()];
-       
+
        return true;
 }
 
 Color *
-ppm::start_scanline(int scanline)
+ppm::start_scanline(int /*scanline*/)
 {
        return color_buffer;
 }
@@ -143,7 +144,7 @@ ppm::end_scanline()
                return false;
 
        convert_color_format(buffer, color_buffer, desc.get_w(), PF_RGB, gamma());
-                       
+
        if(!fwrite(buffer,1,desc.get_w()*3,file.get()))
                return false;