Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv32743

Modified Files:
        synfig.info synfig.patch synfigstudio.info 
Log Message:
New upstream.

Index: synfig.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/synfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- synfig.patch        15 Oct 2011 06:01:38 -0000      1.2
+++ synfig.patch        14 Dec 2011 07:31:03 -0000      1.3
@@ -1,6 +1,6 @@
-diff -Naur synfig-0.63.00.orig/src/modules/mod_magickpp/trgt_magickpp.cpp 
synfig-0.63.00/src/modules/mod_magickpp/trgt_magickpp.cpp
---- synfig-0.63.00.orig/src/modules/mod_magickpp/trgt_magickpp.cpp     
2011-07-26 10:08:09.000000000 -0700
-+++ synfig-0.63.00/src/modules/mod_magickpp/trgt_magickpp.cpp  2011-07-28 
09:18:18.000000000 -0700
+diff -Naur synfig-0.63.03.orig/src/modules/mod_magickpp/trgt_magickpp.cpp 
synfig-0.63.03/src/modules/mod_magickpp/trgt_magickpp.cpp
+--- synfig-0.63.03.orig/src/modules/mod_magickpp/trgt_magickpp.cpp     
2011-12-13 23:07:26.000000000 -0800
++++ synfig-0.63.03/src/modules/mod_magickpp/trgt_magickpp.cpp  2011-12-13 
23:07:56.000000000 -0800
 @@ -66,7 +66,7 @@
  
                try
@@ -19,67 +19,454 @@
                                can_adjoin = image.adjoin();
                        }
                        catch(Magick::Warning warning) {
-diff -Naur synfig-0.63.00.orig/src/modules/mod_png/mptr_png.cpp 
synfig-0.63.00/src/modules/mod_png/mptr_png.cpp
---- synfig-0.63.00.orig/src/modules/mod_png/mptr_png.cpp       2011-07-26 
10:08:09.000000000 -0700
-+++ synfig-0.63.00/src/modules/mod_png/mptr_png.cpp    2011-07-26 
10:10:00.000000000 -0700
-@@ -301,15 +301,27 @@
-               break;
- 
-       case PNG_COLOR_TYPE_PALETTE:
-+        png_colorp palette;
-+        int num_palette;
-+        png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
+diff -Naur synfig-0.63.03.orig/src/modules/mod_png/mptr_png.cpp.orig 
synfig-0.63.03/src/modules/mod_png/mptr_png.cpp.orig
+--- synfig-0.63.03.orig/src/modules/mod_png/mptr_png.cpp.orig  1969-12-31 
16:00:00.000000000 -0800
++++ synfig-0.63.03/src/modules/mod_png/mptr_png.cpp.orig       2011-12-05 
09:36:08.000000000 -0800
+@@ -0,0 +1,440 @@
++/* === S Y N F I G ========================================================= 
*/
++/*!   \file mptr_png.cpp
++**    \brief ppm 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
++**    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 ===========================================================
++**
++** ========================================================================= 
*/
 +
-+        bool is_tRNS_valid;
-+        png_bytep trans_alpha;
-+        int num_trans;
-+        png_color_16p trans_color;
-+        is_tRNS_valid = png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS);
-+        png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, 
&trans_color);
++/*!
++**  \todo Support 16 bit PNG files
++**    \todo Support GAMMA correction
++**    \todo Fix memory leaks
++*/
 +
