projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Default the time sub-parameter to 0f. Check that the valuenode has a parent canvas...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
mod_png
/
mptr_png.cpp
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
b36266b
..
1b6c99b
100644
(file)
--- a/
synfig-core/trunk/src/modules/mod_png/mptr_png.cpp
+++ b/
synfig-core/trunk/src/modules/mod_png/mptr_png.cpp
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-223,7
+224,6
@@
png_mptr::png_mptr(const char *file_name)
switch(color_type)
{
case PNG_COLOR_TYPE_RGB:
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++)
{
for(y=0;y<surface_buffer.get_h();y++)
for(x=0;x<surface_buffer.get_w();x++)
{
@@
-248,7
+248,6
@@
png_mptr::png_mptr(const char *file_name)
break;
case PNG_COLOR_TYPE_RGB_ALPHA:
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++)
{
for(y=0;y<surface_buffer.get_h();y++)
for(x=0;x<surface_buffer.get_w();x++)
{
@@
-325,12
+324,6
@@
png_mptr::png_mptr(const char *file_name)
return;
}
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);
png_read_end(png_ptr, end_info);
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
fclose(file);
@@
-341,7
+334,6
@@
png_mptr::png_mptr(const char *file_name)
png_mptr::~png_mptr()
{
png_mptr::~png_mptr()
{
- DEBUGPOINT();
}
bool
}
bool