rev |
line source |
slaxemulator@6835
|
1 diff -Naur FreeImage.orig//Makefile.fip FreeImage.new//Makefile.fip
|
slaxemulator@6835
|
2 --- FreeImage.orig//Makefile.fip 2010-08-10 19:15:20.000000000 +0200
|
slaxemulator@6835
|
3 +++ FreeImage.new//Makefile.fip 2010-09-12 23:29:36.000000000 +0200
|
slaxemulator@6835
|
4 @@ -15,9 +15,9 @@
|
slaxemulator@6835
|
5
|
slaxemulator@6835
|
6 MODULES = $(SRCS:.c=.o)
|
slaxemulator@6835
|
7 MODULES := $(MODULES:.cpp=.o)
|
slaxemulator@6835
|
8 -CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
|
slaxemulator@6835
|
9 +CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
|
slaxemulator@6835
|
10 CFLAGS += $(INCLUDE)
|
slaxemulator@6835
|
11 -CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
|
slaxemulator@6835
|
12 +CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
|
slaxemulator@6835
|
13 CXXFLAGS += $(INCLUDE)
|
slaxemulator@6835
|
14
|
slaxemulator@6835
|
15 ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
|
slaxemulator@6835
|
16 diff -Naur FreeImage.orig//Makefile.gnu FreeImage.new//Makefile.gnu
|
slaxemulator@6835
|
17 --- FreeImage.orig//Makefile.gnu 2010-08-10 19:15:20.000000000 +0200
|
slaxemulator@6835
|
18 +++ FreeImage.new//Makefile.gnu 2010-09-12 23:01:57.000000000 +0200
|
slaxemulator@6835
|
19 @@ -15,9 +15,9 @@
|
slaxemulator@6835
|
20
|
slaxemulator@6835
|
21 MODULES = $(SRCS:.c=.o)
|
slaxemulator@6835
|
22 MODULES := $(MODULES:.cpp=.o)
|
slaxemulator@6835
|
23 -CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
|
slaxemulator@6835
|
24 +CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
|
slaxemulator@6835
|
25 CFLAGS += $(INCLUDE)
|
slaxemulator@6835
|
26 -CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
|
slaxemulator@6835
|
27 +CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
|
slaxemulator@6835
|
28 CXXFLAGS += $(INCLUDE)
|
slaxemulator@6835
|
29
|
slaxemulator@6835
|
30 ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
|
slaxemulator@6835
|
31 @@ -65,9 +65,6 @@
|
slaxemulator@6835
|
32 install -m 644 -o root -g root $(HEADER) $(INCDIR)
|
slaxemulator@6835
|
33 install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
|
slaxemulator@6835
|
34 install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
|
slaxemulator@6835
|
35 - ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
|
slaxemulator@6835
|
36 - ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
|
slaxemulator@6835
|
37 - ldconfig
|
slaxemulator@6835
|
38
|
slaxemulator@6835
|
39 clean:
|
slaxemulator@6835
|
40 rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
|
slaxemulator@6835
|
41 diff -Naur FreeImage.orig//Source/FreeImageToolkit/Background.cpp FreeImage.new//Source/FreeImageToolkit/Background.cpp
|
slaxemulator@6835
|
42 --- FreeImage.orig//Source/FreeImageToolkit/Background.cpp 2010-08-10 19:15:20.000000000 +0200
|
slaxemulator@6835
|
43 +++ FreeImage.new//Source/FreeImageToolkit/Background.cpp 2010-08-10 19:16:12.000000000 +0200
|
slaxemulator@6835
|
44 @@ -21,6 +21,7 @@
|
slaxemulator@6835
|
45
|
slaxemulator@6835
|
46 #include "FreeImage.h"
|
slaxemulator@6835
|
47 #include "Utilities.h"
|
slaxemulator@6835
|
48 +#include <limits.h>
|
slaxemulator@6835
|
49
|
slaxemulator@6835
|
50 /** @brief Determines, whether a palletized image is visually greyscale or not.
|
slaxemulator@6835
|
51
|
slaxemulator@6835
|
52 diff -Naur FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h
|
slaxemulator@6835
|
53 --- FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h 2010-08-10 19:15:20.000000000 +0200
|
slaxemulator@6835
|
54 +++ FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h 2010-08-10 21:43:26.000000000 +0200
|
slaxemulator@6835
|
55 @@ -51,6 +51,7 @@
|
slaxemulator@6835
|
56
|
slaxemulator@6835
|
57 #include <iostream>
|
slaxemulator@6835
|
58 #include <iomanip>
|
slaxemulator@6835
|
59 +#include <cstring>
|
slaxemulator@6835
|
60
|
slaxemulator@6835
|
61 #if (defined _WIN32 || defined _WIN64) && defined _MSC_VER
|
slaxemulator@6835
|
62 // suppress exception specification warnings
|