| 1 |
diff -up BlockOutII-2.3/contrib/ImageLib/src/Makefile~ BlockOutII-2.3/contrib/ImageLib/src/Makefile
|
| 2 |
--- BlockOutII-2.3/contrib/ImageLib/src/Makefile~ 2007-11-25 22:38:29.000000000 +0100
|
| 3 |
+++ BlockOutII-2.3/contrib/ImageLib/src/Makefile 2007-11-25 22:38:29.000000000 +0100
|
| 4 |
@@ -9,25 +9,11 @@
|
| 5 |
# All source files needed for the library
|
| 6 |
#
|
| 7 |
|
| 8 |
-SRC = gif/gif.c CImage.cpp png/zlib/adler32.c png/zlib/compress.c \
|
| 9 |
- png/zlib/crc32.c png/zlib/deflate.c png/zlib/gzio.c png/zlib/infback.c \
|
| 10 |
- png/zlib/inffast.c png/zlib/inflate.c png/zlib/inftrees.c png/zlib/trees.c \
|
| 11 |
- png/zlib/uncompr.c png/zlib/zutil.c png/png/png.c png/png/pngerror.c \
|
| 12 |
- png/png/pnggccrd.c png/png/pngget.c png/png/pngmem.c png/png/pngpread.c \
|
| 13 |
- png/png/pngread.c png/png/pngrio.c png/png/pngrtran.c png/png/pngrutil.c \
|
| 14 |
- png/png/pngset.c png/png/pngtrans.c png/png/pngvcrd.c png/png/pngwio.c \
|
| 15 |
- png/png/pngwrite.c png/png/pngwtran.c png/png/pngwutil.c png/hpng.c \
|
| 16 |
+SRC = gif/gif.c CImage.cpp png/hpng.c \
|
| 17 |
jpg/H2v2.cpp jpg/idct.cpp jpg/jpegdecoder.cpp jpg/jpegdecodermain.cpp
|
| 18 |
|
| 19 |
|
| 20 |
-OBJ= gif/gif.o CImage.o png/zlib/adler32.o png/zlib/compress.o \
|
| 21 |
- png/zlib/crc32.o png/zlib/deflate.o png/zlib/gzio.o png/zlib/infback.o \
|
| 22 |
- png/zlib/inffast.o png/zlib/inflate.o png/zlib/inftrees.o png/zlib/trees.o \
|
| 23 |
- png/zlib/uncompr.o png/zlib/zutil.o png/png/png.o png/png/pngerror.o \
|
| 24 |
- png/png/pnggccrd.o png/png/pngget.o png/png/pngmem.o png/png/pngpread.o \
|
| 25 |
- png/png/pngread.o png/png/pngrio.o png/png/pngrtran.o png/png/pngrutil.o \
|
| 26 |
- png/png/pngset.o png/png/pngtrans.o png/png/pngvcrd.o png/png/pngwio.o \
|
| 27 |
- png/png/pngwrite.o png/png/pngwtran.o png/png/pngwutil.o png/hpng.o \
|
| 28 |
+OBJ= gif/gif.o CImage.o png/hpng.o \
|
| 29 |
jpg/H2v2.o jpg/idct.o jpg/jpegdecoder.o jpg/jpegdecodermain.o
|
| 30 |
|
| 31 |
#---------------------------------------------------------------------
|
| 32 |
diff -up BlockOutII-2.3/contrib/ImageLib/src/png/hpng.c~ BlockOutII-2.3/contrib/ImageLib/src/png/hpng.c
|
| 33 |
--- BlockOutII-2.3/contrib/ImageLib/src/png/hpng.c~ 2007-11-25 22:39:13.000000000 +0100
|
| 34 |
+++ BlockOutII-2.3/contrib/ImageLib/src/png/hpng.c 2007-11-25 22:39:13.000000000 +0100
|
| 35 |
@@ -1,6 +1,6 @@
|
| 36 |
#include <malloc.h>
|
| 37 |
#include <math.h>
|
| 38 |
-#include "png/png.h"
|
| 39 |
+#include <png.h>
|
| 40 |
#include "hpng.h"
|
| 41 |
|
| 42 |
char PngErrorMessage[1024];
|