From 1079563a36edfe10a5f5d79ad38fe465425b989e Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sun, 1 Jun 2014 22:21:32 +0100 Subject: [PATCH] Bump version to 1.46 This marks the introduction of the memory reading functions and PNG_LUMINANCE_ALPHA support. The documentation has been updated accordingly. --- CMakeLists.txt | 2 +- Makefile | 10 +++++----- glpng.htm | 32 +++++++++++++++++++++++++++++--- include/GL/glpng.h | 2 +- src/glpng.c | 2 +- 5 files changed, 37 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bd9d50..c022e07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(glpng C) include(GNUInstallDirs) set(SONAME_VERSION 1) -set(MINOR_VERSION 45) +set(MINOR_VERSION 46) set(VERSION ${SONAME_VERSION}.${MINOR_VERSION}) set(BUILD_STATIC_LIBS ON CACHE BOOL "Set to ON to build static libraries") diff --git a/Makefile b/Makefile index 0daf632..185ba11 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,12 @@ SHAREDLIBFLAGS=-shared DESTDIR=/usr/local DOCDIR=$(DESTDIR)/share/doc/libglpng -all: libglpng.a libglpng.so.1.45 +all: libglpng.a libglpng.so.1.46 libglpng.a: glpng.o ar rv $@ $< -libglpng.so.1.45: glpng.o +libglpng.so.1.46: glpng.o gcc $(CFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname=libglpng.so.1 -Wl,--whole-archive $< -Wl,--no-whole-archive $(LDFLAGS) -o $@ glpng.o: src/glpng.c @@ -18,7 +18,7 @@ glpng.o: src/glpng.c clean: rm glpng.o libglpng.* -install: libglpng.a libglpng.so.1.45 +install: libglpng.a libglpng.so.1.46 for i in include include/GL lib; do \ install -m 755 -d $(DESTDIR)/$$i; \ done @@ -29,7 +29,7 @@ install: libglpng.a libglpng.so.1.45 install -m 644 Example/Stunt.png Example/Test.c $(DOCDIR)/examples install -m 644 include/GL/glpng.h $(DESTDIR)/include/GL install -m 644 libglpng.* $(DESTDIR)/lib - ln -s libglpng.so.1.45 $(DESTDIR)/lib/libglpng.so.1 - ln -s libglpng.so.1.45 $(DESTDIR)/lib/libglpng.so + ln -s libglpng.so.1.46 $(DESTDIR)/lib/libglpng.so.1 + ln -s libglpng.so.1.46 $(DESTDIR)/lib/libglpng.so .PHONY: clean install diff --git a/glpng.htm b/glpng.htm index 3b8d79e..dc21efa 100644 --- a/glpng.htm +++ b/glpng.htm @@ -6,8 +6,8 @@ glpng -

PNG loader library for OpenGL v1.45 -(10/7/2000)

+

PNG loader library for OpenGL v1.46 +(2/6/2014)

Ben Wyatt ben@wyatt100.freeserve.co.uk

Introduction

@@ -57,8 +57,10 @@ link with glpng.lib or glpngd.lib.

@@ -161,9 +164,27 @@ file.

 success = pngLoadMem(mem, size, mipmap, trans, info)
+
+
+ + + + + + + + + +
memPointer to a buffer
sizeSize of the buffer
+

This is used to load a PNG from a memory buffer.

+
+
+id = pngBind(filename, mipmap, trans, info, wrapst, minfilter, magfilter)
 id = pngBindF(file, mipmap, trans, info, wrapst, minfilter, magfilter)
+id = pngBindMem(mem, size, mipmap, trans, info, wrapst, minfilter, magfilter)
@@ -345,7 +366,7 @@ handle) cases.
  • Other mipmap generating algorithms could be implemented (wavelet stuff?). Source donations are welcome.
  • Saving the frame buffer to a PNG file.
    • -
  • Support for GL_INTENSITY, GL_LUMINANCE_ALPHA and others.
    • +
  • Support for GL_INTENSITY and others.

    • History

    @@ -419,6 +440,11 @@ producing warnings and errors in MSDEV. + + + +
    Fixed bug where the standard orientation flag was being ignored in pngLoadRawF (thanks to Mark B. Allan!).
    1.46 (02/06/14)Added memory reading functions and +PNG_LUMINANCE_ALPHA support. Fixed CVE-2010-1519.

    Get the latest version from http://www.wyatt100.freeserve.co.uk/download.htm

    diff --git a/include/GL/glpng.h b/include/GL/glpng.h index 96e95e9..4af4aaf 100644 --- a/include/GL/glpng.h +++ b/include/GL/glpng.h @@ -1,5 +1,5 @@ /* - * PNG loader library for OpenGL v1.45 (10/07/00) + * PNG loader library for OpenGL v1.46 (02/06/14) * by Ben Wyatt ben@wyatt100.freeserve.co.uk * Using LibPNG 1.0.2 and ZLib 1.1.3 * diff --git a/src/glpng.c b/src/glpng.c index e19c35d..d78a591 100644 --- a/src/glpng.c +++ b/src/glpng.c @@ -1,5 +1,5 @@ /* - * PNG loader library for OpenGL v1.45 (10/07/00) + * PNG loader library for OpenGL v1.46 (02/06/14) * by Ben Wyatt ben@wyatt100.freeserve.co.uk * Using LibPNG 1.0.2 and ZLib 1.1.3 * -- 2.11.4.GIT