-               for(y=0;y<height;y++)
-                       for(x=0;x<width;x++)
-                       {
--                              float r=gamma().r_U8_to_F32((unsigned 
char)png_ptr->palette[row_pointers[y][x]].red);
--                              float g=gamma().g_U8_to_F32((unsigned 
char)png_ptr->palette[row_pointers[y][x]].green);
--                              float b=gamma().b_U8_to_F32((unsigned 
char)png_ptr->palette[row_pointers[y][x]].blue);
++/* === H E A D E R S ======================================================= 
*/
++
++#ifdef USING_PCH
++#     include "pch.h"
++#else
++#ifdef HAVE_CONFIG_H
++#     include <config.h>
++#endif
++
++#include "mptr_png.h"
++#include <synfig/importer.h>
++#include <synfig/time.h>
++#include <synfig/general.h>
++
++
++#include <cstdio>
++#include <algorithm>
++#include <functional>
++#endif
++
++/* === M A C R O S ========================================================= 
*/
++
++using namespace synfig;
++using namespace std;
++using namespace etl;
++
++#define PNG_CHECK_BYTES       8
++
++/* === G L O B A L S ======================================================= 
*/
++
++SYNFIG_IMPORTER_INIT(png_mptr);
++SYNFIG_IMPORTER_SET_NAME(png_mptr,"png");
++SYNFIG_IMPORTER_SET_EXT(png_mptr,"png");
++SYNFIG_IMPORTER_SET_VERSION(png_mptr,"0.1");
++SYNFIG_IMPORTER_SET_CVS_ID(png_mptr,"$Id$");
++
++/* === M E T H O D S ======================================================= 
*/
++
++void
++png_mptr::png_out_error(png_struct */*png_data*/,const char *msg)
++{
++      //png_mptr *me=(png_mptr*)png_data->error_ptr;
++      synfig::error(strprintf("png_mptr: error: %s",msg));
++      //me->ready=false;
++}
++
++void
++png_mptr::png_out_warning(png_struct */*png_data*/,const char *msg)
++{
++      //png_mptr *me=(png_mptr*)png_data->error_ptr;
++      synfig::warning(strprintf("png_mptr: warning: %s",msg));
++      //me->ready=false;
++}
++
++int
++png_mptr::read_chunk_callback(png_struct */*png_data*/, png_unknown_chunkp 
/*chunk*/)
++{
++      /* The unknown chunk structure contains your
++        chunk data: */
++      //png_byte name[5];
++      //png_byte *data;
++      //png_size_t size;
++      /* Note that libpng has already taken care of
++        the CRC handling */
++
++      /* put your code here.  Return one of the
++        following: */
++
++      //return (-n); /* chunk had an error */
++      return (0); /* did not recognize */
++      //return (n); /* success */
++}
++
++png_mptr::png_mptr(const char *file_name)
++{
++      filename=file_name;
++
++      /* Open the file pointer */
++    FILE *file = fopen(file_name, "rb");
++    if (!file)
++    {
++        //! \todo THROW SOMETHING
++              throw strprintf("Unable to physically open %s",file_name);
++              return;
++    }
++
++
++      /* Make sure we are dealing with a PNG format file */
++      png_byte header[PNG_CHECK_BYTES];
++      fread(header, 1, PNG_CHECK_BYTES, file);
++    bool is_png = !png_sig_cmp(header, 0, PNG_CHECK_BYTES);
++    if (!is_png)
++    {
++        //! \todo THROW SOMETHING
++              throw strprintf("This (\"%s\") doesn't appear to be a PNG 
file",file_name);
++              return;
++    }
++
++
++      png_structp png_ptr = png_create_read_struct
++       (PNG_LIBPNG_VER_STRING, (png_voidp)this,
++        &png_mptr::png_out_error, &png_mptr::png_out_warning);
++      if (!png_ptr)
++    {
++        //! \todo THROW SOMETHING
++              throw String("error on importer construction, *WRITEME*3");
++              return;
++    }
++
++    png_infop info_ptr = png_create_info_struct(png_ptr);
++    if (!info_ptr)
++    {
++        png_destroy_read_struct(&png_ptr,
++           (png_infopp)NULL, (png_infopp)NULL);
++        //! \todo THROW SOMETHING
++              throw String("error on importer construction, *WRITEME*4");
++              return;
++    }
++
++    png_infop end_info = png_create_info_struct(png_ptr);
++    if (!end_info)
++    {
++        png_destroy_read_struct(&png_ptr, &info_ptr,
++          (png_infopp)NULL);
++        //! \todo THROW SOMETHING
++              throw String("error on importer construction, *WRITEME*4");
++              return;
++    }
++
++
++
++      png_init_io(png_ptr, file);
++      png_set_sig_bytes(png_ptr,PNG_CHECK_BYTES);
++
++      png_read_info(png_ptr, info_ptr);
++
++      int bit_depth,color_type,interlace_type, compression_type,filter_method;
++      png_uint_32 width,height;
++
++      png_get_IHDR(png_ptr, info_ptr, &width, &height,
++                               &bit_depth, &color_type, &interlace_type,
++                               &compression_type, &filter_method);
++
++      if (bit_depth == 16)
++              png_set_strip_16(png_ptr);
++
++      if (bit_depth < 8)
++              png_set_packing(png_ptr);
++
++      double fgamma;
++      if (png_get_gAMA(png_ptr, info_ptr, &fgamma))
++      {
++              synfig::info("PNG: Image gamma is %f",fgamma);
++              png_set_gamma(png_ptr, gamma().get_gamma(), fgamma);
++      }
++
++
++      /*
++      if (setjmp(png_jmpbuf(png_ptr)))
++      {
++              synfig::error("Unable to setup longjump");
++              png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
++              fclose(file);
++        //! \todo THROW SOMETHING
++              throw String("error on importer construction, *WRITEME*5");
++              return;
++      }
++      */
++
++      png_set_read_user_chunk_fn(png_ptr, this, 
&png_mptr::read_chunk_callback);
++
++      // man libpng tells me:
++      //   You must use png_transforms and not call any
++      //   png_set_transform() functions when you use png_read_png().
++      // but we used png_set_gamma(), which may be why we were seeing a crash 
at the end
++      //   png_read_png(png_ptr, info_ptr, 
PNG_TRANSFORM_PACKING|PNG_TRANSFORM_STRIP_16, NULL);
++
++      png_read_update_info(png_ptr, info_ptr);
++      png_uint_32 rowbytes = png_get_rowbytes(png_ptr, info_ptr);
++
++      // allocate buffer to read image data into
++      png_bytep *row_pointers=new png_bytep[height];
++      png_byte *data = new png_byte[rowbytes*height];
++      for (png_uint_32 i = 0; i < height; i++)
++              row_pointers[i] = &(data[rowbytes*i]);
++
++      png_read_image(png_ptr, row_pointers);
++
++      png_uint_32 x, y;
++      surface_buffer.set_wh(width,height);
++
++      switch(color_type)
++      {
++      case PNG_COLOR_TYPE_RGB:
++              for(y=0;y<height;y++)
++                      for(x=0;x<width;x++)
++                      {
++                              float r=gamma().r_U8_to_F32((unsigned 
char)row_pointers[y][x*3+0]);
++                              float g=gamma().g_U8_to_F32((unsigned 
char)row_pointers[y][x*3+1]);
++                              float b=gamma().b_U8_to_F32((unsigned 
char)row_pointers[y][x*3+2]);
++                              surface_buffer[y][x]=Color(
++                                      r,
++                                      g,
++                                      b,
++                                      1.0
++                              );
++/*
++                              surface_buffer[y][x]=Color(
++                                      (float)(unsigned 
char)row_pointers[y][x*3+0]*(1.0/255.0),
++                                      (float)(unsigned 
char)row_pointers[y][x*3+1]*(1.0/255.0),
++                                      (float)(unsigned 
char)row_pointers[y][x*3+2]*(1.0/255.0),
++                                      1.0
++                              );
++*/
++                      }
++              break;
++
++      case PNG_COLOR_TYPE_RGB_ALPHA:
++              for(y=0;y<height;y++)
++                      for(x=0;x<width;x++)
++                      {
++                              float r=gamma().r_U8_to_F32((unsigned 
char)row_pointers[y][x*4+0]);
++                              float g=gamma().g_U8_to_F32((unsigned 
char)row_pointers[y][x*4+1]);
++                              float b=gamma().b_U8_to_F32((unsigned 
char)row_pointers[y][x*4+2]);
++                              surface_buffer[y][x]=Color(
++                                      r,
++                                      g,
++                                      b,
++                                      (float)(unsigned 
char)row_pointers[y][x*4+3]*(1.0/255.0)
++                              );
++                              /*
++                              surface_buffer[y][x]=Color(
++                                      (float)(unsigned 
char)row_pointers[y][x*4+0]*(1.0/255.0),
++                                      (float)(unsigned 
char)row_pointers[y][x*4+1]*(1.0/255.0),
++                                      (float)(unsigned 
char)row_pointers[y][x*4+2]*(1.0/255.0),
++                                      (float)(unsigned 
char)row_pointers[y][x*4+3]*(1.0/255.0)
++                              );
++                              */
++                      }
++              break;
++
++      case PNG_COLOR_TYPE_GRAY:
++              for(y=0;y<height;y++)
++                      for(x=0;x<width;x++)
++                      {
++                              float gray=gamma().g_U8_to_F32((unsigned 
char)row_pointers[y][x]);
++                              //float gray=(float)(unsigned 
char)row_pointers[y][x]*(1.0/255.0);
++                              surface_buffer[y][x]=Color(
++                                      gray,
++                                      gray,
++                                      gray,
++                                      1.0
++                              );
++                      }
++              break;
++
++      case PNG_COLOR_TYPE_GRAY_ALPHA:
++              for(y=0;y<height;y++)
++                      for(x=0;x<width;x++)
++                      {
++                              float gray=gamma().g_U8_to_F32((unsigned 
char)row_pointers[y][x*2]);
++//                            float gray=(float)(unsigned 
char)row_pointers[y][x*2]*(1.0/255.0);
++                              surface_buffer[y][x]=Color(
++                                      gray,
++                                      gray,
++                                      gray,
++                                      (float)(unsigned 
char)row_pointers[y][x*2+1]*(1.0/255.0)
++                              );
++                      }
++              break;
++
++      case PNG_COLOR_TYPE_PALETTE:
++              for(y=0;y<height;y++)
++                      for(x=0;x<width;x++)
++                      {
++                              png_colorp palette;
++                              int num_palette;
++                              png_get_PLTE(png_ptr, info_ptr, &palette, 
&num_palette);
 +                              float r=gamma().r_U8_to_F32((unsigned 
char)palette[row_pointers[y][x]].red);
 +                              float g=gamma().g_U8_to_F32((unsigned 
char)palette[row_pointers[y][x]].green);
 +                              float b=gamma().b_U8_to_F32((unsigned 
char)palette[row_pointers[y][x]].blue);
-                               float a=1.0;
--                              if(info_ptr->valid & PNG_INFO_tRNS)
--                                  a = (float)(unsigned 
char)png_ptr->trans[row_pointers[y][x]]*(1.0/255.0);
-+                if (is_tRNS_valid) {
-+                                  a = (float)(unsigned 
char)trans_alpha[row_pointers[y][x]]*(1.0/255.0);
-+                }
-                               surface_buffer[y][x]=Color(
-                                       r,
-                                       g,
-diff -Naur synfig-0.63.00.orig/src/modules/mod_png/trgt_png.cpp 
synfig-0.63.00/src/modules/mod_png/trgt_png.cpp
---- synfig-0.63.00.orig/src/modules/mod_png/trgt_png.cpp       2011-07-26 
10:08:09.000000000 -0700
-+++ synfig-0.63.00/src/modules/mod_png/trgt_png.cpp    2011-07-26 
10:10:00.000000000 -0700
-@@ -61,7 +61,7 @@
- void
- png_trgt::png_out_error(png_struct *png_data,const char *msg)
- {
--      png_trgt *me=(png_trgt*)png_data->error_ptr;
-+      png_trgt *me=(png_trgt*)png_get_error_ptr(png_data);
-       synfig::error(strprintf("png_trgt: error: %s",msg));
-       me->ready=false;
- }
-@@ -69,7 +69,7 @@
- void
- png_trgt::png_out_warning(png_struct *png_data,const char *msg)
- {
--      png_trgt *me=(png_trgt*)png_data->error_ptr;
-+      png_trgt *me=(png_trgt*)png_get_error_ptr(png_data);
-       synfig::warning(strprintf("png_trgt: warning: %s",msg));
-       me->ready=false;
- }
-diff -Naur synfig-0.63.00.orig/src/synfig/canvas.h 
synfig-0.63.00/src/synfig/canvas.h
---- synfig-0.63.00.orig/src/synfig/canvas.h    2011-07-26 10:08:09.000000000 
-0700
-+++ synfig-0.63.00/src/synfig/canvas.h 2011-07-26 17:52:45.000000000 -0700
-@@ -113,6 +113,13 @@
++                              float a=1.0;
++                              if(png_get_valid(png_ptr, info_ptr, 
PNG_INFO_tRNS))
++                              {
++                                      png_bytep trans_alpha;
++                                      int num_trans;
++                                      png_color_16p trans_color;
++                                      png_get_tRNS(png_ptr, info_ptr, 
&trans_alpha, &num_trans, &trans_color);
++                                      a = (float)(unsigned 
char)trans_alpha[row_pointers[y][x]]*(1.0/255.0);
++                              }
++                              surface_buffer[y][x]=Color(
++                                      r,
++                                      g,
++                                      b,
++                                      a
++                              );
++                      }
++              break;
++      default:
++              synfig::error("png_mptr: error: Unsupported color type");
++        //! \todo THROW SOMETHING
++              throw String("error on importer construction, *WRITEME*6");
++              return;
++      }
++
++      png_read_end(png_ptr, end_info);
++      png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
++      fclose(file);
++
++      delete [] row_pointers;
++      delete [] data;
++
++      trim = false;
++
++      //if (getenv("SYNFIG_DISABLE_CROP_IMPORTED_IMAGES"))
++              return;
++
++      switch(color_type)
++      {
++      case PNG_COLOR_TYPE_RGB_ALPHA:
++      case PNG_COLOR_TYPE_GRAY_ALPHA:
++      case PNG_COLOR_TYPE_PALETTE:
++              for(y=0;y<height;y++)
++              {
++                      for(x=0;x<width;x++)
++                              if (surface_buffer[y][x].get_a()) break;
++                      if (x != width) break;
++              }
++
++              if (y != height)
++              {
++#define BORDER 1                              // don't chop off all the 
transparent space - leave a border this many pixels wide for the interpolation
++
++                      png_uint_32 min_x, min_y, max_x, max_y;
++                      if (y>BORDER) min_y = y-BORDER; else min_y = 0;
++
++                      for(y=height-1;y>0;y--)
++                      {
++                              for(x=0;x<width;x++)
++                                      if (surface_buffer[y][x].get_a()) break;
++                              if (x != width) break;
++                      }
++                      max_y = std::min(y+BORDER,height-1);
++
++                      for(x=0;x<width;x++)
++                      {
++                              for(y=0;y<height;y++)
++                                      if (surface_buffer[y][x].get_a()) break;
++                              if (y != height) break;
++                      }
++                      if (x>BORDER) min_x = x-BORDER; else min_x = 0;
++
++                      for(x=width-1;x>0;x--)
++                      {
++                              for(y=0;y<height;y++)
++                                      if (surface_buffer[y][x].get_a()) break;
++                              if (y != height) break;
++                      }
++                      max_x = std::min(x+BORDER,width-1);
++
++                      if (min_x != 0 || max_x != width-1 ||
++                              min_y != 0 || max_y != height-1)
++                      {
++                              trim = true;
++                              orig_width = width;
++                              orig_height = height;
++                              trimmed_x = min_x;
++                              trimmed_y = min_y;
++
++                              width=max_x-min_x+1;
++                              height=max_y-min_y+1;
++                              synfig::Surface tmp_buffer;
++                              tmp_buffer.set_wh(width,height);
++                              for(y=0;y<height;y++)
++                                      for(x=0;x<width;x++)
++                                              tmp_buffer[y][x] = 
surface_buffer[y+min_y][x+min_x];
++                              surface_buffer = tmp_buffer;
++                      }
++              }
++      }
++}
++
++png_mptr::~png_mptr()
++{
++}
++
++bool
++png_mptr::get_frame(synfig::Surface &surface, const synfig::RendDesc 
&/*renddesc*/, Time, synfig::ProgressCallback */*cb*/)
++{
++      //assert(0);                                    // shouldn't be called?
++      surface=surface_buffer;
++      return true;
++}
++
++bool
++png_mptr::get_frame(synfig::Surface &surface, const synfig::RendDesc 
&renddesc, Time,
++                                      bool &trimmed, unsigned int &width, 
unsigned int &height, unsigned int &top, unsigned int &left,
++                                      synfig::ProgressCallback */*cb*/)
++{
++      surface=surface_buffer;
++      if ((trimmed = trim))
++      {
++              width = orig_width;
++              height = orig_height;
++              top = trimmed_y;
++              left = trimmed_x;
++      }
++      return true;
++}
+diff -Naur synfig-0.63.03.orig/src/synfig/canvas.h 
synfig-0.63.03/src/synfig/canvas.h
+--- synfig-0.63.03.orig/src/synfig/canvas.h    2011-12-13 23:07:26.000000000 
-0800
++++ synfig-0.63.03/src/synfig/canvas.h 2011-12-13 23:08:00.000000000 -0800
+@@ -119,6 +119,13 @@
  
  class Context;
  class GUID;
