gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-01 08:41:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSBitmapImageRep+PNG.m: Reverting change which removed

Browse source 
check for setjmp.  This was causing a compilation error.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30474 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2010-05-29 15:27:59 +00:00
parent a8e617e01f
commit 513ebb1947
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-05-29 11:35-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Source/NSBitmapImageRep+PNG.m: Reverting change which removed
check for setjmp. This was causing a compilation error.
2010-05-29 Wolfgang Lux <wolfgang.lux@gmail.com> 2010-05-29 Wolfgang Lux <wolfgang.lux@gmail.com>
* Headers/Additions/GNUstepGUI/GSNibLoading.h: * Headers/Additions/GNUstepGUI/GSNibLoading.h:

17
Source/NSBitmapImageRep+PNG.m
View file

@ -28,6 +28,15 @@
*/ */
#import "config.h" #import "config.h"
#if HAVE_LIBPNG
#ifdef HAVE_LIBPNG_PNG_H
#include <libpng/png.h>
#else
#include <png.h>
#endif
#import <Foundation/NSData.h> #import <Foundation/NSData.h>
#import <Foundation/NSDictionary.h> #import <Foundation/NSDictionary.h>
#import <Foundation/NSException.h> #import <Foundation/NSException.h>
@ -36,14 +45,6 @@
#import "AppKit/NSGraphics.h" #import "AppKit/NSGraphics.h"
#import "NSBitmapImageRep+PNG.h" #import "NSBitmapImageRep+PNG.h"
#if HAVE_LIBPNG
#define PNG_SKIP_SETJMP_CHECK 1
#ifdef HAVE_LIBPNG_PNG_H
#include <libpng/png.h>
#else
#include <png.h>
#endif
#if defined(PNG_FLOATING_POINT_SUPPORT) #if defined(PNG_FLOATING_POINT_SUPPORT)
# define PNG_FLOATING_POINT 1 # define PNG_FLOATING_POINT 1
#else #else