X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_png%2Fmptr_png.cpp;h=1b6c99bbceedc96f7625439c1f78dd0a91c297d9;hb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;hp=12ca33224988a23d43138f49d83b99416efe773d;hpb=70bcefce2ab011a11014f36fc129b473cc0bc61e;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp b/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp
index 12ca332..1b6c99b 100644
--- a/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp
+++ b/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp
@@ -2,8 +2,11 @@
 /*!	\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
@@ -60,12 +63,12 @@ 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: 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));
@@ -73,7 +76,7 @@ png_mptr::png_out_error(png_struct *png_data,const char *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));
@@ -81,7 +84,7 @@ png_mptr::png_out_warning(png_struct *png_data,const char *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: */
@@ -160,6 +163,21 @@ png_mptr::png_mptr(const char *file_name)
 	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))
 	{
@@ -182,18 +200,23 @@ png_mptr::png_mptr(const char *file_name)
 
 	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);
@@ -201,7 +224,6 @@ png_mptr::png_mptr(const char *file_name)
 	switch(color_type)
 	{
 	case PNG_COLOR_TYPE_RGB:
-		DEBUGPOINT();
 		for(y=0;y<surface_buffer.get_h();y++)
 			for(x=0;x<surface_buffer.get_w();x++)
 			{
@@ -226,7 +248,6 @@ png_mptr::png_mptr(const char *file_name)
 		break;
 
 	case PNG_COLOR_TYPE_RGB_ALPHA:
-		DEBUGPOINT();
 		for(y=0;y<surface_buffer.get_h();y++)
 			for(x=0;x<surface_buffer.get_w();x++)
 			{
@@ -303,28 +324,20 @@ png_mptr::png_mptr(const char *file_name)
 		return;
 	}
 
-	DEBUGPOINT();
-
-	// \fixme These shouldn't be uncommented, but for some
-	// 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()
 {
-	DEBUGPOINT();
 }
 
 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;