Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / modules / mod_jpeg / trgt_jpeg.cpp

diff --git a/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp b/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp
index a5c5d7b..3ff854d 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp
@@ -1,9 +1,12 @@
-/*! ========================================================================
-** Synfig
-** jpeg_trgt Target Module
-** $Id: trgt_jpeg.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!    \file trgt_jpeg.cpp
+**     \brief jpeg_trgt Target Module
 **
+**     $Id$
+**
+**     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -14,6 +17,7 @@
 **     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 ===========================================================
 **
@@ -50,7 +54,7 @@ SYNFIG_TARGET_INIT(jpeg_trgt);
 SYNFIG_TARGET_SET_NAME(jpeg_trgt,"jpeg");
 SYNFIG_TARGET_SET_EXT(jpeg_trgt,"jpg");
 SYNFIG_TARGET_SET_VERSION(jpeg_trgt,"0.1");
-SYNFIG_TARGET_SET_CVS_ID(jpeg_trgt,"$Id: trgt_jpeg.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $");
+SYNFIG_TARGET_SET_CVS_ID(jpeg_trgt,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
@@ -61,7 +65,7 @@ jpeg_trgt::jpeg_trgt(const char *Filename)
        buffer=NULL;
        ready=false;
        quality=95;
-       color_buffer=0; 
+       color_buffer=0;
        set_remove_alpha();
 }
 
@@ -96,7 +100,7 @@ bool
 jpeg_trgt::start_frame(synfig::ProgressCallback *callback)
 {
        int w=desc.get_w(),h=desc.get_h();
-       
+
        if(file && file!=stdout)
                fclose(file);
        if(filename=="-")
@@ -106,27 +110,24 @@ jpeg_trgt::start_frame(synfig::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=fopen(newfilename.c_str(),"wb");
+               String newfilename(filename_sans_extension(filename) +
+                                                  etl::strprintf(".%04d",imagecount) +
+                                                  filename_extension(filename));
+               file=fopen(newfilename.c_str(),POPEN_BINARY_WRITE_TYPE);
                if(callback)callback->task(newfilename);
        }
        else
        {
-               file=fopen(filename.c_str(),"wb");
+               file=fopen(filename.c_str(),POPEN_BINARY_WRITE_TYPE);
                if(callback)callback->task(filename);
        }
-       
+
        if(!file)
                return false;
-               
+
        delete [] buffer;
        buffer=new unsigned char[3*w];
-       
+
        delete [] color_buffer;
        color_buffer=new Color[w];
 
@@ -148,14 +149,14 @@ jpeg_trgt::start_frame(synfig::ProgressCallback *callback)
        * Here we just illustrate the use of quality (quantization table) scaling:
        */
        jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
-       
+
        /* Step 4: Start compressor */
-       
+
        /* TRUE ensures that we will write a complete interchange-JPEG file.
        * Pass TRUE unless you are very sure of what you're doing.
        */
        jpeg_start_compress(&cinfo, TRUE);
-               
+
        ready=true;
        return true;
 }
@@ -177,7 +178,7 @@ jpeg_trgt::end_frame()
 }
 
 Color *
-jpeg_trgt::start_scanline(int scanline)
+jpeg_trgt::start_scanline(int /*scanline*/)
 {
        return color_buffer;
 }