-/*! ========================================================================
-** Synfig
-** ppm Target Module
-** $Id: mptr_png.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+/* === 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
**
** This package is free software; you can redistribute it and/or
** 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 ===========================================================
**
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: mptr_png.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
+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::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));
}
void
-png_mptr::png_out_warning(png_struct *png_data,const char *msg)
+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));
}
int
-png_mptr::read_chunk_callback(png_struct *png_data, png_unknown_chunkp chunk)
+png_mptr::read_chunk_callback(png_struct */*png_data*/, png_unknown_chunkp /*chunk*/)
{
/* The unknown chunk structure contains your
chunk data: */
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))
{
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_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);
- int bit_depth,color_type,interlace_type, compression_type,filter_method;
- png_uint_32 width,height;
+ // 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_get_IHDR(png_ptr, info_ptr, &width, &height,
- &bit_depth, &color_type, &interlace_type,
- &compression_type, &filter_method);
+ png_read_image(png_ptr, row_pointers);
- png_bytep *row_pointers=new png_bytep[height];
- row_pointers = png_get_rows(png_ptr, info_ptr);
int x;
int y;
surface_buffer.set_wh(width,height);
// reason, they crash the program. I will have to look into this
// later. This is a memory leak, but it shouldn't be too bad.
- /*
png_read_end(png_ptr, end_info);
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
fclose(file);
- */
delete [] row_pointers;
+ delete [] data;
}
png_mptr::~png_mptr()
}
bool
-png_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback *cb)
+png_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback */*cb*/)
{
surface.mirror(surface_buffer);
// surface=surface_buffer;