Fix clipping for tile-based rendering.

[synfig.git] / synfig-core / trunk / src / modules / mod_imagemagick / trgt_imagemagick.cpp

diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp b/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp
index 08ba544..88dd95a 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp
+++ b/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp
@@ -1,18 +1,22 @@
-/*! ========================================================================
-** Sinfg
-** ppm Target Module
-** $Id: trgt_imagemagick.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!    \file trgt_imagemagick.cpp
+**     \brief ppm Target Module
 **
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     \legal
+** $Id$
 **
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-** 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 +24,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SINFG_TARGET
+#define SYNFIG_TARGET
 
 #ifdef USING_PCH
 #      include "pch.h"
@@ -41,17 +45,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(imagemagick_trgt);
-SINFG_TARGET_SET_NAME(imagemagick_trgt,"imagemagick");
-SINFG_TARGET_SET_EXT(imagemagick_trgt,"miff");
-SINFG_TARGET_SET_VERSION(imagemagick_trgt,"0.1");
-SINFG_TARGET_SET_CVS_ID(imagemagick_trgt,"$Id: trgt_imagemagick.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $");
+SYNFIG_TARGET_INIT(imagemagick_trgt);
+SYNFIG_TARGET_SET_NAME(imagemagick_trgt,"imagemagick");
+SYNFIG_TARGET_SET_EXT(imagemagick_trgt,"miff");
+SYNFIG_TARGET_SET_VERSION(imagemagick_trgt,"0.1");
+SYNFIG_TARGET_SET_CVS_ID(imagemagick_trgt,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
@@ -76,8 +80,7 @@ imagemagick_trgt::~imagemagick_trgt()
 bool
 imagemagick_trgt::set_rend_desc(RendDesc *given_desc)
 {
-       String  ext(find(filename.begin(),filename.end(),'.')+1,filename.end());
-       if(ext=="xpm")
+       if(filename_extension(filename) == ".xpm")
                pf=PF_RGB;
        else
                pf=PF_RGB|PF_A;
@@ -110,35 +113,46 @@ imagemagick_trgt::end_frame()
                pclose(file);
        }
        file=NULL;
+       imagecount++;
 }
 
 bool
-imagemagick_trgt::start_frame(sinfg::ProgressCallback *cb)
+imagemagick_trgt::start_frame(synfig::ProgressCallback *cb)
 {
        string command;
+       string newfilename;
 
-       if(channels(pf)==4)
-               command=strprintf("convert -depth 8 -size %dx%d rgba:-[0] -density %dx%d  \"%s\"\n",desc.get_w(),desc.get_h(),round_to_int(desc.get_x_res()/39.3700787402),round_to_int(desc.get_y_res()/39.3700787402),filename.c_str());
+       if (multi_image)
+               newfilename = (filename_sans_extension(filename) +
+                                          etl::strprintf(".%04d",imagecount) +
+                                          filename_extension(filename));
        else
-               command=strprintf("convert -depth 8 -size %dx%d rgb:-[0] -density %dx%d \"%s\"\n",desc.get_w(),desc.get_h(),round_to_int(desc.get_x_res()/39.3700787402),round_to_int(desc.get_y_res()/39.3700787402),filename.c_str());
+               newfilename = filename;
+
+       command=strprintf("convert -depth 8 -size %dx%d rgb%s:-[0] -density %dx%d \"%s\"\n",
+                                         desc.get_w(), desc.get_h(),                                   // size
+                                         ((channels(pf) == 4) ? "a" : ""),                             // rgba or rgb?
+                                         round_to_int(desc.get_x_res()/39.3700787402), // density
+                                         round_to_int(desc.get_y_res()/39.3700787402),
+                                         newfilename.c_str());
 
-       file=popen(command.c_str(),"w");
+       file=popen(command.c_str(),POPEN_BINARY_WRITE_TYPE);
 
        if(!file)
        {
                const char *msg=_("Unable to open pipe to imagemagick's convert utility");
                if(cb)cb->error(N_(msg));
-               else sinfg::error(N_(msg));
+               else synfig::error(N_(msg));
                return false;
        }
 
-       //etl::yield(); 
+       //etl::yield();
 
        return true;
 }
 
 Color *
-imagemagick_trgt::start_scanline(int scanline)
+imagemagick_trgt::start_scanline(int /*scanline*/)
 {
        return color_buffer;
 }
@@ -153,6 +167,6 @@ imagemagick_trgt::end_scanline(void)
 
        if(!fwrite(buffer,channels(pf),desc.get_w(),file))
                return false;
-       
+
        return true;
 }