summaryrefslogtreecommitdiff
path: root/src/Fl_PNG_Image.cxx
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2020-07-01 18:03:10 +0200
committerAlbrecht Schlosser <albrechts.fltk@online.de>2020-07-06 20:28:20 +0200
commitf09e17c3c564e8310125a10c03397cbf473ff643 (patch)
tree8d0fd4a28e3686c33aaa140d07ddba26ab28bdc2 /src/Fl_PNG_Image.cxx
parentb0e0c355edaa2e23148cb0260ada907aec930f05 (diff)
Remove $Id$ tags, update URL's, and more
- remove obsolete svn '$Id$' tags from all source files - update .fl files and generated files accordingly - replace 'http://www.fltk.org' URL's with 'https://...' - replace bug report URL 'str.php' with 'bugs.php' - remove trailing whitespace - fix other whitespace errors flagged by Git - add and/or fix missing or wrong standard headers - convert tabs to spaces in all source files The only relevant code changes are in the fluid/ folder where some .fl files and other source files were used to generate the '$Id' headers and footers.
Diffstat (limited to 'src/Fl_PNG_Image.cxx')
-rw-r--r--src/Fl_PNG_Image.cxx35
1 files changed, 14 insertions, 21 deletions
diff --git a/src/Fl_PNG_Image.cxx b/src/Fl_PNG_Image.cxx
index bd2d4540f..4c9579bb8 100644
--- a/src/Fl_PNG_Image.cxx
+++ b/src/Fl_PNG_Image.cxx
@@ -1,6 +1,4 @@
//
-// "$Id$"
-//
// Fl_PNG_Image routines.
//
// Copyright 1997-2012 by Easy Software Products.
@@ -12,11 +10,11 @@
// the file "COPYING" which should have been included with this file. If this
// file is missing or damaged, see the license at:
//
-// http://www.fltk.org/COPYING.php
+// https://www.fltk.org/COPYING.php
//
-// Please report all bugs and problems on the following page:
+// Please see the following page on how to report bugs and issues:
//
-// http://www.fltk.org/str.php
+// https://www.fltk.org/bugs.php
//
// Contents:
@@ -57,8 +55,8 @@ typedef struct {
extern "C" {
static void png_read_data_from_mem( png_structp png_ptr, //pointer to our data
- png_bytep data, // where to copy the image data for libpng computing
- png_size_t length) // length of data to copy
+ png_bytep data, // where to copy the image data for libpng computing
+ png_size_t length) // length of data to copy
{
fl_png_memory *png_mem_data = (fl_png_memory*)png_get_io_ptr(png_ptr); // get the pointer to our struct
if (png_mem_data->current + length > png_mem_data->last) {
@@ -85,7 +83,7 @@ extern "C" {
PNG format could not be decoded, and ERR_NO_IMAGE if the image could not
be loaded for another reason.
- \param[in] filename Name of PNG file to read
+ \param[in] filename Name of PNG file to read
*/
Fl_PNG_Image::Fl_PNG_Image (const char *filename): Fl_RGB_Image(0,0,0)
{
@@ -102,7 +100,7 @@ Fl_PNG_Image::Fl_PNG_Image (const char *filename): Fl_RGB_Image(0,0,0)
shared images (see: Fl_Shared_Image) and will be available by that name.
\param name_png A name given to this image or NULL
- \param buffer Pointer to the start of the PNG image in memory
+ \param buffer Pointer to the start of the PNG image in memory
\param maxsize Size in bytes of the memory buffer containing the PNG image
*/
Fl_PNG_Image::Fl_PNG_Image (
@@ -115,18 +113,18 @@ Fl_PNG_Image::Fl_PNG_Image (
void Fl_PNG_Image::load_png_(const char *name_png, const unsigned char *buffer_png, int maxsize)
{
#if defined(HAVE_LIBPNG) && defined(HAVE_LIBZ)
- int i; // Looping var
- int channels; // Number of color channels
- png_structp pp; // PNG read pointer
- png_infop info = 0; // PNG info pointers
- png_bytep *rows; // PNG row pointers
+ int i; // Looping var
+ int channels; // Number of color channels
+ png_structp pp; // PNG read pointer
+ png_infop info = 0; // PNG info pointers
+ png_bytep *rows; // PNG row pointers
fl_png_memory png_mem_data;
int from_memory = (buffer_png != NULL); // true if reading image from memory
// Note: The file pointer fp must not be an automatic (stack) variable
// to avoid potential clobbering by setjmp/longjmp (gcc: [-Wclobbered]).
- static FILE *fp; // intentionally initialized separately below
- fp = NULL; // always initialize file pointer
+ static FILE *fp; // intentionally initialized separately below
+ fp = NULL; // always initialize file pointer
if (!from_memory) {
if ((fp = fl_fopen(name_png, "rb")) == NULL) {
@@ -231,8 +229,3 @@ void Fl_PNG_Image::load_png_(const char *name_png, const unsigned char *buffer_p
}
#endif // HAVE_LIBPNG && HAVE_LIBZ
}
-
-
-//
-// End of "$Id$".
-//