X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_png%2Fmptr_png.cpp;h=b485f2729108708b99c7c8097c8311faba6d1051;hb=c3ad95144d148602f672e95ddda1f18fc35502f8;hp=1ab33b59fd0af0b219aeb0880bc705a7510e54f2;hpb=21bfc670b83d4c45da9ed1b95063b7e6a007168c;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 1ab33b5..b485f27 100644 --- a/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp +++ b/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp @@ -1,8 +1,10 @@ -/*! ======================================================================== -** 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 @@ -14,6 +16,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 =========================================================== ** @@ -56,15 +59,15 @@ using namespace etl; /* === G L O B A L S ======================================================= */ SYNFIG_IMPORTER_INIT(png_mptr); -SYNFIG_IMPORTER_SET_NAME(png_mptr,"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)); @@ -72,7 +75,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)); @@ -80,7 +83,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: */ @@ -89,10 +92,10 @@ png_mptr::read_chunk_callback(png_struct *png_data, png_unknown_chunkp chunk) //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 */ @@ -101,7 +104,7 @@ png_mptr::read_chunk_callback(png_struct *png_data, png_unknown_chunkp chunk) png_mptr::png_mptr(const char *file_name) { filename=file_name; - + /* Open the file pointer */ FILE *file = fopen(file_name, "rb"); if (!file) @@ -110,8 +113,8 @@ png_mptr::png_mptr(const char *file_name) 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); @@ -122,8 +125,8 @@ png_mptr::png_mptr(const char *file_name) 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); @@ -154,8 +157,8 @@ png_mptr::png_mptr(const char *file_name) return; } - - + + png_init_io(png_ptr, file); png_set_sig_bytes(png_ptr,PNG_CHECK_BYTES); @@ -165,8 +168,8 @@ png_mptr::png_mptr(const char *file_name) synfig::info("PNG: Image gamma is %f",fgamma); png_set_gamma(png_ptr, gamma().get_gamma(), fgamma); } - - + + /* if (setjmp(png_jmpbuf(png_ptr))) { @@ -178,19 +181,19 @@ png_mptr::png_mptr(const char *file_name) return; } */ - + png_set_read_user_chunk_fn(png_ptr, this, &png_mptr::read_chunk_callback); - - + + png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_PACKING|PNG_TRANSFORM_STRIP_16, NULL); 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); - + png_bytep *row_pointers=new png_bytep[height]; row_pointers = png_get_rows(png_ptr, info_ptr); int x; @@ -223,7 +226,7 @@ png_mptr::png_mptr(const char *file_name) */ } break; - + case PNG_COLOR_TYPE_RGB_ALPHA: DEBUGPOINT(); for(y=0;y