@@ -93,7 +480,7 @@
  
  /*!   \class Canvas
  **    \brief Canvas is a double ended queue of Layers. It is the base class
-@@ -609,11 +616,6 @@
+@@ -615,11 +622,6 @@
        virtual void get_times_vfunc(Node::time_set &set) const;
  }; // END of class Canvas
  
@@ -105,9 +492,9 @@
  }; // END of namespace synfig
  
  /* === E N D =============================================================== 
*/
-diff -Naur synfig-0.63.00.orig/src/synfig/color.h 
synfig-0.63.00/src/synfig/color.h
---- synfig-0.63.00.orig/src/synfig/color.h     2011-07-26 10:08:09.000000000 
-0700
-+++ synfig-0.63.00/src/synfig/color.h  2011-07-26 10:10:00.000000000 -0700
+diff -Naur synfig-0.63.03.orig/src/synfig/color.h 
synfig-0.63.03/src/synfig/color.h
+--- synfig-0.63.03.orig/src/synfig/color.h     2011-12-13 23:07:26.000000000 
-0800
++++ synfig-0.63.03/src/synfig/color.h  2011-12-13 23:08:00.000000000 -0800
 @@ -63,6 +63,8 @@
  inline bool isnan(double x) { return x != x; }
  inline bool isnan(float x) { return x != x; }
@@ -117,9 +504,9 @@
  #endif
  
  namespace synfig {
-diff -Naur synfig-0.63.00.orig/src/synfig/guidset.h 
synfig-0.63.00/src/synfig/guidset.h
---- synfig-0.63.00.orig/src/synfig/guidset.h   2011-07-26 10:08:09.000000000 
-0700
-+++ synfig-0.63.00/src/synfig/guidset.h        2011-07-31 11:41:29.000000000 
-0700
+diff -Naur synfig-0.63.03.orig/src/synfig/guidset.h 
synfig-0.63.03/src/synfig/guidset.h
+--- synfig-0.63.03.orig/src/synfig/guidset.h   2011-12-13 23:07:26.000000000 
-0800
++++ synfig-0.63.03/src/synfig/guidset.h        2011-12-13 23:08:00.000000000 
-0800
 @@ -48,6 +48,9 @@
  #ifdef HASH_SET_H
  std::set<synfig::GUID>
@@ -130,9 +517,9 @@
  HASH_SET_CLASS<synfig::GUID,synfig::GUIDHash>
  #endif
  {
-diff -Naur synfig-0.63.00.orig/src/synfig/loadcanvas.cpp 
synfig-0.63.00/src/synfig/loadcanvas.cpp
---- synfig-0.63.00.orig/src/synfig/loadcanvas.cpp      2011-07-26 
10:08:09.000000000 -0700
-+++ synfig-0.63.00/src/synfig/loadcanvas.cpp   2011-07-27 15:10:33.000000000 
-0700
+diff -Naur synfig-0.63.03.orig/src/synfig/loadcanvas.cpp 
synfig-0.63.03/src/synfig/loadcanvas.cpp
+--- synfig-0.63.03.orig/src/synfig/loadcanvas.cpp      2011-12-13 
23:07:26.000000000 -0800
++++ synfig-0.63.03/src/synfig/loadcanvas.cpp   2011-12-13 23:08:00.000000000 
-0800
 @@ -41,6 +41,7 @@
  #include <vector>
  #include <stdexcept>
@@ -141,7 +528,7 @@
  
  #include "layer_pastecanvas.h"
  #include "loadcanvas.h"
-@@ -1327,7 +1328,8 @@
+@@ -1501,7 +1502,8 @@
        }
  
        handle<LinkableValueNode> 
value_node=LinkableValueNode::create(element->get_name(),type);
@@ -151,9 +538,9 @@
  
        if(!value_node)
        {
-diff -Naur synfig-0.63.00.orig/src/synfig/vector.h 
synfig-0.63.00/src/synfig/vector.h
---- synfig-0.63.00.orig/src/synfig/vector.h    2011-07-26 10:08:09.000000000 
-0700
-+++ synfig-0.63.00/src/synfig/vector.h 2011-07-26 10:10:00.000000000 -0700
+diff -Naur synfig-0.63.03.orig/src/synfig/vector.h 
synfig-0.63.03/src/synfig/vector.h
+--- synfig-0.63.03.orig/src/synfig/vector.h    2011-12-13 23:07:26.000000000 
-0800
++++ synfig-0.63.03/src/synfig/vector.h 2011-12-13 23:08:00.000000000 -0800
 @@ -52,6 +52,8 @@
  inline bool isnan(double x) { return x != x; }
  inline bool isnan(float x) { return x != x; }

Index: synfigstudio.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/synfigstudio.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- synfigstudio.info   15 Oct 2011 23:13:56 -0000      1.2
+++ synfigstudio.info   14 Dec 2011 07:31:03 -0000      1.3
@@ -1,10 +1,10 @@
 Package: synfigstudio
-Version: 0.63.02
+Version: 0.63.03
 
 Revision: 1
 
 Source: mirror:sourceforge:synfig/synfigstudio-%v.tar.gz
-Source-MD5: 939595974cc56551fa89ae4f4dddbfb0
+Source-MD5: a166ff4917b0e058cae96e51aa273080
 
 Maintainer: Hisashi T Fujinaka <ht...@fls.portland.or.us>
 

Index: synfig.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/synfig.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- synfig.info 15 Oct 2011 23:13:56 -0000      1.4
+++ synfig.info 14 Dec 2011 07:31:03 -0000      1.5
@@ -1,13 +1,13 @@
 Package: synfig
-Version: 0.63.02
+Version: 0.63.03
 
 Revision: 1
 
 Source: mirror:sourceforge:synfig/synfig-%v.tar.gz
-Source-MD5: 4286d5e1887275107d760d1b678aec24
+Source-MD5: 9bd77cd2fc2381adfbd50a7b9c1c6e7c
 
 PatchFile: %n.patch
-PatchFile-MD5: da2f6b525910356eb8d6a0976d125d17
+PatchFile-MD5: faa6b4914166043a779c47efa87ca3e4
 
 Maintainer: Hisashi T Fujinaka <ht...@fls.portland.or.us>
 


------------------------------------------------------------------------------
Cloud Computing - Latest Buzzword or a Glimpse of the Future?
This paper surveys cloud computing today: What are the benefits? 
Why are businesses embracing it? What are its payoffs and pitfalls?
http://www.accelacomm.com/jaw/sdnl/114/51425149/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to